Commit Graph

3637 Commits

Author SHA1 Message Date
wyx
55cc6e3162 style 2023-04-04 12:15:11 +08:00
BOE\10867418
1a5d88344a Merge branch 'dongwu-develop' into develop
# Conflicts:
#	src/App.vue
2023-04-04 09:36:29 +08:00
wyx
7e4896797c fix:修改版本号 2023-04-04 08:55:07 +08:00
yuping
800c49e2d1 --fix bug 2023-04-04 00:02:35 +08:00
BOE\10867418
b7a2cbecf8 Merge branch 'dev_m' into develop 2023-04-03 18:17:41 +08:00
BOE\10867418
4abc6cd2fc 修改 2023-04-03 18:17:31 +08:00
yuping
908dd886af --fix bug 2023-04-03 18:12:54 +08:00
BOE\10867418
93f43f3cd5 Merge branch 'dev_m' into develop 2023-04-03 17:38:08 +08:00
BOE\10867418
406ed322cf 路径图添加创建人 2023-04-03 17:37:36 +08:00
BOE\10867418
6a94bb4979 Merge branch 'dongwu-develop' into develop
# Conflicts:
#	src/App.vue
2023-04-03 17:17:58 +08:00
wyx
25a8b57232 fix:修改版本号 2023-04-03 17:09:00 +08:00
yuping
8cd130562d --fix bug 2023-04-03 16:35:48 +08:00
yuping
afe3f9f2c1 --fix bug 2023-04-03 16:14:43 +08:00
yuping
82f66ca3af --fix bug 2023-04-03 14:57:52 +08:00
BOE\10867418
bc8d68c836 Merge branch 'dev_m' into develop 2023-04-03 14:18:58 +08:00
BOE\10867418
2629eca889 屏蔽去除,过滤导出 2023-04-03 14:18:13 +08:00
yuping
9e4344674d Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop
 Conflicts:
	src/App.vue
2023-04-03 13:46:35 +08:00
wyx
fca6a654fc fix:添加面授课的开课,无法配置作业问题 2023-04-03 13:40:29 +08:00
BOE\10867418
e2d6584d84 Merge branch 'dongwu-develop' into develop 2023-04-03 09:26:11 +08:00
wyx
c97df0dae8 fix:修改版本号 2023-04-03 09:06:51 +08:00
BOE\10867418
3b000afc13 Merge branch 'dev_m' into develop 2023-03-31 15:39:25 +08:00
mx00085@163.com
3cfbe61a7d fix: 项目状态更改 2023-03-31 15:13:15 +08:00
mx00085@163.com
9c72962978 fix: 项目状态更改 2023-03-31 15:01:36 +08:00
BOE\10867418
f86b4c77e8 Merge branch 'dev_m' into develop 2023-03-31 13:53:07 +08:00
mx00085@163.com
e83b300ea5 feat: 新增柱状图大窗口显示 2023-03-31 13:50:17 +08:00
yuping
b4ac4d36a3 --fix bug 2023-03-31 11:30:30 +08:00
yuping
f6da468431 Merge branch 'develop' into manage-release
# Conflicts:
#	src/App.vue
2023-03-31 11:30:06 +08:00
BOE\10867418
67606199b7 Merge branch 'dev_m' into develop 2023-03-31 10:51:11 +08:00
mx00085@163.com
521d4a2c82 fix: 运营数据概览bug修复 2023-03-31 10:50:16 +08:00
BOE\10867418
0e53f6bdc3 Merge branch 'dev_m' into develop 2023-03-31 10:05:18 +08:00
mx00085@163.com
45b3de29f6 fix: eChart自适应更改,考试页面新增导出详情按钮 2023-03-31 10:03:59 +08:00
BOE\10867418
e9e516fe75 Merge branch 'dongwu-develop' into develop 2023-03-31 09:15:15 +08:00
yuping
49de1962bc Merge remote-tracking branch 'origin/develop' into develop 2023-03-30 17:53:57 +08:00
yuping
c1710638c6 --fix bug 2023-03-30 17:53:45 +08:00
wyx
38289b5b62 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2023-03-30 17:34:07 +08:00
wyx
9bd1bcaa01 fix:导入小组长后重新获取列表数据 2023-03-30 17:34:00 +08:00
BOE\10867418
6886ded4a8 Merge branch 'dongwu-develop' into develop 2023-03-30 16:14:15 +08:00
yuping
27493c9f58 --fix bug 2023-03-30 16:06:40 +08:00
yuping
c8a45eacba Merge remote-tracking branch 'origin/develop' into develop 2023-03-30 15:17:13 +08:00
yuping
1760b7963a --fix bug 2023-03-30 15:16:59 +08:00
wyx
993e034f81 fix:增加导入小组长成功提示,增加开课编辑考试时只允许编辑时间,删除可继续添加设置 2023-03-30 15:12:00 +08:00
BOE\10867418
c42ba9e48e Merge branch 'dev_m' into develop 2023-03-30 14:55:40 +08:00
mx00085@163.com
4fb5105b03 feat: 营运数据接口联调,部分央视修改 2023-03-30 14:53:34 +08:00
wyx
fc6f0b2272 fix:项目路径图撤回 2023-03-30 13:50:14 +08:00
wyx
54ebbe8845 fix 2023-03-30 10:58:12 +08:00
BOE\10867418
b267961cc8 Merge branch 'dev_m' into develop 2023-03-30 10:07:21 +08:00
mx00085@163.com
42e0665c37 fix: 部分bug修复 2023-03-30 10:01:40 +08:00
BOE\10867418
ed202eaf4d Merge branch 'dev_m' into develop 2023-03-30 09:43:22 +08:00
mx00085@163.com
6ef948e01b fix: 部分bug修复 2023-03-30 09:41:36 +08:00
BOE\10867418
e95ec9af63 Merge branch 'dongwu-develop' into develop 2023-03-30 09:00:26 +08:00