hz/learning-system-portal
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal.git synced 2025-12-12 04:16:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'xingao0922' into 'master'

Browse Source 
Xingao0922

See merge request !53
This commit is contained in:
joshen
2023-10-12 16:24:49 +08:00
parent db4a160603 2cf4f56906
commit c21dff02fc
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/components/Study/manager.vue
View File

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

3
src/views/course/ManageList.vue
View File

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