Merge branch 'cloud' into xingao0922

src/components/Study/manager.vue

@@ -276,7 +276,7 @@
       </span>
     </el-dialog>
     <!-- 每人学习记录 -->
-    <el-dialog title="学习情况" :visible.sync="study.catalogueShow" width="50%" :append-to-body="true">
+    <el-dialog v-if="study.catalogueShow" title="学习情况" :visible.sync="study.catalogueShow" width="50%" :append-to-body="true">
       <el-form :inline="true" :model="learningSituation" class="demo-form-inline">
         <el-form-item label="姓名:">
           <el-input v-model="learningSituation.name" placeholder="姓名" clearable></el-input>
@@ -484,9 +484,8 @@ export default {
         status: this.learningSituation.status, //状态
         name: this.learningSituation.name, //学习人的姓名
         contentId: this.contentId, //课程内容id
-        pageIndex: this.learningRecords.pageIndex,
-        // 缺组织
-        pageSize: this.learningRecords.pageSize
+        pageIndex: this.learningSituation.pageIndex,
+        pageSize: this.learningSituation.pageSize
       };
       apicourseStudy.studyContentRecords(params).then(res => {
         if (res.status === 200) {
@@ -504,6 +503,7 @@ export default {
     },
     handleCurrentSituation(val) {
       this.learningSituation.pageIndex = val;
+      //console.log('learningSituation.pageIndex',this.learningSituation.pageIndex);
       this.studyContentRecords();
     },
     // 学习记录
@@ -696,6 +696,7 @@ export default {
     getCatalogue(row) {
       this.contentId = row.id;
       this.study.catalogueShow = true;
+      this.learningSituation.pageIndex = 1;//重置为第一页
       this.studyContentRecords();
     },
     handleSelectionChange(val) {

src/views/course/ManageList.vue

@@ -158,8 +158,7 @@
 
 
     <div v-if="pageData.length > 0" style="text-align: center; margin-top:57px">
-      <el-pagination
-      background
+      <el-pagination  background
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
         :current-page="page.pageIndex"