Commit Graph

3580 Commits

Author SHA1 Message Date
joshen
d76d88f54b fix:解决冲突 2025-12-11 00:16:40 +08:00
joshen
3617c24934 Merge branch '20251117-new-employee' of http://10.251.129.121/boeu/learning-system-portal into master-20251210 2025-12-10 23:37:37 +08:00
joshen
80c05f4c4d Merge branch '20251117-new-employee' of http://10.251.129.121/boeu/learning-system-portal; branch '20151115-zxj' of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal into 20251117-new-employee 2025-12-10 23:26:19 +08:00
zxj
b3fcf750d0 fix:非自主报名时不显示报名按钮 2025-12-10 18:21:24 +08:00
joshen
70dc2b2494 Merge branch 'player-20251117-v1' into master-20251210 2025-12-10 17:27:20 +08:00
sunli_tydic
cbb36b429b ai视频一期功能提交-样式修改 2025-12-10 16:28:22 +08:00
sunli_tydic
a1b8c617e4 ai视频一期功能提交-增加判断条件 2025-12-10 16:17:58 +08:00
joshen
4dbc170754 Merge branch 'player-20251117-v1' into master-20251210
# Conflicts:
#	src/views/study/coursenew.vue
2025-12-10 15:30:16 +08:00
huweihang
7680bfe468 Enhance ManageListRemote.vue: 更新输入框占位符,强制设置输入框最大长度,改进教师与创作者选项标签,并应用自定义滚动条样式以提升界面一致性。 2025-12-10 15:10:01 +08:00
sunli_tydic
8168c8880d ai视频一期功能提交-批量修改语种问题+字幕样式问题 2025-12-10 14:46:06 +08:00
xu
3c087c9222 Merge branch 'refs/heads/bugfix-1324' into master-20251210 2025-12-10 14:38:37 +08:00
xu
e629d127ab SZX-1324视频播放卡顿。 2025-12-10 14:38:17 +08:00
xu
933c8f2354 Merge branch 'refs/heads/bugfix-1324' into master-20251210 2025-12-10 14:25:31 +08:00
xu
909a70643f SZX-1324视频播放卡顿。 2025-12-10 14:24:13 +08:00
xu
a7d6f59f76 Merge branch 'refs/heads/bugfix-1324' into master-20251210 2025-12-10 14:17:30 +08:00
xu
3c19a7550c SZX-1324视频播放卡顿。 2025-12-10 14:16:52 +08:00
sunli_tydic
7d3ab9b6b6 ai视频一期功能提交-切换视频时不选择字幕 2025-12-10 13:47:05 +08:00
sunli_tydic
27e76da571 ai视频一期功能提交 2025-12-10 13:21:57 +08:00
huweihang
9095a77fb9 [FXI]在线管理列表函数打印 2025-12-10 11:57:38 +08:00
huweihang
348b5da6e9 feat: 添加课程管理新版组件及路由,更新ManageListRemote.vue以优化查询按钮文本和二维码功能 2025-12-10 11:57:26 +08:00
huweihang
181bd1d675 style #app样式修改 2025-12-10 11:57:20 +08:00
huweihang
8d8b62ee62 Update scrollbar 滚动条样式:增加边框半径并调整尺寸以提高美观度。 2025-12-10 11:57:06 +08:00
huweihang
aa1ea669e2 Refactor ManageListRemote.vue: 使用管理列表的新类更新布局,重构过滤器操作,并增强分页和滚动条的样式。 2025-12-10 11:56:55 +08:00
赵依梦
8df27adb28 教师端1期需求 2025-12-10 11:56:50 +08:00
huweihang
110b920725 feat:新增用户检索功能,更新课程管理页面,添加课程置顶排序组件,优化课程管理列表,支持新课程管理视图。 2025-12-10 11:56:40 +08:00
赵依梦
c2242631a0 教师端1期需求 2025-12-10 11:54:58 +08:00
joshen
82c765edd4 合并完的文件 2025-12-10 11:08:43 +08:00
joshen
9dd8efc9aa Merge branch 'player-20251117-v1' into master-20251210
# Conflicts:
#	src/api/modules/course.js
#	src/components/Course/courseForm.vue
#	src/security.js
#	src/views/portal/course/Index.vue
#	src/views/study/coursenew.vue
2025-12-10 11:00:15 +08:00
sunli_tydic
39d29c0dad 合并测试环境代码准备备用页面 2025-12-10 10:37:00 +08:00
670788339
8bed676851 外部讲师的默认头像(合并冲突过多重新提) 2025-12-09 18:15:01 +08:00
670788339
9dbb5e2d89 Merge branch 'PingCode-20251117' into 104-master
# Conflicts:
#	src/views/study/coursenew.vue
2025-12-09 18:11:11 +08:00
sunli_tydic
311ec096eb ai视频一期功能提交 2025-12-09 15:36:41 +08:00
sunli_tydic
9379aad28f ai视频一期功能提交 2025-12-09 13:50:11 +08:00
sunli_tydic
fa1bcaf1c7 ai视频一期功能提交 2025-12-09 11:21:27 +08:00
sunli_tydic
3ee4afb229 ai视频一期功能提交 2025-12-09 10:39:16 +08:00
sunli_tydic
82dcfa6348 ai视频一期功能提交 2025-12-09 10:26:02 +08:00
joshen
738add6f18 Merge branch 'master' into ebiz-uat-2025-11-06 2025-12-04 19:30:29 +08:00
joshen
a7763057c4 Merge remote-tracking branch 'aliyun/20251203-fix-1320' 2025-12-04 17:18:25 +08:00
joshen
421e2b2c51 Merge remote-tracking branch 'aliyun/ebiz-uat-2025-11-06' into ebiz-uat-2025-11-06 2025-12-04 11:07:03 +08:00
zxj
12e91854fe fix:恢复保留其余选择条件的逻辑 2025-12-03 17:46:13 +08:00
zxj
3852a92ab3 fix:返回列表页时先触发校验再执行接口 2025-12-03 17:40:44 +08:00
zxj
56103bbdf6 fix:案例详情页点击搜索返回列表页时触发接口 2025-12-03 17:21:04 +08:00
zxj
d2f3b2d79c fix:解决案例详情页搜索不生效问题 2025-12-03 16:33:23 +08:00
bjzhoujian
4e1940b36f 设置ai弹窗滑动 2025-12-02 10:57:24 +08:00
joshen
3e344a8374 Merge branch 'master' into ebiz-uat-2025-11-06 2025-11-27 17:58:33 +08:00
joshen
82598dd5e0 Merge branch '20251124-fix-1302' 2025-11-27 17:10:43 +08:00
zxj
da72c156e9 fix:修复案例详情校验携带缓存 2025-11-27 12:19:47 +08:00
joshen
f9bd1b3010 Merge branch '20151115-zxj' of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal into 20251117-new-employee 2025-11-26 15:50:36 +08:00
zxj
051d35f540 fix:成绩下载按钮逻辑优化 2025-11-26 15:21:22 +08:00
joshen
f731bb425f Merge branch '20251124-fix-1302' 2025-11-25 19:09:03 +08:00