3146 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
joshen	90ca7e4750	pc播放器拖动修改	2024-10-16 19:53:35 +08:00
zhangsir	8f014f65ab	Merge remote-tracking branch 'boe/dev0515' into dev0515	2024-10-16 16:50:32 +08:00
zhangsir	da4a563d03	Merge branch 'zcwy_0806_paihangb' into dev0515	2024-10-16 16:49:59 +08:00
zhangsir	14a94d1fb1	排行榜修改	2024-10-16 16:49:14 +08:00
nisen	e44279c92f	Merge branch 'master_1008' into dev_master	2024-10-15 18:14:56 +08:00
joshen	88b09f1252	Merge branch 'master-video-0930' into 'master' ... PC视频播放器添加禁止拖动视频 See merge request !123	2024-10-15 17:49:10 +08:00
joshen	590da41c59	PC视频播放器添加禁止拖动视频	2024-10-10 23:00:16 +08:00
nisen	cbedc3f880	Merge branch 'zcwy_0806_paihangb' into master_1008	2024-10-10 16:53:12 +08:00
nisen	979deec1a4	Merge branch 'zcwy_0723_hotforum' into master_1008	2024-10-09 19:15:03 +08:00
nisen	2e51ef1a2f	Merge branch 'zcwy_0822_case' into master_1008	2024-10-09 13:48:20 +08:00
zhangsir	2fc835ca8d	认证讲师库修改名字	2024-10-09 13:45:54 +08:00
zhangsir	dc01a523f7	新增视频缓存打印	2024-10-09 12:15:08 +08:00
nisen	b9a24bcf29	Merge branch 'zcwy_0723_hotforum' into dev0515	2024-10-09 11:23:28 +08:00
zhangsir	ea910687f5	删除打印	2024-10-09 11:20:15 +08:00
nisen	c326322469	Merge branch 'zcwy_0723_hotforum' into dev0515	2024-10-09 11:11:46 +08:00
zhangsir	f27d82c536	打印报错信息	2024-10-09 11:10:48 +08:00
nisen	24d45506ce	Merge branch 'zcwy_0723_hotforum' into dev0515	2024-10-09 10:52:25 +08:00
zhangsir	f6c4e984df	打印报错信息	2024-10-09 10:51:19 +08:00
nisen	ffcc049215	Merge branch 'zcwy_0723_hotforum' into dev0515	2024-10-09 09:18:14 +08:00
zhangsir	14bf033539	自定义考试修改数据结构	2024-10-09 09:16:05 +08:00
nisen	2fa1226004	Merge branch 'zcwy_0806_paihangb' into master_1008	2024-10-08 18:01:17 +08:00
nisen	f1341430ad	Merge branch 'zcwy_0723_hotforum' into dev0515 ... # Conflicts: # src/components/Course/exam.vue	2024-10-08 15:57:49 +08:00
zhangsir	25187601cc	考试修改	2024-10-08 15:54:56 +08:00
nisen	bb89315102	Merge branch 'zcwy_0726_download' into dev_master	2024-09-27 20:43:42 +08:00
zhangsir	75eba179d1	添加报错信息	2024-09-27 20:42:48 +08:00
nisen	3b90fd3597	Merge branch 'zcwy_0726_download' into dev_master	2024-09-27 20:21:11 +08:00
zhangsir	54435b91d1	补全代码	2024-09-27 20:15:23 +08:00
nisen	14eb6abc0d	Merge branch 'zcwy_0726_download' into dev_master	2024-09-27 19:48:28 +08:00
zhangsir	73cca9ce75	增加	2024-09-27 19:47:33 +08:00
nisen	c5c7aa175d	Merge branch 'zcwy_0822_case' into dev_master	2024-09-27 17:52:02 +08:00
nisen	14b6fb59f9	补交文件	2024-09-27 17:41:52 +08:00
nisen	05a3d9b874	Merge branch 'zcwy_0723_hotforum' into dev_master	2024-09-27 17:40:42 +08:00
nisen	7d98bb4ddf	补交回退导致丢失的文件	2024-09-27 17:39:51 +08:00
nisen	336d692ea9	Merge branch 'zcwy_0726_download' into dev_master	2024-09-27 17:35:48 +08:00
nisen	4738642579	Merge branch 'zcwy_0723_hotforum' into dev0515	2024-09-27 15:40:24 +08:00
zhangsir	b8d84c3be6	试题导入报错显示	2024-09-27 15:39:18 +08:00
nisen	f999c89102	尸体模板修改	2024-09-27 15:33:07 +08:00
nisen	6967ef24ed	Merge remote-tracking branch '121/dev0515' into dev0515	2024-09-27 14:38:39 +08:00
nisen	f2ffeae2ae	尸体模板修改	2024-09-27 14:35:37 +08:00
nisen	1e867452bd	Merge branch 'zcwy_0723_hotforum' into dev_master	2024-09-25 16:59:50 +08:00
zhangsir	56634f8117	pdf为空加载异常	2024-09-25 11:02:11 +08:00
zhangsir	2d74778f33	Merge branch 'zcwy_0726_download' into dev0515	2024-09-24 14:40:08 +08:00
zhangsir	6a60787eda	在线科考试提交新增时间	2024-09-24 14:39:16 +08:00
zhangsir	9c2d95fa2b	Merge branch 'zcwy_0716_learning' into dev0515	2024-09-19 16:56:09 +08:00
zhangsir	fa044187bc	个人中心临时修改，后期优化	2024-09-19 16:55:26 +08:00
zhangsir	007bd1a98f	Merge branch 'zcwy_0822_case' into dev0515	2024-09-18 17:07:29 +08:00
zhangsir	23c6809590	Merge branch 'zcwy_0806_paihangb' into dev0515	2024-09-18 10:27:17 +08:00
zhangsir	daf6d5fa23	排行榜前两个默认显示当前数据	2024-09-18 10:26:50 +08:00
zhangsir	5b4319c6a7	Merge branch 'zcwy_0806_paihangb' into dev0515	2024-09-18 10:04:53 +08:00
zhangsir	32c43ada27	排行榜修改，取消学习天数当前，保留其他两个	2024-09-18 10:03:53 +08:00