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 |
|
yuping
|
898d735411
|
--fix bug
|
2023-03-30 00:44:13 +08:00 |
|
yuping
|
991044074a
|
--fix bug
|
2023-03-30 00:05:12 +08:00 |
|
yuping
|
74a8474eec
|
Merge remote-tracking branch 'origin/develop' into develop
|
2023-03-29 23:17:34 +08:00 |
|
yuping
|
f2fe6a17c8
|
--fix bug
|
2023-03-29 23:17:19 +08:00 |
|
wyx
|
07b1bc898a
|
fix
|
2023-03-29 20:19:13 +08:00 |
|
BOE\10867418
|
587384051e
|
Merge branch 'dev_m' into develop
|
2023-03-29 17:16:05 +08:00 |
|
mx00085@163.com
|
f68575d08e
|
fix: 报表三期样式修改
|
2023-03-29 17:10:21 +08:00 |
|
mx00085@163.com
|
e63092e3fe
|
Merge branch 'dev_m' of http://10.251.129.121/boeu/fe-manage into dev_m
|
2023-03-29 16:29:40 +08:00 |
|
mx00085@163.com
|
bf2e938bf4
|
feat: 报表三期接口联调
|
2023-03-29 16:29:15 +08:00 |
|
BOE\10867418
|
67c0b447de
|
Merge branch 'dev_m' into develop
|
2023-03-29 15:12:45 +08:00 |
|
BOE\10867418
|
f8fa3a0bb5
|
Merge branch 'dev_m' into develop
|
2023-03-29 14:53:35 +08:00 |
|
yuping
|
2ecf1f3183
|
--fix 版本号
|
2023-03-29 12:32:42 +08:00 |
|