diff --git a/src/api/boe/courseRecord.js b/src/api/boe/courseRecord.js
index 5fcdc1ef..d85a8eb1 100644
--- a/src/api/boe/courseRecord.js
+++ b/src/api/boe/courseRecord.js
@@ -62,15 +62,62 @@ const courseRecordList = function(data) {
return ajax.postJson('/b1/system/teacher/teacher-course-list',data);
}
const getListByToken = function(data) {
- return ajax2.get('/manageApi',`/admin/teacherRecord/getListByToken?courseName=${data.courseName}&page=${data.page}&pageSize=${data.pageSize}`);
+ return ajax2.get('/manageApi',`/admin/teacherRecord/getListByToken?courseName=${data.courseName}&pageNo=${data.pageNo}&pageSize=${data.pageSize}`);
+}
+
+/**
+ * 导出授课记录
+ *
+ * @param {Object} data
+ */
+const courseRecordExport2 = function(data) {
+ return axios.request({
+ baseURL: "/manageApi",
+ url: '/admin/export/exportInTeacherRecord',
+ method: 'get',
+ data:data,
+ headers:{'Content-Type':'application/json;charset=utf-8'},
+ responseType: 'blob'
+ })
+}
+
+/**
+ * 导出课程下的学员信息
+ *
+ */
+const exportStudentOfCourse2 = function(courseId,courseType) {
+ return axios.request({
+ baseURL: "/manageApi",
+ url: '/admin/export/exportTeacherRecordStudentInfo?courseId='+courseId+'&courseType='+courseType,
+ method: 'get'
+ // headers:{'Content-Type':'application/json;charset=utf-8'},
+ // responseType: 'blob'
+ })
+}
+
+/**
+ * 导出教师下的所有授课记录下的学员信息
+ *
+ */
+const exportStudentOfTearcher2 = function(userId) {
+ return axios.request({
+ baseURL: "/manageApi",
+ url: '/b1/system/teacher/teacher-course-student-export?userId='+userId,
+ method: 'post',
+ headers:{'Content-Type':'application/json;charset=utf-8'},
+ responseType: 'blob'
+ })
}
export default {
courseRecordExport,
+ courseRecordExport2,
courseRecordList,
getListByToken,
exportStudentOfCourse,
- exportStudentOfTearcher
+ exportStudentOfCourse2,
+ exportStudentOfTearcher,
+ exportStudentOfTearcher2,
}
diff --git a/src/api/modules/teacher.js b/src/api/modules/teacher.js
index 3d075b5b..e862885f 100644
--- a/src/api/modules/teacher.js
+++ b/src/api/modules/teacher.js
@@ -38,7 +38,7 @@ const detailTeacher=function (id){
* tlevelId级别
* salaryId发薪地
* tsystemId
-
+
* } query
* @returns
*/
diff --git a/src/views/course/Mylecnotes.vue b/src/views/course/Mylecnotes.vue
index 7e7c2c83..5657fcc8 100644
--- a/src/views/course/Mylecnotes.vue
+++ b/src/views/course/Mylecnotes.vue
@@ -1,206 +1,276 @@
-
+
-
-
搜索
-
重置
-
导出
-
导出学员信息
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ 搜索
+
+
+ 重置
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- 导出学员信息
-
-
-
-
+
{{ scope.$index + 1 }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ {
+ "0": "在线课",
+ "1": "面授课",
+ "2": "课程开发",
+ "3": "作业员入模培训",
+ "4": "其他",
+ }[scope.row.type + '']
+ }}
+
+
+
+
-
-
-
+
+
+
+
+ {{
+ {
+ "0": "未开课",
+ "1": "已开课",
+ }[scope.row.courseStatus + '']
+ }}
+
+
+
+
+
+
+
+ {{
+ {
+ "0": "否",
+ "1": "是",
+ }[scope.row.createdFee + '']
+ }}
+
+
+
+
+
+ 导出学员信息
+
+
+
+
+
-
+
+
+
+