Commit Graph

3983 Commits

Author SHA1 Message Date
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
nisen
c5fa6e205a 案例推荐页码数 2023-08-09 14:46:09 +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
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
yujicun
e02ce735fc Merge remote-tracking branch 'boe/cloud' into dev0731 2023-08-08 10:47:54 +08:00
yuping
6f088ec29c ---fix bug 2023-08-08 08:47:55 +08:00
yuping
715b5eae1c Merge remote-tracking branch 'origin/user-modify' into user-modify 2023-08-08 08:20:44 +08:00
yuping
f3306efce0 ---fix bug 2023-08-08 08:20:29 +08:00
nisen
aa366d7be0 项目面授开课数据显示 2023-08-07 21:11:53 +08:00
nisen
702a901067 面授管理创建开课时间 2023-08-07 16:04:19 +08:00
yujicun
0bcbac975a Merge remote-tracking branch 'boe/dev_0801test' into dev0731 2023-08-07 09:50:52 +08:00
weixiaobo@boe.com.cn
8b08ea1f4e Merge remote-tracking branch 'origin/dev_202306' into dev_0801test 2023-08-07 09:49:35 +08:00
weixiaobo@boe.com.cn
f8b2ff3ef0 复制受众样式修改 2023-08-07 09:49:00 +08:00
weixiaobo@boe.com.cn
1d19e41ed3 受众搜索时pagaNo重置 2023-08-07 09:37:22 +08:00
yujicun
dfe1f28b8f Merge remote-tracking branch 'boe/dev0731' into dev0731 2023-08-05 16:12:07 +08:00
yujicun
3f6e1b261e Merge remote-tracking branch 'origin/user-modify' into dev0731 2023-08-05 16:11:10 +08:00
yuping
1a8836b4d5 fix bug 2023-08-05 15:44:44 +08:00
nisen
c0bf470fce change tips text 2023-08-05 15:33:55 +08:00
yujicun
c85f4fde57 Merge remote-tracking branch 'origin/user-modify' into dev0731 2023-08-05 15:08:39 +08:00
yuping
3cb3f34fcc fix bug 2023-08-05 14:23:57 +08:00
yuping
4785a53997 fix bug 2023-08-05 14:19:36 +08:00
yujicun
d90d9edf17 Merge remote-tracking branch 'boe/dev0731' into dev0731 2023-08-05 14:17:36 +08:00
yujicun
b15ea31e47 Merge remote-tracking branch 'origin/user-modify' into dev0731 2023-08-05 14:16:53 +08:00
yuping
49e6d82d1b fix bug 2023-08-05 14:14:08 +08:00
nisen
987a6d6b5f 面授开课编辑和删除 2023-08-05 14:01:03 +08:00
yujicun
e8f1d09d29 Merge remote-tracking branch 'boe/dev0731' into dev0731 2023-08-05 10:37:20 +08:00
yujicun
a660fa8685 Merge remote-tracking branch 'origin/user-modify' into dev0731 2023-08-05 10:36:59 +08:00
yuping
8b8d808ce4 fix bug 2023-08-04 18:53:25 +08:00
yuping
3b7b408897 fix bug 2023-08-04 18:50:22 +08:00
nisen
d18972e139 面授开课的编辑和删除弹窗 2023-08-04 18:33:30 +08:00