Commit Graph

263 Commits

Author SHA1 Message Date
zhangsir
1a03c84db0 Merge branch 'zcwy_1127_teacher' into dev0515 2024-11-27 18:12:36 +08:00
zhangsir
21afc82036 添加教师修改接口 2024-11-27 18:11:49 +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
7679f78ef5 Merge branch 'zcwy_0806_paihangb' into dev0515 2024-10-25 17:29:03 +08:00
zhangsir
45fb650b1b 上传视频的超时提示 2024-10-25 17:28:18 +08:00
nisen
979deec1a4 Merge branch 'zcwy_0723_hotforum' into master_1008 2024-10-09 19:15:03 +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
zhangsir
a8c9577be9 Merge branch 'zcwy_0822_case' into dev0515 2024-09-12 20:13:16 +08:00
zhangsir
53073fd8ff 案例 2024-09-12 20:12:31 +08:00
nisen
85eb9a3072 Merge branch 'zcwy_0822_case' into dev0515 2024-09-11 16:08:43 +08:00
zhangsir
f39a1417b6 案例 2024-09-11 16:07:27 +08:00
nisen
6c5e303ecb Merge branch 'zcwy_0822_case' into dev0515 2024-09-10 11:13:27 +08:00
zhangsir
a59d1cea93 案例 2024-09-10 11:10:58 +08:00
zhangsir
8e6c00d266 案例优化 2024-09-09 09:40:35 +08:00
zhangsir
669bf060b7 回退 2024-08-23 19:11:17 +08:00
zhangsir
88ab73354f 考试接口添加参数 2024-08-23 17:45:58 +08:00
nisen
5151bf6ad7 Merge remote-tracking branch 'yx/zcwy_0726_download' into dev0515 2024-07-26 14:19:02 +08:00
zhangsir
c8a72140af 导出作业 2024-07-26 13:33:49 +08:00
zhangsir
c054026259 修改接口 2024-07-12 15:57:05 +08:00
zhangsir
482cd48571 修改接口 2024-07-12 14:34:03 +08:00
zhangsir
275e59987f 已读调接口 2024-07-08 10:42:32 +08:00
zhangsir
cb43195803 未读数量 2024-07-08 09:54:14 +08:00
zhangsir
bc408c039e Merge branch 'dev0124' into zcwy-master
# Conflicts:
#	src/components/UserCenter/menu.vue
#	src/router/index.js
2024-06-28 13:33:25 +08:00
zhangsir
4269bff0b5 左侧菜单 2024-06-28 13:30:08 +08:00
zhangsir
8db79d599b 考试 2024-06-26 09:05:10 +08:00
zhangsir
94de112f49 全岗位 2024-06-24 14:17:59 +08:00
zhangsir
0afaea52ba 成长路径 2024-06-11 17:24:41 +08:00
李志发
4ed5f98ea1 修改bug2.0 2024-05-18 00:48:44 +08:00
李志发
700dee82c9 提交讲师 2024-05-15 13:29:03 +08:00
nisen
90872938be 修改 2023-11-23 14:28:25 +08:00
nisen
0ae85485a4 修改loading接口超时处理问题 2023-11-22 17:00:12 +08:00
joshen
d09875fa9e Merge branch 'zcwyTeacher' into 'master_1030'
Zcwy teacher

See merge request !61
2023-10-30 20:00:57 +08:00
NiSen
f33ede376b 修改 2023-10-11 18:03:15 +08:00
NiSen
367059c4b6 修改接口 2023-10-11 17:55:13 +08:00
NiSen
59e8f893a3 首页推荐课程添加 2023-10-09 14:11:06 +08:00
joshen@zcwytd.com
ee31460eb3 Merge branch 'cloud' into xingao0922 2023-09-22 11:46:07 +08:00
nisen
61c8e18eeb 修改 2023-09-04 18:01:13 +08:00
nisen
fbf2b7e4b8 修改 2023-09-04 15:25:51 +08:00
daihh
a3cfca0ecc 修改一个bug问题,学习记录,根据姓名查询的,查出不数据的问题 2023-09-04 10:03:15 +08:00
nisen
090f37a59d 工具下载 2023-09-02 18:03:41 +08:00
nisen
5346f360bc 对接接口 2023-09-02 14:48:59 +08:00
nisen
b49b83a7cf 教师节建议 2023-09-01 15:55:53 +08:00
nisen
55e117b2c2 课程详情studyIndex和detail传递用户所有受众id 2023-08-09 18:45:33 +08:00
BOE\10867418
80b408bbf1 Merge branch 'cloud' into dev0731
# Conflicts:
#	src/api/boe/login.js
2023-08-07 13:55:42 +08:00
daihh
dedc8e99c3 修改js错误 2023-08-07 13:52:21 +08:00
BOE\10867418
924d2a2a6c fix bug 2023-08-07 13:39:15 +08:00
BOE\10867418
814cf08e0f Merge branch 'cloud' into dev0731 2023-08-07 13:17:11 +08:00
daihh
3eb3d40d59 添加密码加密 2023-08-07 11:56:37 +08:00