Commit Graph

140 Commits

Author SHA1 Message Date
zhangsir
eeceb3c66e Merge branch 'boe_0701_icon' into dev0515 2024-07-04 11:01:50 +08:00
zhangsir
af05be5f81 一层状态 2024-07-04 11:01:15 +08:00
zhangsir
193e07cfef Merge branch 'boe_0701_icon' into dev0515 2024-07-03 16:14:05 +08:00
zhangsir
2ec5ae3ee0 音频 2024-07-03 16:09:43 +08:00
zhangsir
8d65d8cabb Merge branch 'boe_0701_icon' into dev0515 2024-07-03 15:53:57 +08:00
zhangsir
4478cec6f7 作业 2024-07-03 15:53:30 +08:00
zhangsir
895d89dc7a Merge branch 'boe_0701_icon' into dev0515 2024-07-03 15:46:13 +08:00
zhangsir
6ec5e4ce45 视频 2024-07-03 15:45:47 +08:00
zhangsir
c46a331c3c Merge branch 'boe_0701_icon' into dev0515 2024-07-03 15:34:08 +08:00
zhangsir
5146e41954 进度 2024-07-03 15:33:35 +08:00
zhangsir
a33bc9885e Merge branch 'boe_0701_icon' into dev0515
# Conflicts:
#	src/views/study/coursenew.vue
2024-07-03 11:40:10 +08:00
zhangsir
3e8ec03c0e 除视频音频考试三秒 2024-07-03 11:37:47 +08:00
zhangsir
b71727263a Merge branch 'boe_0701_icon' into dev0515 2024-07-03 09:45:29 +08:00
zhangsir
e016e1aacc 三秒 2024-07-03 09:44:55 +08:00
zhangsir
cc1970f79f Merge branch 'boe_0701_icon' into dev0515
# Conflicts:
#	src/assets/images/ban.png
#	src/views/study/coursenew.vue
2024-07-01 17:47:16 +08:00
zhangsir
4e1f2e4e1d 修改图标 2024-07-01 17:44:54 +08:00
zhangsir
416cc7a8ea Merge branch 'zcwy-master' into pingcode-20240615
# Conflicts:
#	src/views/study/coursenew.vue
2024-06-19 18:42:20 +08:00
joshen
15f11ae4c9 视频禁用拖动修改 2024-06-19 17:44:44 +08:00
joshen
5e3b122984 学员端视频播放器逻辑调整 2024-06-18 14:22:11 +08:00
zhangsir
10e82a1608 修改显示方式 2024-06-17 08:54:33 +08:00
zhangsir
a535b6ee85 课程优化 2024-06-14 16:19:28 +08:00
zhangsir
3264dcaa43 差只展示一个 2024-06-13 17:30:57 +08:00
zhangsir
c37442103a 在线课程修改 2024-06-12 18:11:37 +08:00
joshen
e860454a2a Merge branch 'zcwy-master' into 'master'
视频加进度

See merge request !119
2024-06-04 17:48:08 +08:00
zhangsir
27a01840cf 视频加进度 2024-06-04 09:26:10 +08:00
joshen
4f1b676bcd Merge branch 'zcwy-master' into 'master'
修改

See merge request !117
2024-06-03 20:50:24 +08:00
zhangsir
7d27f428b5 修改 2024-06-03 20:49:09 +08:00
joshen
62bb40ea6a Merge branch 'zcwy-master' into 'master'
Zcwy master

See merge request !112
2024-05-28 19:20:54 +08:00
zhangsir
d463e896a6 在线课study回滚 2024-05-28 15:01:48 +08:00
zhangsir
1ea0e209fe 添加参数 2024-05-28 13:49:39 +08:00
joshen
2f24013dac Merge branch 'zcwy-master' into 'master'
Zcwy master

See merge request !111
2024-05-27 21:16:15 +08:00
zhangsir
17d461cdc4 在线课添加状态 2024-05-27 20:29:16 +08:00
zhangsir
2e099b4f73 视频添加进行状态 2024-05-27 17:15:26 +08:00
zhangsir
3200aeb58e 时间3秒 2024-05-27 17:11:28 +08:00
joshen
7a3e93426f edit page saveStudyInfo 2024-05-13 17:29:35 +08:00
joshen
2dc6fa182c edit progress=100 2024-05-12 06:15:25 +08:00
joshen
7ffd784add delete test alert 2024-05-12 05:59:29 +08:00
joshen
dfe1d9bd84 add test alert 2024-05-12 05:56:28 +08:00
zhangsir
c3b0a1f12e 在线课bug修改 2024-04-26 11:23:24 +08:00
zhangsir
12c4855be9 按钮显示 2024-01-11 13:52:23 +08:00
nisen
5c1ecc348a 修改正常视频暂停播放时十五秒的问题 2023-11-23 11:04:28 +08:00
nisen
8105682cd0 提前调用函数计时 2023-11-22 14:05:52 +08:00
nisen
edec2b7f30 修改正常视频记录时长问题 2023-11-22 13:59:44 +08:00
nisen
18092b9a0b 播放视频时,解决视频加载一直计时问题 2023-11-21 10:17:01 +08:00
nisen
6a811e42bc 修改小数转型 2023-11-20 15:46:50 +08:00
nisen
b4f42f8556 暂停时把时间请空重新计算 2023-11-20 14:31:20 +08:00
nisen
ed2fef1d4b 修改课程案例和文章时长 2023-11-20 13:40:06 +08:00
nisen
a3fb600f4d 修改正常视频浏览器静默状态的上传时间 2023-11-17 14:18:25 +08:00
nisen
a87b9c1e5e 非音频过滤scorm项目 2023-11-09 16:23:25 +08:00
nisen
e0377d8abc 课程详情非音频第一次十五秒发送 2023-11-09 11:37:43 +08:00