Merge branch 'zcwy_1127_teacher' into dev0515

src/api/boe/courseRecord.js

@@ -62,7 +62,7 @@ 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.page}&pageSize=${data.pageSize}`);
 }
 
 

src/views/course/Mylecnotes.vue

@@ -3,7 +3,7 @@
    <div style="display: flex;justify-content: flex-start;">
 
      <div><el-input v-model="keyword" placeholder="输入课程名称搜索" clearable></el-input></div>
-        <div style="padding-left: 10px;"><el-button @click="recordList()" type="primary" icon="el-icon-search">搜索</el-button></div>
+     <div style="padding-left: 10px;"><el-button @click="recordList(1)" type="primary" icon="el-icon-search">搜索</el-button></div>
      <div style="padding: 0px 5px;"><el-button icon="el-icon-refresh-right" @click="keyword = ''" type="primary" >重置</el-button></div>
      <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;"><el-button type="primary" @click="exportStudentOfTearcher()" icon="el-icon-search" size="small" round>导出学员信息</el-button></div>
@@ -114,23 +114,23 @@
 import apiCourse from '../../api/boe/courseRecord.js';
 import { mapGetters } from 'vuex';
 export default {
-  data(){
+data(){
  return {
      pageData:[],
      keyword:'',
      pageInfo:{},
  }
-  },
+},
 
-  mounted() {
+mounted() {
  this.recordList(1);
 
-  },
-  computed: {
+},
+computed: {
  ...mapGetters(['userInfo'])
-  },
+},
 
-  methods: {
+methods: {
 
    // 导出所有记录
    exportFile(){
@@ -188,15 +188,13 @@ export default {
      //     userId:"6B049FAF-C314-7CCF-0D28-0D23F4C42531",
          userId: this.userInfo.sysId,
          courseName:this.keyword,
-            page:pageIndex,
-            pageSize:10
+         page:pageIndex,
+         pageSize:this.pageInfo.pageSize||10
      }
      apiCourse.getListByToken(req).then(res=>{
-          console.log(res,'resssssssssssss')
        if(res.code == 200) {
          this.pageData = res.data.records;
-            console.log(this.pageData,'pageData')
-            this.pageInfo.total = Number(20);
+         this.pageInfo.total = Number(res.data.total);
        } else {
           this.$message({
            type: 'error',
@@ -217,14 +215,14 @@ export default {
      this.recordList(this.pageInfo.pageIndex);
    },
 
-  },
+},
 
 }
 </script>
 
 <style lang="scss" scoped>
 .Export{
-  display: flex;
-  padding-top: 10px;
+display: flex;
+padding-top: 10px;
 }
 </style>