dongruihua
|
f7ae30247a
|
Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop
|
2022-11-29 13:52:25 +08:00 |
|
lixg
|
556ad2d54d
|
feat:修改token失效
|
2022-11-29 13:45:02 +08:00 |
|
huangshengfa
|
90f2a46373
|
Merge branch 'pre-dev' into 'develop'
Pre dev
See merge request !2
|
2022-11-29 13:29:55 +08:00 |
|
lixg
|
dc1f46a19c
|
feat:合并
|
2022-11-29 13:19:18 +08:00 |
|
lixg
|
76bc15d926
|
feat:增加提交审核以及撤回审核
|
2022-11-29 13:18:49 +08:00 |
|
yuping
|
e78dec983d
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-11-29 11:09:31 +08:00 |
|
yuping
|
d2861455b1
|
--添加登录页面
|
2022-11-29 11:09:22 +08:00 |
|
huangshengfa
|
402e6fa6e0
|
Merge branch 'pre-dev' into 'develop'
Pre dev
See merge request !1
|
2022-11-29 10:36:36 +08:00 |
|
lixg
|
d51df54728
|
feat:合并
|
2022-11-29 09:47:46 +08:00 |
|
lixg
|
3804d11f6a
|
feat:增加授权
|
2022-11-29 09:47:14 +08:00 |
|
zhangyc
|
2df25055d9
|
Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop
|
2022-11-29 09:46:47 +08:00 |
|
zhangyc
|
07bdd37d5f
|
面授课
|
2022-11-29 09:46:37 +08:00 |
|
yuping
|
9bb7e93d78
|
--添加登录页面
|
2022-11-29 00:40:29 +08:00 |
|
zhangyc
|
edcb32e563
|
直播bug 添加面授bug
|
2022-11-28 23:26:20 +08:00 |
|
lixg
|
97232b39c4
|
feat:合并
|
2022-11-28 22:48:33 +08:00 |
|
lixg
|
33e9e1bb93
|
feat:增加项目授权以及修改新建项目
|
2022-11-28 22:47:30 +08:00 |
|
王熙东
|
216916f590
|
选择考试列表,考试查看修改
|
2022-11-28 14:28:24 +08:00 |
|
宋文超
|
f5e3f259be
|
Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop
|
2022-11-28 12:54:41 +08:00 |
|
Ggysh-7
|
1c2a04934a
|
Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop
|
2022-11-28 12:47:57 +08:00 |
|
Ggysh-7
|
54e8dfdc84
|
fix:已审核项目页面和待审核项目页面列表渲染、搜索(整个审核管理的通过选择已审核状态搜索未完成)
|
2022-11-28 12:47:51 +08:00 |
|
宋文超
|
c4d90580aa
|
Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop
|
2022-11-28 12:46:47 +08:00 |
|
宋文超
|
ec9b277609
|
fix:mitt完成公告同步
|
2022-11-28 12:46:39 +08:00 |
|
dongruihua
|
d71d614567
|
Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop
# Conflicts:
# package-lock.json
# src/components/drawers/AssessmentList.vue
# vue.config.js
|
2022-11-28 11:05:44 +08:00 |
|
lixg
|
032df5bb71
|
feat:合并
|
2022-11-28 10:23:14 +08:00 |
|
lixg
|
2514ce3c9d
|
feat:增加组织树及学员搜索
|
2022-11-28 10:22:48 +08:00 |
|
zhangyc
|
f85ee37ca0
|
模板库添加任务bug
|
2022-11-28 08:26:46 +08:00 |
|
zhangyc
|
0b1bc28368
|
Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop
|
2022-11-27 16:39:28 +08:00 |
|
zhangyc
|
a586bf108e
|
添加面授任务
|
2022-11-27 16:39:22 +08:00 |
|
lixg
|
6a5e772bb2
|
feat:合并
|
2022-11-26 21:14:30 +08:00 |
|
Ggysh-7
|
3f9854f0f6
|
feat:待审核项目列表渲染、搜索功能(跟据时间搜索成功但是返回空数组)fix:已审核课程搜索bug
|
2022-11-26 20:57:01 +08:00 |
|
Ggysh-7
|
339d77fd1d
|
Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop
|
2022-11-26 17:23:22 +08:00 |
|
Ggysh-7
|
8565a68e85
|
fix:待审核课程搜索bug
|
2022-11-26 17:23:18 +08:00 |
|
zhangyc
|
52854a4c75
|
feat:创建投票
|
2022-11-26 17:12:14 +08:00 |
|
Ggysh-7
|
093feb913e
|
feat:添加在线、案例的添加搜索重置编辑已完成
|
2022-11-26 16:06:15 +08:00 |
|
lixg
|
a663dbe2b2
|
feat:合并
|
2022-11-26 15:09:08 +08:00 |
|
lixg
|
90d5c8cd87
|
feat:合并
|
2022-11-26 09:40:47 +08:00 |
|
lixg
|
be0060ca3a
|
feat:增加获取授权列表
|
2022-11-26 09:35:42 +08:00 |
|
Ggysh-7
|
31bb591b5e
|
fix:config
|
2022-11-25 23:03:00 +08:00 |
|
Ggysh-7
|
65b5dfbd1d
|
fix:添加测评搜索bug
|
2022-11-25 23:02:21 +08:00 |
|
Ggysh-7
|
33f5f9cb4f
|
Merge branch 'master' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage
|
2022-11-25 22:37:59 +08:00 |
|
Ggysh-7
|
e0e134004c
|
fix:补齐合并丢失代码
|
2022-11-25 22:37:54 +08:00 |
|
kclf
|
dd6e8f644d
|
状态值变更
|
2022-11-25 22:22:18 +08:00 |
|
kclf
|
bceaca6ca4
|
t
|
2022-11-25 22:19:43 +08:00 |
|
kclf
|
b8a78f101d
|
Merge branch 'master' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage
|
2022-11-25 22:11:14 +08:00 |
|
kclf
|
0f35dd629a
|
t
|
2022-11-25 22:11:08 +08:00 |
|
Ggysh-7
|
80f8f3bc6a
|
合并
|
2022-11-25 22:00:04 +08:00 |
|
Ggysh-7
|
142e923d05
|
feat:编辑测评选择测评选项可以回显,修复删除后tag没清除,修改时间的传参;管理的催促提示修改
|
2022-11-25 21:54:57 +08:00 |
|
kclf
|
56c3549721
|
t
|
2022-11-25 21:51:25 +08:00 |
|
kclf
|
d7f06c34ec
|
t
|
2022-11-25 20:51:26 +08:00 |
|
kclf
|
4bcc5ead9e
|
t
|
2022-11-25 20:48:28 +08:00 |
|