|
@@ -84,13 +84,14 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
- <el-pagination @current-change="currentChange"
|
|
|
- background
|
|
|
- :page-size="pageSize"
|
|
|
- :page-sizes="pageSizeArr"
|
|
|
- @size-change="handleSizeChange"
|
|
|
- :layout="pageLayout"
|
|
|
- :total="total">
|
|
|
+ <el-pagination :current-page.sync="currentPage"
|
|
|
+ @current-change="currentChange"
|
|
|
+ background
|
|
|
+ :page-size.sync="pageSize"
|
|
|
+ :page-sizes="pageSizeArr"
|
|
|
+ @size-change="handleSizeChange"
|
|
|
+ :layout="pageLayout"
|
|
|
+ :total="total">
|
|
|
</el-pagination>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -139,6 +140,7 @@
|
|
|
next(vm => {
|
|
|
//const pm = to.param;
|
|
|
Object.assign(vm, to.params);
|
|
|
+ vm.inCurrentPage=to.params.currentPage;
|
|
|
})
|
|
|
},
|
|
|
methods: {
|
|
@@ -180,6 +182,10 @@
|
|
|
}
|
|
|
this.list = list;
|
|
|
this.total = res.data.data.total;
|
|
|
+ if(this.inCurrentPage!==undefined){
|
|
|
+ this.currentPage=this.inCurrentPage;
|
|
|
+ this.inCurrentPage = undefined;
|
|
|
+ }
|
|
|
})
|
|
|
},
|
|
|
filterDatas() {
|
|
@@ -246,7 +252,7 @@
|
|
|
};
|
|
|
const param = {
|
|
|
tagTypeList: [1],
|
|
|
- current: this.currentPage,
|
|
|
+ current: this.inCurrentPage||this.currentPage,
|
|
|
size: this.pageSize,
|
|
|
type: this.filter.tagAdscription,
|
|
|
tagName: this.filter.tagSysName.trim(),
|