Commit Graph

234 Commits

Author SHA1 Message Date
zhangsir
c25c50838f Merge branch 'pingcode-1104' into dev0515 2024-11-10 17:26:37 +08:00
zhangsir
ff7dd81608 视频选择修改 2024-11-10 17:25:48 +08:00
zhangsir
5593381330 Merge branch 'pingcode-1104' into dev0515 2024-11-08 19:13:53 +08:00
zhangsir
7ccb624724 视频选择修改 2024-11-08 19:13:15 +08:00
zhangsir
9e8941de2d Merge branch 'pingcode-1104' into dev0515 2024-11-08 13:40:08 +08:00
zhangsir
638d6c5677 视频长传修改逻辑 2024-11-08 13:39:10 +08:00
zhangsir
c64969e9b7 Merge branch 'pingcode-1104' into dev0515
# Conflicts:
#	src/components/PortalHeader.vue
#	src/components/VideoPlayer/progress-bar.vue
#	src/views/study/coursenew.vue
2024-11-04 16:29:52 +08:00
zhangsir
2576fdd070 授课教师名称增加工号 2024-11-04 16:26:43 +08:00
nisen
979deec1a4 Merge branch 'zcwy_0723_hotforum' into master_1008 2024-10-09 19:15:03 +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
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
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
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
669bf060b7 回退 2024-08-23 19:11:17 +08:00
zhangsir
24e2538875 考试接口添加参数 2024-08-23 18:27:23 +08:00
zhangsir
88ab73354f 考试接口添加参数 2024-08-23 17:45:58 +08:00
zhangsir
b38f32f6dd 合并pingcode上的bug 2024-08-05 17:56:54 +08:00
nisen
480132fd22 Merge branch 'zcwy_0726_download' into dev0515 2024-08-05 15:18:36 +08:00
zhangsir
30c4899ebc 作业提交发现切换作业时studyitemid取值上一个,修复 2024-08-05 15:17:03 +08:00
nisen
130d02886f Merge branch 'zcwy_0726_download' into dev0515 2024-08-05 15:05:27 +08:00
zhangsir
c1a0fe988f 作业提交studyitemid赋值 2024-08-05 15:03:44 +08:00
zhangsir
94702ea288 在线课单层项目添加名称 2024-08-02 17:54:20 +08:00
nisen
1f89f9f5e8 Merge branch 'zcwy_0726_download' into dev0515 2024-08-02 11:39:31 +08:00
zhangsir
6bf754b5dc 在线课单层项目添加名称 2024-08-02 11:25:34 +08:00
zhangsir
57d08b8ced Merge branch 'boe_0704_line' into dev0515 2024-07-04 16:42:56 +08:00
zhangsir
ec3abb9901 只列表添加 2024-07-04 16:42:20 +08:00
zhangsir
88ae166e13 Merge branch 'boe_0704_line' into dev0515 2024-07-04 16:25:18 +08:00
zhangsir
b0c5fcbf8c 在线增加参数 2024-07-04 16:24:42 +08:00
zhangsir
7f1ea1fe89 Merge branch 'boe_0704_line' into dev0515 2024-07-04 11:26:05 +08:00
zhangsir
694c9c5be7 提交增加受众 2024-07-04 11:25:33 +08:00
zhangsir
3e8ec03c0e 除视频音频考试三秒 2024-07-03 11:37:47 +08:00
zhangsir
d463e896a6 在线课study回滚 2024-05-28 15:01:48 +08:00
zhangsir
1ea0e209fe 添加参数 2024-05-28 13:49:39 +08:00
zhangsir
17d461cdc4 在线课添加状态 2024-05-27 20:29:16 +08:00
zhangsir
565fb680fc 按钮回显 2024-05-22 14:56:44 +08:00
zhangsir
5ac79f129c Merge branch 'zcwy-0509-exam' into zcwy-master
# Conflicts:
#	src/components/Course/exam.vue
2024-05-13 15:54:38 +08:00
zhangsir
835d2c3527 修改考试提交方式改为有返回值可再次点击点击 2024-05-09 16:19:04 +08:00
zhangsir
e04f249245 考试提交改为5秒内只执行一次 2024-05-07 08:48:14 +08:00
zhangsir
05e5993beb 放开提交按钮 2024-04-26 13:21:59 +08:00
zhangsir
c3b0a1f12e 在线课bug修改 2024-04-26 11:23:24 +08:00