Commit Graph

4009 Commits

Author SHA1 Message Date
weixiaobo@boe.com.cn
e18cb82671 组织数据概览时间参数修改 2023-08-24 17:40:31 +08:00
weixiaobo@boe.com.cn
1dc8e45917 运营数据概览选择逻辑 2023-08-24 17:31:50 +08:00
weixiaobo@boe.com.cn
f32e19dc7b 运营数据概览接口调整 2023-08-24 15:25:17 +08:00
weixiaobo@boe.com.cn
935ca5f09a 组织学习数据概览total接口带参数 2023-08-24 13:38:12 +08:00
weixiaobo@boe.com.cn
482eca3d5f 组织学习数据概览创建时间 2023-08-23 10:38:39 +08:00
weixiaobo@boe.com.cn
e18c3801d4 组织学习数据概览 2023-08-22 19:04:22 +08:00
weixiaobo@boe.com.cn
3df0281430 组织选择修改 2023-08-22 19:03:42 +08:00
weixiaobo@boe.com.cn
ab12f070d6 员工学习数据页面修改 2023-08-22 11:25:17 +08:00
weixiaobo@boe.com.cn
825d697ee5 案例组织树后调table 2023-08-22 11:24:35 +08:00
weixiaobo@boe.com.cn
a246b16a83 表格样式修改 2023-08-22 10:07:47 +08:00
weixiaobo@boe.com.cn
c287b3d86e 员工学习数据 2023-08-21 18:42:53 +08:00
weixiaobo@boe.com.cn
7b5ca6dc8e 考试报表 2023-08-21 18:38:19 +08:00
weixiaobo@boe.com.cn
d0256f0ae3 问答报表 2023-08-21 18:38:03 +08:00
weixiaobo@boe.com.cn
05324f2b78 文章报表 2023-08-21 18:26:10 +08:00
weixiaobo@boe.com.cn
f48f12936e 案例报表 2023-08-21 18:25:52 +08:00
weixiaobo@boe.com.cn
d91308801f 课程报表 2023-08-21 18:25:34 +08:00
weixiaobo@boe.com.cn
88f0f3e315 项目报表 2023-08-21 18:25:16 +08:00
weixiaobo@boe.com.cn
f3e99fa504 路径图报表 2023-08-21 17:14:59 +08:00
weixiaobo@boe.com.cn
55ca2e4273 项目报表 2023-08-18 18:43:44 +08:00
BOE\10867418
f902de8044 更新 2023-08-18 17:49:38 +08:00
joshen
7ce5070e88 Merge branch 'dev0731' into 'master'
Dev0731

See merge request !102
2023-08-17 17:55:50 +08:00
BOE\10867418
c5f935b449 fix 2023-08-17 16:28:41 +08:00
BOE\10867418
311a4f8d72 fix 2023-08-17 15:56:10 +08:00
BOE\10867418
647ae66498 fix 2023-08-17 15:34:19 +08:00
BOE\10867418
f74909bc6c 修改 2023-08-17 15:23:14 +08:00
BOE\10867418
cfc1f3ab77 fix 2023-08-17 15:16:01 +08:00
BOE\10867418
46c4b4305e 修改路径图的组织树获取接口 2023-08-17 15:03:29 +08:00
nisen
8c2b8b8944 面授开课编辑 2023-08-15 11:25:34 +08:00
BOE\10867418
edd9d95fbf Merge branch 'dev_0801test' into dev0731
# Conflicts:
#	src/components/NavLeft.vue
2023-08-15 10:38:04 +08:00
weixiaobo@boe.com.cn
272d91f721 餐单放开报表中心 2023-08-15 10:36:18 +08:00
nisen
cf931d4112 学习路径和项目的开课编辑 2023-08-15 10:01:26 +08:00
U-BOE\ZXYJY05
fb303d7c46 编辑和删除 2023-08-11 10:22:25 +08:00
nisen
f44fb7afb9 学习路径图课程不能编辑和删除 2023-08-11 09:43:49 +08:00
nisen
1bc8737beb 修改 2023-08-10 18:30:20 +08:00
nisen
522ed89fb7 开课编辑把时间变成空 2023-08-10 17:56:13 +08:00
nisen
9d70563431 学习路径图和项目的开课新建课程传递时间 2023-08-10 17:52:16 +08:00
joshen
2a0b2b7ff2 Merge branch 'dev0731' into 'master'
案例推荐页码数

See merge request !101
2023-08-09 20:08:47 +08:00
nisen
c5fa6e205a 案例推荐页码数 2023-08-09 14:46:09 +08:00
449427055
f55eada741 Merge branch 'dev0731' into 'master'
Dev0731

See merge request !100
2023-08-08 19:09:19 +08:00
yujicun
e6f19b6fca Merge remote-tracking branch 'boe/dev0731' into dev0731 2023-08-08 19:04:54 +08:00
yujicun
b2619a406e 修改菜单 2023-08-08 19:03:38 +08:00
joshen
74adf3daa4 Merge branch 'dev0731' into 'master'
Dev0731

See merge request !99
2023-08-08 19:00:05 +08:00
nisen
0e074061e7 面授编辑限制 2023-08-08 18:33:32 +08:00
yujicun
bacc3249a9 修改合并错误 2023-08-08 17:17:57 +08:00
yujicun
eef5e2a61d 合并解决冲突 2023-08-08 17:00:48 +08:00
yuping
fd4d72b9c4 Merge branch 'master' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into user-modify 2023-08-08 16:50:18 +08:00
yuping
fa31a9ff12 ---fix bug 2023-08-08 15:33:49 +08:00
yuping
56f64149a7 ---fix bug 2023-08-08 15:29:04 +08:00
yujicun
3c2bd7af14 Merge remote-tracking branch 'origin/user-modify' into dev0731 2023-08-08 11:24:44 +08:00
yujicun
8070f8cbd7 Merge remote-tracking branch 'boe/dev0731' into dev0731 2023-08-08 10:49:08 +08:00