Merge branch 'master-20250428-shl' into test20250220

src/api/boe/courseRecord.js

@@ -61,63 +61,12 @@ const exportStudentOfTearcher = function(userId) {
 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}&pageNo=${data.pageNo}&pageSize=${data.pageSize}`);
-}
-
-/**
- * 导出授课记录
- *
- * @param {Object} data
- */
-const courseRecordExport2 = function(data) {
-  return axios.request({
-    baseURL,
-    url: '/manageApi/admin/export/exportInTeacherRecord',
-    method: 'post',
-    data:data,
-    headers:{'Content-Type':'application/json;charset=utf-8'},
-    responseType: 'blob'
-  })
-}
-
-/**
- * 导出课程下的学员信息
- *
- */
-const exportStudentOfCourse2 = function(courseId,courseType) {
-  return axios.request({
-    baseURL,
-    url: '/manageApi/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,
-    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,
-    exportStudentOfCourse2,
     exportStudentOfTearcher,
-    exportStudentOfTearcher2,
 
 }

src/api/modules/teacher.js

@@ -1,5 +1,6 @@
 import ajax from '@/utils/xajax.js'
 import ajax2 from '../unionAjax.js';
+import axios from "axios";
 
 /**
  * 按名称查询
@@ -38,7 +39,7 @@ const detailTeacher=function (id){
  * tlevelId级别
  * salaryId发薪地
  * tsystemId
- 
+
  * } query
  * @returns
  */
@@ -211,6 +212,55 @@ const findAllCourses=function(query){
         return ajax.postJson('/xboe/teacher/update-sync',data);
     }
 
+
+const getListByToken = function(data) {
+  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,
+    url: '/manageApi/admin/export/exportInTeacherRecord',
+    method: 'post',
+    data:data,
+    headers:{'Content-Type':'application/json;charset=utf-8'},
+    responseType: 'blob'
+  })
+}
+
+/**
+ * 导出课程下的学员信息
+ *
+ */
+const exportStudentOfCourse2 = function(courseId,courseType) {
+  return axios.request({
+    baseURL,
+    url: '/manageApi/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,
+    url: '/b1/system/teacher/teacher-course-student-export?userId='+userId,
+    method: 'post',
+    headers:{'Content-Type':'application/json;charset=utf-8'},
+    responseType: 'blob'
+  })
+}
+
 export default {
     findByName,
     getInfoById,
@@ -227,5 +277,9 @@ export default {
 	exports,
     syncUpdate,
     detailTeacher,
-    updateTeacher
+    updateTeacher,
+  courseRecordExport2,
+  exportStudentOfCourse2,
+  exportStudentOfTearcher2,
+  getListByToken,
 }

src/views/course/Mylecnotes.vue

@@ -14,11 +14,11 @@
       <div style="padding: 0px 5px;">
         <el-button type="primary" @click="exportFile()" icon="el-icon-search" size="small" round>导出</el-button>
       </div>
-      <div style="padding: 0px 5px;">
+<!--      <div style="padding: 0px 5px;">-->
-        <el-button type="primary" @click="exportStudentOfTearcher()" icon="el-icon-search" size="small" round>
+<!--        <el-button type="primary" @click="exportStudentOfTearcher()" icon="el-icon-search" size="small" round>-->
-          导出学员信息
+<!--          导出学员信息-->
-        </el-button>
+<!--        </el-button>-->
-      </div>
+<!--      </div>-->
     </div>
     <div class="Export">
       <!-- <div style="padding-left: 10px;"><el-button type="primary" @click="exportFile()" icon="el-icon-search" size="small" round>导出</el-button></div> -->
@@ -155,7 +155,7 @@
 </template>
 
 <script>
-import apiCourse from '../../api/boe/courseRecord.js';
+import apiTeacher from '../../api/boe/teacher.js';
 import {mapGetters} from 'vuex';
 
 export default {
@@ -181,7 +181,7 @@ export default {
       let req = {
         userId: this.userInfo.sysId
       }
-      apiCourse.courseRecordExport2(req).then(res => {
+      apiTeacher.courseRecordExport2(req).then(res => {
         const link = document.createElement('a');// 创建a标签
         let blob = new Blob([res.data], {type: 'application/vnd.ms-excel'}); // 设置文件类型
         link.style.display = "none";
@@ -195,7 +195,7 @@ export default {
 
     // 导出课程下的学员信息
     exportStudentOfCourse(courseId, courseType) {
-      apiCourse.exportStudentOfCourse2(courseId, courseType).then(res => {
+      apiTeacher.exportStudentOfCourse2(courseId, courseType).then(res => {
         const link = document.createElement('a');// 创建a标签
         let blob = new Blob([res.data], {type: 'application/vnd.ms-excel'}); // 设置文件类型
         link.style.display = "none";
@@ -210,7 +210,7 @@ export default {
     // 导出教师下的所有授课记录下的学员信息
     exportStudentOfTearcher() {
       let userId = this.userInfo.sysId;
-      apiCourse.exportStudentOfTearcher2(userId).then(res => {
+      apiTeacher.exportStudentOfTearcher2(userId).then(res => {
         const link = document.createElement('a');// 创建a标签
         let blob = new Blob([res.data], {type: 'application/vnd.ms-excel'}); // 设置文件类型
         link.style.display = "none";
@@ -223,15 +223,12 @@ export default {
     },
 
     recordList() {
-      console.log('========pageIndex', this.pageInfo.pageIndex)
-      console.log('========pageSize', this.pageInfo.pageSize)
-
       let req = {
         courseName: this.keyword,
         pageNo: this.pageInfo.pageIndex,
         pageSize: this.pageInfo.pageSize
       }
-      apiCourse.getListByToken(req).then(res => {
+      apiTeacher.getListByToken(req).then(res => {
         if (res.status == 200) {
           this.pageData = res.data.records;
           this.pageInfo.pageSize = Number(res.data.size);
@@ -259,7 +256,6 @@ export default {
     },
 
   },
-
 }
 </script>