Commit bd5b3f16 authored by 332784038@qq.com's avatar 332784038@qq.com

Merge branch 'master' into release

parents 209bb3be 72b0d884
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<!-- 分页组件 --> <!-- 分页组件 -->
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize" <pagination v-show="total > 0" :total="total" :page.sync="queryParams.page" :limit.sync="queryParams.rows"
@pagination="getList"/> @pagination="getList"/>
<!-- 对话框(添加 / 修改) --> <!-- 对话框(添加 / 修改) -->
...@@ -158,8 +158,10 @@ export default { ...@@ -158,8 +158,10 @@ export default {
dateRangeCreateTime: [], dateRangeCreateTime: [],
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNo: 1, // pageNo: 1,
pageSize: 10, // pageSize: 10,
page: 1,
rows: 10,
titleZh: null, titleZh: null,
titleEn: null, titleEn: null,
validateStart: null, validateStart: null,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment