Merge branch 'pingcode-1104' into dev0515

# Conflicts:
#	src/components/PortalHeader.vue
#	src/components/VideoPlayer/progress-bar.vue
#	src/views/study/coursenew.vue
This commit is contained in:
zhangsir
2024-11-04 16:29:52 +08:00
9 changed files with 92 additions and 74 deletions

View File

@@ -10,7 +10,7 @@ import ajax from '@/utils/xajax.js'
* 返回 检查报名状态
*/
const hasSignup = function(courseId) {
return ajax.get('/xboe/school/study/signup/has?cid='+courseId);
return ajax.get('/xboe/school/study/signup/has?cid='+courseId);
}
/**
@@ -25,7 +25,7 @@ const hasSignup = function(courseId) {
}
*/
const signup = function(data) {
return ajax.post('/xboe/school/study/signup/self', data);
return ajax.post('/xboe/school/study/signup/self', data);
}
/**
@@ -38,7 +38,7 @@ const signup = function(data) {
}
*/
const findSignup = function(data) {
return ajax.post('/xboe/school/study/signup/pagelist', data);
return ajax.post('/xboe/school/study/signup/pagelist', data);
}
/**
@@ -46,7 +46,7 @@ const findSignup = function(data) {
* @param {Object} id 报名的id
*/
const deleteSignup = function(id) {
return ajax.post('/xboe/school/study/signup/delete?id='+id);
return ajax.post('/xboe/school/study/signup/delete?id='+id);
}
/**
@@ -55,7 +55,7 @@ const deleteSignup = function(id) {
* Signup 对象集合, list
*/
const importSignup = function(data) {
return ajax.post('/xboe/school/study/signup/import',data);
return ajax.post('/xboe/school/study/signup/import',data);
}
/**
@@ -63,11 +63,11 @@ const importSignup = function(data) {
* @param {Object} courseId 课程 的id
*/
const countSignup = function(courseId) {
return ajax.post('/xboe/school/study/signup/count-by-course',{courseId});
return ajax.post('/xboe/school/study/signup/count-by-course',{courseId});
}
const studyIndex = function(courseId) {
return ajax.get('/xboe/school/study/course/studyIndex?cid='+courseId+'&addView=true');
return ajax.get('/xboe/school/study/course/studyIndex?cid='+courseId+'&addView=true');
}
/**
*
@@ -80,7 +80,7 @@ const studyIndex = function(courseId) {
* @returns
*/
const studyIndexPost = function(data) {
return ajax.post('/xboe/school/study/course/studyIndex',data);
return ajax.post('/xboe/school/study/course/studyIndex',data);
}
/**
@@ -88,7 +88,7 @@ const studyIndexPost = function(data) {
* @param {Object} courseId
*/
const studyInfo = function(courseId) {
return ajax.get('/xboe/school/study/course/info?cid='+courseId);
return ajax.get('/xboe/school/study/course/info?cid='+courseId);
}
@@ -98,7 +98,7 @@ const studyInfo = function(courseId) {
* @param {Object} contentId
*/
const getStudyContentItem = function(studyId,contentId) {
return ajax.post('/xboe/school/study/course/study-course-content',{studyId,contentId});
return ajax.post('/xboe/school/study/course/study-course-content',{studyId,contentId});
}
/**
@@ -111,7 +111,7 @@ const getStudyContentItem = function(studyId,contentId) {
* @returns
*/
const studyVideoTime = function(data) {
return ajax.post('/xboe/school/study/course/study-video-time',data);
return ajax.post('/xboe/school/study/course/study-video-time',data);
}
/**
@@ -119,7 +119,7 @@ const studyVideoTime = function(data) {
* @returns
*/
const lastStudy = function() {
return ajax.get('/xboe/school/study/course/last-study');
return ajax.get('/xboe/school/study/course/last-study');
}
/**
@@ -136,7 +136,7 @@ const lastStudy = function() {
*
*/
const studyContent = function(data) {
return ajax.postJson('/xboe/school/study/course/study',data);
return ajax.postJson('/xboe/school/study/course/study',data);
}
/**
@@ -150,7 +150,7 @@ const studyContent = function(data) {
*
*/
const appendStudyTime = function(data) {
return ajax.post('/xboe/school/study/course/appendtime',data);
return ajax.post('/xboe/school/study/course/appendtime',data);
}
/**
@@ -161,7 +161,7 @@ const appendStudyTime = function(data) {
* name: 学习人的姓名
*/
const studyRecords = function(data) {
return ajax.post('/xboe/school/study/course/pagelist',data);
return ajax.post('/xboe/school/study/course/pagelist',data);
}
/**
@@ -173,7 +173,7 @@ const studyRecords = function(data) {
* name: 学习人的姓名
*/
const studyContentRecords = function(data) {
return ajax.post('/xboe/school/study/course/contents',data);
return ajax.post('/xboe/school/study/course/contents',data);
}
/**
@@ -185,7 +185,7 @@ const studyContentRecords = function(data) {
}
*/
const studyExport = function(data) {
return ajax.post('/xboe/school/study/course/export',data);
return ajax.post('/xboe/school/study/course/export',data);
}
/**
@@ -200,7 +200,7 @@ const studyExport = function(data) {
}
*/
const myStudyList = function(query) {
return ajax.post('/xboe/school/study/course/mylist',query);
return ajax.post('/xboe/school/study/course/mylist',query);
}
/**
* 当前课程学习记录
@@ -216,7 +216,7 @@ const myStudyList = function(query) {
}
*/
const myCourseStudy = function(query) {
return ajax.post('/xboe/school/study/course/course-users',query);
return ajax.post('/xboe/school/study/course/course-users',query);
}
@@ -241,7 +241,7 @@ const myCourseStudy = function(query) {
* answerJson
*/
const saveExam = function(data) {
return ajax.postJson('/xboe/school/study/exam/save',data);
return ajax.postJson('/xboe/school/study/exam/save',data);
}
/**
@@ -261,7 +261,7 @@ const saveExam = function(data) {
* hwAnswer 文本提交的信息
*/
const saveHomework = function(data) {
return ajax.postJson('/xboe/school/study/homework/save',data);
return ajax.postJson('/xboe/school/study/homework/save',data);
}
/**
@@ -279,7 +279,7 @@ const saveHomework = function(data) {
* asScore评估得分
*/
const saveAssess = function(data) {
return ajax.postJson('/xboe/school/study/assess/save',data);
return ajax.postJson('/xboe/school/study/assess/save',data);
}
/**
@@ -288,7 +288,7 @@ const saveAssess = function(data) {
* id:记录的id
*/
const myHomework = function(id) {
return ajax.post('/xboe/school/study/homework/detail?id='+id);
return ajax.post('/xboe/school/study/homework/detail?id='+id);
}
/**
@@ -297,7 +297,7 @@ const myHomework = function(id) {
* id:记录的id
*/
const myExamPaper = function(id) {
return ajax.get('/xboe/school/study/exam/detail?id='+id);
return ajax.get('/xboe/school/study/exam/detail?id='+id);
}
/**
@@ -306,7 +306,7 @@ const myExamPaper = function(id) {
* id:记录的id
*/
const myAssess = function(id) {
return ajax.get('/xboe/school/study/assess/detail?id='+id);
return ajax.get('/xboe/school/study/assess/detail?id='+id);
}
/**
@@ -318,7 +318,7 @@ const myAssess = function(id) {
}
*/
const myHomeworkList = function(data) {
return ajax.post('/xboe/school/study/homework/list-study',data);
return ajax.post('/xboe/school/study/homework/list-study',data);
}
/**
@@ -327,7 +327,7 @@ const myHomeworkList = function(data) {
* 对应的提交记录的id
*/
const myExamList = function(itemId) {
return ajax.post('/xboe/school/study/exam/list',{itemId});
return ajax.post('/xboe/school/study/exam/list',{itemId});
}
/**
@@ -338,8 +338,8 @@ const myExamList = function(itemId) {
contentId:''
}
*/
const myExamList2 = function(data) {
return ajax.post('/xboe/school/study/exam/list-study',data);
const myExamList2 = function(data) {
return ajax.post('/xboe/school/study/exam/list-study',data);
}
/**
@@ -351,7 +351,7 @@ const myExamList = function(itemId) {
}
*/
const myAssessList = function(data) {
return ajax.post('/xboe/school/study/assess/list-study',data);
return ajax.post('/xboe/school/study/assess/list-study',data);
}
/*
@@ -360,7 +360,7 @@ const myAssessList = function(data) {
@param courseId 课程id 用于删除课程报名信息和修改课程学习人数
*/
const deleteSignUp=function(id,courseId){
return ajax.post(`/xboe/school/study/course/delete-signup?id=${id}&couserId=${courseId}`);
return ajax.post(`/xboe/school/study/course/delete-signup?id=${id}&couserId=${courseId}`);
}
/**
@@ -399,38 +399,38 @@ const findByIds=function (ids){
}
export default {
hasSignup,
signup,
findSignup,
deleteSignup,
importSignup,
countSignup,
studyIndex,
studyInfo,
studyVideoTime,
lastStudy,
studyContent,
appendStudyTime,
studyRecords,
studyContentRecords,
getStudyContentItem,
studyExport,
myStudyList,
saveHomework,
saveExam,
saveAssess,
myHomework,
myExamPaper,
myAssess,
myHomeworkList,
myExamList,
myAssessList,
myExamList2,
myCourseStudy,
hasSignup,
signup,
findSignup,
deleteSignup,
importSignup,
countSignup,
studyIndex,
studyInfo,
studyVideoTime,
lastStudy,
studyContent,
appendStudyTime,
studyRecords,
studyContentRecords,
getStudyContentItem,
studyExport,
myStudyList,
saveHomework,
saveExam,
saveAssess,
myHomework,
myExamPaper,
myAssess,
myHomeworkList,
myExamList,
myAssessList,
myExamList2,
myCourseStudy,
myStudysFromES,
homeworkExport,
findByIds,
deleteSignUp,
deleteSignUp,
ids,
followIds,
studyIndexPost