joshen
|
f6a90ce154
|
Merge remote-tracking branch '121-git/master-20251210' into master-20251210
# Conflicts:
# src/views/study/coursenew.vue
|
2025-12-17 11:35:54 +08:00 |
|
huweihang
|
68bdbc8fb9
|
feat: 添加新的受众选择和报名功能，新增多个API请求，更新样式以优化用户体验
|
2025-12-17 11:35:18 +08:00 |
|
huweihang
|
c531867831
|
style: 调整index.scss以优化对话框和按钮的样式；更新ManageListRemote.vue以增强下拉框的交互体验和过滤功能。
|
2025-12-17 11:35:11 +08:00 |
|
赵依梦
|
fd515269ea
|
一期问题修改
|
2025-12-17 11:34:55 +08:00 |
|
joshen
|
da7c01bd46
|
Merge remote-tracking branch '121/master-20251210' into master-20251210
|
2025-12-16 20:47:16 +08:00 |
|
赵依梦
|
0bc288142e
|
一期问题修改
|
2025-12-16 20:46:47 +08:00 |
|
joshen
|
3995bedf77
|
Merge branch '20251117-new-employee' of http://10.251.129.121/boeu/learning-system-portal into master-20251210
|
2025-12-16 17:32:58 +08:00 |
|
joshen
|
5fd6ef726a
|
Merge branch '20151115-zxj' of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal into 20251117-new-employee
|
2025-12-16 17:31:25 +08:00 |
|
huweihang
|
2e69e4d209
|
[FIX]"全部"移除
(cherry picked from commit 2f1ea68c70)
|
2025-12-16 15:59:22 +08:00 |
|
zxj
|
f1c65a66af
|
fix:新员工项目学习页面移动端样式调整
|
2025-12-16 15:48:14 +08:00 |
|
xu
|
1326592eda
|
Merge branch 'refs/heads/master-bugfix-1335' into master-20251210
# Conflicts:
# src/components/PortalHeader.vue
|
2025-12-16 14:51:41 +08:00 |
|
赵依梦
|
444dbdf769
|
一期问题修改
|
2025-12-16 14:23:35 +08:00 |
|
xu
|
406c9fbf7c
|
SZX-1335在线课考试显示不正常。
|
2025-12-16 14:20:54 +08:00 |
|
joshen
|
d091b64e9c
|
fix:移除Git冲突残留的多余标签
|
2025-12-16 11:44:14 +08:00 |
|
zxj
|
feecde31c9
|
fix:格式校正
|
2025-12-16 09:10:53 +08:00 |
|
joshen
|
afe5635e5f
|
Merge branch '20251117-new-employee' of http://10.251.129.121/boeu/learning-system-portal into master-20251210
|
2025-12-15 22:58:37 +08:00 |
|
joshen
|
b9353a683a
|
Merge branch '20151115-zxj' of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal into 20251117-new-employee
|
2025-12-15 22:53:37 +08:00 |
|
zxj
|
9b2769bee9
|
fix:router新增社招新员工页面
|
2025-12-15 22:52:42 +08:00 |
|
joshen
|
a94048652a
|
Merge branch '20251117-new-employee' of http://10.251.129.121/boeu/learning-system-portal into master-20251210
|
2025-12-15 22:43:43 +08:00 |
|
joshen
|
ff7b29a920
|
Merge branch '20151115-zxj' of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal into 20251117-new-employee
|
2025-12-15 22:43:03 +08:00 |
|
zxj
|
c264ebc068
|
fix:移动端样式调整
|
2025-12-15 22:39:18 +08:00 |
|
陈昱达
|
b4b090e5c0
|
chore(header): 注释掉2025年贡献者大会选项
- 在下拉菜单中临时注释掉2025年的选项
- 保留2024年及往年的选项不变
- 为后续重新启用做准备
|
2025-12-15 21:58:15 +08:00 |
|
hehongqiang
|
f4ab9f1692
|
Merge remote-tracking branch 'yx/feature/20251130-hhq' into master-20251210
# Conflicts:
# src/components/PortalHeader.vue
# src/router/index.js
# src/views/study/TaskList.vue
|
2025-12-15 20:07:15 +08:00 |
|
cai.pingxiang
|
ca91042059
|
我的报名学习跳转提示
|
2025-12-15 19:30:08 +08:00 |
|
huweihang
|
c98f7cd2b4
|
style: 更新index.scss以增强按钮的颜色对比度；调整ManageListRemote.vue中的过滤器布局，优化用户体验。
(cherry picked from commit c9c714ddfa)
|
2025-12-15 17:58:16 +08:00 |
|
赵依梦
|
a00ba8b0e7
|
教师端1期 姓名搜索组件
|
2025-12-15 17:58:10 +08:00 |
|
陈昱达
|
02aafc8fa9
|
feat(portal): 添加2025年贡献者大会入口
- 在下拉菜单中新增2025年贡献者大会选项
- 为2024年选项添加分割线以改善视觉层次
- 配置2025年贡献者大会页面路由地址
- 确保点击2025年选项可正确跳转至对应页面
|
2025-12-15 17:49:41 +08:00 |
|
joshen
|
29fe6aa6dc
|
Merge remote-tracking branch '121/master-20251210' into master-20251210
|
2025-12-15 11:34:23 +08:00 |
|
赵依梦
|
765dc32d72
|
课程列表侧边栏修改 课程详情评分修改 课程详情章节目录修改
|
2025-12-15 11:33:59 +08:00 |
|
huangrun
|
73dc099f47
|
Merge branch 'player-20251117-v1' into master-20251210
# Conflicts:
# src/api/modules/course.js
|
2025-12-15 10:28:39 +08:00 |
|
sunli_tydic
|
ea6989cddc
|
ai视频一期功能提交-ai功能新增权限判断
|
2025-12-15 10:20:12 +08:00 |
|
赵依梦
|
78fce14500
|
教师端1期问题修复
|
2025-12-14 20:48:37 +08:00 |
|
huweihang
|
f4c73c927b
|
[FIX]置顶修改、表格居中修改
(cherry picked from commit ffeb5bf0b6)
|
2025-12-13 09:34:42 +08:00 |
|
赵依梦
|
daa3d04062
|
教师端部门展示ui调整 学习时间还原
|
2025-12-13 09:34:37 +08:00 |
|
赵依梦
|
4988024d25
|
教师端1期问题修复
|
2025-12-13 09:34:28 +08:00 |
|
huweihang
|
9ca7c27a38
|
style: 更新ManageListRemote.vue以动态计算授课教师列的最小宽度，优化输入框的最大长度限制，增强用户体验；调整index.scss以修正列表项文本对齐方式。
(cherry picked from commit f680e1c394)
|
2025-12-13 09:34:25 +08:00 |
|
huweihang
|
61fa8c1b11
|
style: 调整ManageListRemote.vue中的选择器样式，优化课程管理界面的操作按钮布局，增强用户体验；更新index.scss以修正列表项内文本对齐方式。
(cherry picked from commit ef926e6418)
|
2025-12-12 17:24:10 +08:00 |
|
joshen
|
bcb729635d
|
Merge branch '20251212-fix-1130' of http://10.251.129.121/boeu/learning-system-portal into master-20251210
|
2025-12-12 15:49:42 +08:00 |
|
joshen
|
81783c9cb3
|
Merge branch '20251212-fix-1130' of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal into 20251212-fix-1130
|
2025-12-12 15:48:45 +08:00 |
|
zxj
|
61208a6b16
|
fix:切换课程卸载iframe
|
2025-12-12 15:45:14 +08:00 |
|
joshen
|
6c40233b49
|
Merge branch '20251212-fix-1130' of http://10.251.129.121/boeu/learning-system-portal into master-20251210
|
2025-12-12 15:36:02 +08:00 |
|
joshen
|
6cb2f140ce
|
Merge branch '20251212-fix-1130' of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal into 20251212-fix-1130
|
2025-12-12 15:35:07 +08:00 |
|
zxj
|
45a537a0d4
|
fix:延迟iframe卸载
|
2025-12-12 15:33:11 +08:00 |
|
joshen
|
c8c63c4cc0
|
Merge remote-tracking branch '121/master-20251210' into master-20251210
|
2025-12-12 15:33:09 +08:00 |
|
huweihang
|
0dd42c98c3
|
style: 更新样式以优化课程管理界面，调整消息框和过滤器布局，增强用户体验。
(cherry picked from commit 2d06dde984)
|
2025-12-12 15:32:43 +08:00 |
|
joshen
|
17fe8b5d2d
|
Merge branch '20251212-fix-1130' of http://10.251.129.121/boeu/learning-system-portal into master-20251210
|
2025-12-12 15:24:29 +08:00 |
|
joshen
|
44239beec1
|
Merge branch '20251212-fix-1130' of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal into 20251212-fix-1130
|
2025-12-12 15:23:45 +08:00 |
|
joshen
|
983693f82a
|
Merge remote-tracking branch '121/master-20251210' into master-20251210
|
2025-12-12 15:20:55 +08:00 |
|
陈昱达
|
2c53f165f7
|
feat(portal): 添加2025年贡献者大会入口
- 在下拉菜单中新增2025年贡献者大会选项
- 为2024年选项添加分割线以改善视觉层次
- 配置2025年贡献者大会页面路由地址
- 确保点击2025年选项可正确跳转至对应页面
|
2025-12-12 15:20:06 +08:00 |
|
zxj
|
77b5af0f47
|
fix:延迟iframe卸载
|
2025-12-12 15:18:43 +08:00 |
|