Commit Graph

268 Commits

Author SHA1 Message Date
yuping
04fa60d838 Merge branch 'develop' into manage-release
# Conflicts:
#	src/App.vue
#	src/api/config.js
#	src/api/method.js
#	src/components/NavTop.vue
#	src/router/index.js
#	src/views/projectcenter/templateAdd.vue
2022-12-14 23:25:53 +08:00
yuping
12c3a1ce72 -- 环境更改 2022-12-14 21:21:58 +08:00
yuping
a542608dfe -- 环境更改 2022-12-14 21:11:15 +08:00
lixg
d05fd14aae feat:合并 2022-12-14 20:56:22 +08:00
lixg
eece67eb22 fix:修改添加任务项目列表 2022-12-14 20:55:34 +08:00
yuping
fffc5c66b2 -- bug 2022-12-14 20:50:46 +08:00
yuping
74e41e9abe Merge remote-tracking branch 'origin/develop' into develop 2022-12-14 20:36:58 +08:00
yuping
42340e38d0 -- bug 2022-12-14 20:36:37 +08:00
lixg
652282773f feat:修改 2022-12-14 17:52:13 +08:00
lixg
dd11f3577e fix:修改url 2022-12-14 17:42:12 +08:00
lixg
6dda7355a6 feat:合并 2022-12-14 17:37:25 +08:00
lixg
37cb81763a fix:修改版本号 2022-12-14 17:24:00 +08:00
lixg
ea3315ac32 fix:修改创建评估及编辑评估回显 2022-12-14 11:55:48 +08:00
lixg
68f5a4957e feat:合并 2022-12-13 21:49:54 +08:00
lixg
dbc88a2568 feat:合并 2022-12-13 09:25:09 +08:00
lixg
f3f0442183 feat:修改版本号 2022-12-13 09:24:34 +08:00
zhangyc
a8c7308cc2 审核日志只有一条 2022-12-13 09:11:52 +08:00
lixg
8b14710d9d feat:增加token失效退出登录 2022-12-12 09:00:55 +08:00
lixg
8cf9b44dc8 feat:合并 2022-12-12 08:59:52 +08:00
lixg
fdfd07b786 feat:合并 2022-12-12 08:59:05 +08:00
zhangyc
f6a3966231 修改按钮样式 2022-12-12 02:10:49 +08:00
lixg
c505e48231 feat:修改版本号 2022-12-11 18:17:38 +08:00
yuping
f74c68fc25 -- 项目名称校验 2022-12-10 21:00:42 +08:00
lixg
37774b1940 feat:合并 2022-12-10 15:22:40 +08:00
lixg
0ec71a065f feat:增加面授提示 2022-12-10 15:22:03 +08:00
yuping
39f8bd9830 -- 新建学员管理 2022-12-10 14:49:53 +08:00
lixg
4beafe34bf fix:修改版本号 2022-12-09 18:11:25 +08:00
lixg
824ef2afe0 fix:修改版本号 2022-12-09 14:39:24 +08:00
lixg
9d55980009 feat:合并 2022-12-09 14:23:01 +08:00
lixg
c853af3316 fix:修改开课时间搜索 2022-12-09 14:22:39 +08:00
wyx
c3df837396 fix:添加评估重复时禁止添加 2022-12-09 11:41:03 +08:00
zhangyc
7f1c26f37d 直播 评估回显 2022-12-09 08:42:54 +08:00
yuping
4da75211e7 Merge remote-tracking branch 'origin/develop' into develop 2022-12-08 23:44:02 +08:00
yuping
b9bab9475e -- 复制开课and学员清空 2022-12-08 23:43:50 +08:00
lixg
7d47445b7a feat:合并 2022-12-08 20:32:16 +08:00
lixg
a748ae9ad3 feat:增加学习路径基本信息编辑 2022-12-08 20:31:45 +08:00
wyx
805241a90e 修改版本号 2022-12-08 17:17:38 +08:00
lixg
9a22f3d547 fix:修改单层项目创建及编辑成功后的跳转 2022-12-08 16:00:36 +08:00
zhangyc
49dbe74893 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-12-08 14:58:00 +08:00
wyx
ebacaecd9e fix:模板库增加添加案例 2022-12-08 14:55:08 +08:00
lixg
25c220e84d fix:修改投票 2022-12-08 14:32:53 +08:00
lixg
300b88009a feat:合并 2022-12-08 08:48:45 +08:00
wyx
4274e6ce0d fix:待审核课程创建时间排序 2022-12-07 20:33:30 +08:00
lixg
190d3b7870 fix:修改任务大纲 2022-12-07 15:53:02 +08:00
lixg
96540c0835 feat:合并 2022-12-07 13:41:35 +08:00
lixg
256eaa76aa fix:修改版本号 2022-12-07 13:40:56 +08:00
wyx
adc1a8e61d fix:评估回显问题 2022-12-07 10:20:58 +08:00
lixg
ef5aa57930 fix:修改审核项目和课程的时间 2022-12-07 08:55:24 +08:00
lixg
7ea979bc43 feat:修改直播封面 2022-12-06 21:59:37 +08:00
lixg
3b3b0e7d35 fix:删除编辑任务的清空 2022-12-06 18:44:48 +08:00