yuping
|
7dfaf3a3b0
|
Merge branch 'develop' into manage-release
# Conflicts:
# src/App.vue
# src/components/drawers/AddHomework.vue
# src/components/drawers/AddTest.vue
# src/components/student/ChangeLevelModal.vue
# src/components/student/TableStudent.vue
# src/views/examine/ProjectReviewed.vue
|
2022-12-22 19:05:26 +08:00 |
|
wyx
|
d1dcb4ecab
|
fix:合并冲突
|
2022-12-22 19:01:28 +08:00 |
|
quhongwei
|
adcad35c59
|
增加过滤文件
|
2022-12-22 18:46:23 +08:00 |
|
wyx
|
0572e832c8
|
Merge branch 'develop' into 'master'
Develop
See merge request !1
|
2022-12-22 10:45:36 +00:00 |
|
yuping
|
52bf37a00d
|
-- 上传路径不对
|
2022-12-22 18:20:16 +08:00 |
|
yuping
|
f33f2cd99a
|
-- 批量跳转关卡
|
2022-12-22 18:16:36 +08:00 |
|
yuping
|
13e27ae3ca
|
-- 学员数量
|
2022-12-22 17:31:27 +08:00 |
|
yujicun
|
027eda7c11
|
Merge remote-tracking branch 'origin/manage-release' into release
|
2022-12-22 16:56:01 +08:00 |
|
yujicun
|
25320af333
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-12-22 16:06:45 +08:00 |
|
zhangyc
|
52db18777d
|
1.01版本
|
2022-12-22 15:50:20 +08:00 |
|
zhangyc
|
6220685ca8
|
选用模板编辑下项目保存时间bug
|
2022-12-22 15:48:49 +08:00 |
|
yuping
|
e1e4a005ce
|
-- 组织书
|
2022-12-22 14:22:33 +08:00 |
|
zhangyc
|
d740f6be8e
|
Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop
|
2022-12-22 13:01:53 +08:00 |
|
zhangyc
|
9f4b9a3e29
|
已审核已发布项目不可编辑
|
2022-12-22 13:01:46 +08:00 |
|
wuyx
|
702e6e344b
|
fix:禁用作业过去时间选择
|
2022-12-22 12:36:16 +08:00 |
|
yuping
|
80c7496901
|
-- 文件上唇路径不对
|
2022-12-22 12:13:09 +08:00 |
|
lixg
|
13f9161781
|
feat:合并
|
2022-12-22 11:19:36 +08:00 |
|
lixg
|
859126dc06
|
feat:增加调整关卡弹窗
|
2022-12-22 11:18:45 +08:00 |
|
wuyx
|
a236a9ccb8
|
fix:项目显示问题
|
2022-12-22 09:48:46 +08:00 |
|
zhangyc
|
b0d57bf577
|
时间搜索
|
2022-12-22 09:32:17 +08:00 |
|
zhangyc
|
2978e0d724
|
列表搜索后仍然选中第二个
|
2022-12-22 07:57:22 +08:00 |
|
huangshengfa
|
c99164246c
|
Merge branch 'pre-dev' into 'develop'
Pre dev
See merge request !24
|
2022-12-21 19:34:22 +08:00 |
|
yuping
|
05492770a4
|
-- 时间选择到分
|
2022-12-21 17:24:41 +08:00 |
|
yuping
|
03e9e50061
|
-- 项目搜索状态
|
2022-12-21 17:16:13 +08:00 |
|
zhangyc
|
cb1a7dbc9a
|
Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop
|
2022-12-21 16:55:37 +08:00 |
|
zhangyc
|
cb0ffbf363
|
学员管理搜索
|
2022-12-21 16:55:27 +08:00 |
|
lixg
|
841d16f33e
|
feat:合并
|
2022-12-21 16:32:50 +08:00 |
|
lixg
|
76160bfd30
|
fix:隐藏面授课新建的在线按钮
|
2022-12-21 16:31:28 +08:00 |
|
wyx
|
a068f4d530
|
fix:修改项目阶段删除/增加排序/初始化选择
|
2022-12-21 15:38:00 +08:00 |
|
wyx
|
6854b6a0d0
|
fix:修改项目阶段删除/增加排序/初始化选择
|
2022-12-21 15:36:55 +08:00 |
|
wyx
|
7c0aa7e747
|
fix:修改项目阶段删除/增加排序/初始化选择
|
2022-12-21 15:36:09 +08:00 |
|
lixg
|
a200f7b8f2
|
fix:修改考试默认值
|
2022-12-21 15:30:09 +08:00 |
|
lixg
|
f5c58602c4
|
fix:修改考试默认值
|
2022-12-21 15:24:46 +08:00 |
|
yuping
|
9fe7040b47
|
-- 项目经理选择
|
2022-12-21 15:14:02 +08:00 |
|
lixg
|
b62eb3ae33
|
feat:修改时长
|
2022-12-21 15:01:37 +08:00 |
|
dongruihua
|
20c2f008d9
|
Merge branch 'manage-release' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into release
|
2022-12-21 11:49:25 +08:00 |
|
lixg
|
a862d18f18
|
style:修改添加学员滚动条
|
2022-12-21 09:54:44 +08:00 |
|
lixg
|
79249cb21f
|
feat:修改版本号
|
2022-12-21 08:55:19 +08:00 |
|
lixg
|
22663e7e13
|
feat:合并
|
2022-12-21 08:47:55 +08:00 |
|
yuping
|
4036a56b29
|
Merge branch 'develop' into manage-release
# Conflicts:
# .env.release
# src/App.vue
|
2022-12-20 23:52:26 +08:00 |
|
yuping
|
207a453c27
|
-- bug
|
2022-12-20 21:38:58 +08:00 |
|
yuping
|
6c8045ff59
|
-- bug
|
2022-12-20 19:33:57 +08:00 |
|
huangshengfa
|
e7edadbc26
|
Merge branch 'pre-dev' into 'develop'
Pre dev
See merge request !23
|
2022-12-20 19:23:34 +08:00 |
|
yuping
|
b6cc723c25
|
-- 受众查询
|
2022-12-20 19:11:58 +08:00 |
|
yuping
|
389d0ac4a5
|
-- 受众查询
|
2022-12-20 18:56:33 +08:00 |
|
yuping
|
127039cc61
|
-- 受众查询
|
2022-12-20 18:48:10 +08:00 |
|
yuping
|
c5682075d0
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# src/components/student/CommonStudent.vue
|
2022-12-20 18:43:44 +08:00 |
|
yuping
|
d2d9992de9
|
-- 受众查询
|
2022-12-20 18:43:14 +08:00 |
|
lixg
|
4cacbfecfa
|
feat:合并
|
2022-12-20 18:37:17 +08:00 |
|
lixg
|
48af0a81be
|
feat:修改版本
|
2022-12-20 18:36:55 +08:00 |
|