Commit Graph

4369 Commits

Author SHA1 Message Date
yuping
21699f2c52 Merge remote-tracking branch 'origin/develop' into develop 2022-12-06 14:37:32 +08:00
yuping
9fbbc1ed06 -- 项目添加图片选择 2022-12-06 14:37:24 +08:00
wyx
56188902b4 fix:无阶段项目创建任务大纲显示问题 2022-12-06 14:27:05 +08:00
yuping
f25da7acbd Merge remote-tracking branch 'origin/develop' into develop 2022-12-06 14:24:41 +08:00
yuping
1ad265babc -- 教师课程带出数据 2022-12-06 14:24:03 +08:00
kclf
7043d76bad 富文本高度 2022-12-06 14:23:25 +08:00
kclf
f0e402990e Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop 2022-12-06 14:17:01 +08:00
kclf
ecc54f70b1 【第一轮测试-项目-添加任务】所有添加任务涉及到从列表选择数据都存在选中数据删除后再次选择依旧为选中状态,且无法进行操作 2022-12-06 14:16:58 +08:00
wyx
1016574396 style:增加项目列表筛选已结束状态 2022-12-06 14:03:01 +08:00
wyx
b039552dd1 style:隐藏项目列表已结束状态 2022-12-06 14:00:28 +08:00
kclf
d5ad11d97a Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop 2022-12-06 13:40:47 +08:00
kclf
6eeb2c540e 富文本 2022-12-06 13:40:44 +08:00
wyx
b438a412d3 fix:测评编辑问题修改 2022-12-06 13:08:18 +08:00
yuping
f70a2d46a2 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	src/components/vote/AddVote.vue
2022-12-06 12:33:24 +08:00
yuping
ca04f9e2d8 -- 下载投票模板 2022-12-06 12:30:12 +08:00
kclf
62663b8449 题干保留一条 2022-12-06 11:59:50 +08:00
kclf
6edbaec1bc 投票 2022-12-06 11:53:08 +08:00
zhangyc
f3b8b3c3df 公告历史样式 2022-12-06 09:15:35 +08:00
huangshengfa
663111a3e1 Merge branch 'dev' into 'develop'
Dev

See merge request !6
2022-12-06 09:11:47 +08:00
huangshengfa
5efa34d206 Merge branch 'develop' into 'dev'
# Conflicts:
#   src/components/drawers/AddVotebak.vue
#   src/components/drawers/CreVote.vue
2022-12-06 09:11:28 +08:00
lixg
83e33e1625 feat:修改版本号 2022-12-06 09:03:00 +08:00
zhangyc
baa1128e4e Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-12-06 07:58:49 +08:00
zhangyc
63ba48e539 选择按钮回显名称,message提示统一warning 2022-12-06 07:58:01 +08:00
yuping
36e6cacda6 Merge remote-tracking branch 'origin/develop' into develop 2022-12-06 02:09:48 +08:00
yuping
964d003362 -- 项目复制 2022-12-06 02:09:36 +08:00
kclf
c261fc5c0e Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop 2022-12-06 01:08:57 +08:00
kclf
878c1b676b 公告 2022-12-06 01:08:52 +08:00
zhangyc
730f29c1ba 面授任务回显 2022-12-06 00:56:14 +08:00
zhangyc
7fdd9f6063 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-12-06 00:34:16 +08:00
zhangyc
fc6a7258a0 选择课程作业考试后,页面回显 2022-12-06 00:34:10 +08:00
zhangyc
5847f6fcba 删除按钮显示课程名称、删除作业删除作业删出考试删除考试 2022-12-06 00:33:38 +08:00
kclf
86e61caed7 t 2022-12-06 00:16:38 +08:00
kclf
b29f6230f1 Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop 2022-12-06 00:05:39 +08:00
kclf
3ca2909a01 封面图 2022-12-06 00:05:35 +08:00
yuping
9767d2a1db Merge remote-tracking branch 'origin/develop' into develop 2022-12-05 23:47:25 +08:00
yuping
234b995e1a -- 项目创建时间格式不对 2022-12-05 23:46:33 +08:00
kclf
edbc572392 Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop 2022-12-05 23:46:04 +08:00
kclf
fecf60549e 预览弹窗 2022-12-05 23:46:00 +08:00
yuping
fc4aa7d5a8 Merge remote-tracking branch 'origin/develop' into develop 2022-12-05 23:43:45 +08:00
yuping
ac758dd54e -- 项目创建时间格式不对 2022-12-05 23:42:58 +08:00
kclf
65358d260c Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop 2022-12-05 23:17:45 +08:00
kclf
721bd80e52 t 2022-12-05 23:17:37 +08:00
wyx
38b6127197 fix:增加项目共享文档,项目审核意见 2022-12-05 23:00:29 +08:00
wyx
1f9345ec35 fix:增加项目共享文档,项目审核意见 2022-12-05 22:55:39 +08:00
kclf
54d6528569 投票有一个bug,添加的选项,如果没保存过,删不掉 2022-12-05 22:34:04 +08:00
zhangyc
a55055576d Merge branches 'develop' and 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-12-05 22:19:11 +08:00
zhangyc
53256b70b5 投票字段校验 2022-12-05 22:11:22 +08:00
lixg
cdcf65754c feat:合并 2022-12-05 21:57:14 +08:00
lixg
5a96a57208 fix:修改bug 2022-12-05 21:56:42 +08:00
wyx
9d91607314 style:隐藏授课教师初始化展示的老师 2022-12-05 21:47:39 +08:00