1090 Commits

Author	SHA1	Message	Date
zhangsir	00d272c3d0	数据导致的报错	2025-01-10 14:29:54 +08:00
joshen	b9ec8ed534	Merge branch 'master_1202' into master-video-0930 ... # Conflicts: # src/components/VideoPlayer/index.vue # src/components/VideoPlayer/progress-bar.vue # src/views/study/coursenew.vue	2025-01-08 18:38:07 +08:00
joshen	67f2ff3e86	重新提交	2024-12-12 11:56:35 +08:00
joshen	3588ef3e67	回退	2024-12-12 11:42:11 +08:00
joshen	cc0362380e	Merge branch 'zcwy_0822_case' into master_1202	2024-12-12 10:56:07 +08:00
zhangsir	45027ca77e	2024	2024-12-10 19:53:38 +08:00
joshen	f98fda4f78	Merge remote-tracking branch 'yx/zcwy_1127_teacher' into master_1202	2024-12-02 19:21:14 +08:00
zhangsir	1ad2c80c9b	添加教师修改接口	2024-12-02 17:43:50 +08:00
zhangsir	21afc82036	添加教师修改接口	2024-11-27 18:11:49 +08:00
joshen	3e137990b7	Merge branch 'zcwy_0822_case' into dev_master	2024-11-26 20:48:58 +08:00
zhangsir	602a49e292	视频禁止拖动修改	2024-11-26 17:43:07 +08:00
zhangsir	2576fdd070	授课教师名称增加工号	2024-11-04 16:26:43 +08:00
joshen	61cdd7c821	Merge branch 'master-video-0930' into 'master' ... pc播放器拖动修改 See merge request !124	2024-10-16 19:58:18 +08:00
joshen	90ca7e4750	pc播放器拖动修改	2024-10-16 19:53:35 +08:00
nisen	e44279c92f	Merge branch 'master_1008' into dev_master	2024-10-15 18:14:56 +08:00
joshen	6b6e8a4096	pc视频播放器禁止拖动	2024-10-10 23:07:46 +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
zhangsir	dc01a523f7	新增视频缓存打印	2024-10-09 12:15:08 +08:00
zhangsir	ea910687f5	删除打印	2024-10-09 11:20:15 +08:00
zhangsir	f27d82c536	打印报错信息	2024-10-09 11:10:48 +08:00
zhangsir	f6c4e984df	打印报错信息	2024-10-09 10:51:19 +08:00
zhangsir	14bf033539	自定义考试修改数据结构	2024-10-09 09:16:05 +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	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
zhangsir	b8d84c3be6	试题导入报错显示	2024-09-27 15:39:18 +08:00
zhangsir	6a60787eda	在线科考试提交新增时间	2024-09-24 14:39:16 +08:00
nisen	024c6d3b96	Merge branch 'zcwy_0822_case' into dev_master ... # Conflicts: # src/components/Portal/authorInfo.vue # src/views/case/ManageList.vue # src/views/portal/case/Charts.vue # src/views/portal/case/Excellent.vue # src/views/portal/case/Index.vue	2024-09-14 12:28:31 +08:00
zhangsir	95de64a5ee	案例小优化	2024-09-11 20:47:49 +08:00
zhangsir	af1b7040ea	案例	2024-09-11 20:04:12 +08:00
zhangsir	5d6b2b6532	案例	2024-09-11 17:53:34 +08:00
zhangsir	f39a1417b6	案例	2024-09-11 16:07:27 +08:00
zhangsir	1278260812	案例	2024-09-10 16:07:18 +08:00
zhangsir	a59d1cea93	案例	2024-09-10 11:10:58 +08:00
nisen	08422c5d69	刪除wwww	2024-09-05 16:43:14 +08:00
nisen	4bf22cdd69	回退	2024-09-05 15:27:37 +08:00
nisen	38d2300255	Merge branch 'zcwy_0822_case' into dev_master	2024-09-04 16:34:30 +08:00
zhangsir	9ef5b5a6a3	案例优化页面UI调整	2024-09-04 16:32:11 +08:00
zhangsir	5df77cd3b1	案例优化，页面实现，	2024-09-02 15:20:41 +08:00
nisen	5978332d9d	Merge branch 'zcwy_0726_download' into dev_master ... # Conflicts: # src/components/Course/homework.vue	2024-08-28 15:00:57 +08:00
zhangsir	669bf060b7	回退	2024-08-23 19:11:17 +08:00