Commit Graph

3554 Commits

Author SHA1 Message Date
yuping
615d1517c4 -- fix bug 2023-03-02 16:51:16 +08:00
yuping
da565f0933 -- fix bug 2023-03-02 16:45:29 +08:00
yuping
6dd6208747 -- fix bug 2023-03-02 16:34:06 +08:00
yuping
10130be13b Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	src/components/drawers/AddEval.vue
2023-03-02 16:32:18 +08:00
yuping
2ebd49fa2f -- fix bug 2023-03-02 16:31:30 +08:00
lixg
5fd944b999 feat:合并 2023-03-02 16:04:43 +08:00
lixg
5691a5f4c5 feat:修改在线课二维码 2023-03-02 15:57:32 +08:00
caozc
b07f086384 Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop 2023-03-02 15:34:07 +08:00
dongruihua
5bd354c83b Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop 2023-03-02 14:59:09 +08:00
yuping
5888be784d -- fix bug 2023-03-02 12:03:12 +08:00
yuping
369fa8e263 -- fix bug 2023-03-02 11:54:50 +08:00
yuping
beea2b6c9a Merge remote-tracking branch 'origin/develop' into develop 2023-03-02 11:48:28 +08:00
yuping
5f1157c028 -- fix bug 2023-03-02 11:48:11 +08:00
dongruihua
829bb4b3d1 Merge branch 'manage-release' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into release 2023-03-02 10:17:59 +08:00
dongruihua
347dd329f6 Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop 2023-03-02 09:33:40 +08:00
wyx
38ea005e66 fix:修改版本号 2023-03-02 09:17:55 +08:00
lpq
0859e1f4d2 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2023-03-01 22:31:10 +08:00
lpq
953939a7c5 小组人员重复 2023-03-01 22:31:01 +08:00
lixg
cd3c4d42cc feat:合并 2023-03-01 22:18:01 +08:00
lixg
435afa25bc feat:修改投票二维码传参 2023-03-01 22:17:38 +08:00
wyx
2dbfaff2e2 style:已审核项目 2023-03-01 21:51:48 +08:00
lpq
7e7a71f095 解决工号问题 2023-03-01 21:49:33 +08:00
lixg
d19b028274 feat:修改项目任务二维码 2023-03-01 21:48:17 +08:00
lixg
95c052c1a9 feat:合并 2023-03-01 21:45:54 +08:00
lixg
256ad60f95 feat:修改评估 2023-03-01 21:44:29 +08:00
wyx
0655db6c42 style:审核管理模块按钮样式修改 2023-03-01 21:41:13 +08:00
dongruihua
94eaf1756c Merge branch 'manage-release' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into release 2023-03-01 17:13:32 +08:00
huangshengfa
2f01d25ad8 Merge branch 'dev_m' into 'develop'
feat: 概览页面新增全部导出接口

See merge request !49
2023-03-01 16:06:56 +08:00
caozc
5d66b29b53 Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop 2023-03-01 15:10:43 +08:00
mx00085@163.com
4cef3646e8 feat: 概览页面新增全部导出接口 2023-03-01 14:52:17 +08:00
dongruihua
94af14036e Merge branch 'manage-release' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into release 2023-03-01 14:49:14 +08:00
yuping
ce554b07f4 Merge remote-tracking branch 'origin/develop' into develop 2023-03-01 13:50:54 +08:00
yuping
635561331f -- fix 嵌入url 2023-03-01 13:50:41 +08:00
dongruihua
385070e56d Merge remote-tracking branch 'remotes/origin/dev_m' into develop 2023-03-01 13:48:01 +08:00
mx00085@163.com
0849e868f0 fix: 新增字段,搜索框筛选 2023-03-01 13:42:38 +08:00
huangshengfa
333fe06024 Merge branch 'dev_m' into 'develop'
fix: 概览页面状态更改

See merge request !48
2023-03-01 10:59:58 +08:00
mx00085@163.com
44028277d4 fix: 概览页面状态更改 2023-03-01 10:36:27 +08:00
dongruihua
931bd12bbc Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop 2023-03-01 09:17:39 +08:00
quhongwei
0e2b3be798 Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop 2023-03-01 02:24:10 +08:00
quhongwei
3a95fb725b 修改考试管理 2023-03-01 02:24:04 +08:00
caozc
af740bde83 Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop 2023-03-01 00:23:50 +08:00
caozc
351626701c fix:投票管理-查看投票无数据
项目复制 一直转圈
2023-03-01 00:23:29 +08:00
lpq
92b4284ae9 去掉debugger 2023-02-28 23:33:26 +08:00
lpq
fd19d93ef0 增加学号 2023-02-28 23:14:00 +08:00
yuping
cddfa6efde -- fix 评估 2023-02-28 21:01:58 +08:00
yuping
960e294352 -- fix 评估 2023-02-28 20:46:55 +08:00
yuping
e56ae852fb -- fix 评估 2023-02-28 20:06:31 +08:00
yuping
79fccebaab Merge remote-tracking branch 'origin/develop' into develop 2023-02-28 20:04:06 +08:00
yuping
c4f12a5b3a -- fix 评估 2023-02-28 20:03:54 +08:00
lixg
87028ab690 feat:修改直播二维码跳转 2023-02-28 19:32:04 +08:00