提交 12faf853 编写于 作者: zhentian.jia's avatar zhentian.jia

Merge branch 'dev-learning-report-0627' into 'release'

一页20条数据



See merge request !71
...@@ -99,7 +99,7 @@ ...@@ -99,7 +99,7 @@
@size-change="handleSizeChange" @size-change="handleSizeChange"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
:current-page="formData.pageNo" :current-page="formData.pageNo"
:page-sizes="[10, 30, 50]" :page-sizes="[20, 50 ,100]"
:page-size="formData.pageSize" :page-size="formData.pageSize"
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next, jumper"
:total="totalRows" :total="totalRows"
...@@ -138,7 +138,7 @@ export default { ...@@ -138,7 +138,7 @@ export default {
achievementStatus: "", achievementStatus: "",
status: 1, status: 1,
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 20,
}, },
achievementList: [ achievementList: [
//项目状态 //项目状态
...@@ -318,7 +318,7 @@ export default { ...@@ -318,7 +318,7 @@ export default {
achievementStatus: "", achievementStatus: "",
status: 1, status: 1,
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 20,
} }
); );
vm.search(); vm.search();
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
@size-change="handleSizeChange" @size-change="handleSizeChange"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
:current-page="param.pageNo" :current-page="param.pageNo"
:page-sizes="[10, 30, 50]" :page-sizes="[20, 50 ,100]"
:page-size="param.pageSize" :page-size="param.pageSize"
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next, jumper"
:total="totalRows" :total="totalRows"
...@@ -66,7 +66,7 @@ export default { ...@@ -66,7 +66,7 @@ export default {
projectId: "", projectId: "",
tableData: [], tableData: [],
param: { param: {
pageSize: 10, pageSize: 20,
pageNo: 1 pageNo: 1
}, },
totalRows: 0, totalRows: 0,
......
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
@size-change="handleSizeChange" @size-change="handleSizeChange"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
:current-page="pageNo" :current-page="pageNo"
:page-sizes="[10, 30, 50]" :page-sizes="[20, 50 ,100]"
:page-size="pageSize" :page-size="pageSize"
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next, jumper"
:total="totalRows" :total="totalRows"
...@@ -90,7 +90,7 @@ export default { ...@@ -90,7 +90,7 @@ export default {
totalRows: 0, totalRows: 0,
projectId: '', projectId: '',
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 20,
second: 0, second: 0,
} }
}, },
...@@ -113,7 +113,7 @@ export default { ...@@ -113,7 +113,7 @@ export default {
}); });
this.$on("reset",() =>{ this.$on("reset",() =>{
this.pageNo = 1; this.pageNo = 1;
this.pageSize = 10; this.pageSize = 20;
this.tableData = []; this.tableData = [];
this.cardData = []; this.cardData = [];
}); });
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
@size-change="handleSizeChange" @size-change="handleSizeChange"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
:current-page="pageNo" :current-page="pageNo"
:page-sizes="[10, 30, 50]" :page-sizes="[20, 50 ,100]"
:page-size="pageSize" :page-size="pageSize"
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next, jumper"
:total="totalRows" :total="totalRows"
...@@ -78,7 +78,7 @@ export default { ...@@ -78,7 +78,7 @@ export default {
cardData: [], cardData: [],
totalRows: 0, //数据总数 totalRows: 0, //数据总数
pageNo: 1, //当前是第几页 pageNo: 1, //当前是第几页
pageSize: 10, //页面总数 pageSize: 20, //页面总数
labelTd: [], labelTd: [],
showTd: [false,false,false,false], showTd: [false,false,false,false],
}; };
...@@ -103,7 +103,7 @@ export default { ...@@ -103,7 +103,7 @@ export default {
}); });
this.$on("reset",() =>{ this.$on("reset",() =>{
this.pageNo = 1; this.pageNo = 1;
this.pageSize = 10; this.pageSize = 20;
this.tableData = []; this.tableData = [];
this.cardData = []; this.cardData = [];
}); });
......
...@@ -192,7 +192,7 @@ export default { ...@@ -192,7 +192,7 @@ export default {
organization: [], organization: [],
checked: false, checked: false,
pageNo: 1, pageNo: 1,
pageSize: 10 pageSize: 20
}, },
dialogData: { dialogData: {
region: "", region: "",
...@@ -456,7 +456,7 @@ export default { ...@@ -456,7 +456,7 @@ export default {
organization: [], organization: [],
checked: false, checked: false,
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 20,
} }
); );
vm.tags = []; vm.tags = [];
......
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
@size-change="handleSizeChange" @size-change="handleSizeChange"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
:current-page="formData.pageNo" :current-page="formData.pageNo"
:page-sizes="[10, 30, 50]" :page-sizes="[20, 50 ,100]"
:page-size="formData.pageSize" :page-size="formData.pageSize"
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next, jumper"
:total="totalRows" :total="totalRows"
...@@ -141,7 +141,7 @@ export default { ...@@ -141,7 +141,7 @@ export default {
learnFlag: -1, learnFlag: -1,
gradeFlag: -1, gradeFlag: -1,
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 20,
}, },
region: "", region: "",
organization: "", organization: "",
...@@ -285,7 +285,7 @@ export default { ...@@ -285,7 +285,7 @@ export default {
learnFlag: -1, learnFlag: -1,
gradeFlag: -1, gradeFlag: -1,
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 20,
} }
); );
vm.search(); vm.search();
......
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
@size-change="handleSizeChange" @size-change="handleSizeChange"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
:current-page="formData.pageNo" :current-page="formData.pageNo"
:page-sizes="[10, 30, 50]" :page-sizes="[20, 50 ,100]"
:page-size="formData.pageSize" :page-size="formData.pageSize"
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next, jumper"
:total="totalRows" :total="totalRows"
...@@ -91,7 +91,7 @@ export default { ...@@ -91,7 +91,7 @@ export default {
status: "", status: "",
name: "", name: "",
pageNo: 1, //当前是第几页 pageNo: 1, //当前是第几页
pageSize: 10 //页面总数 pageSize: 20 //页面总数
}, },
statusSelect: [ statusSelect: [
//项目状态 //项目状态
...@@ -154,7 +154,7 @@ export default { ...@@ -154,7 +154,7 @@ export default {
status: "", status: "",
name: "", name: "",
pageNo: 1, //当前是第几页 pageNo: 1, //当前是第几页
pageSize: 10 //页面总数 pageSize: 20 //页面总数
}; };
vm.search(); vm.search();
}, },
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册