|
@@ -141,6 +141,7 @@ export default {
|
|
next(vm => {
|
|
next(vm => {
|
|
//const pm = to.param;
|
|
//const pm = to.param;
|
|
Object.assign(vm, to.params);
|
|
Object.assign(vm, to.params);
|
|
|
|
+ vm.inCurrentPage=to.params.currentPage;
|
|
})
|
|
})
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
@@ -187,6 +188,10 @@ export default {
|
|
}
|
|
}
|
|
this.list = list;
|
|
this.list = list;
|
|
this.total = res.data.data.total;
|
|
this.total = res.data.data.total;
|
|
|
|
+ if(this.inCurrentPage!==undefined){
|
|
|
|
+ this.currentPage=this.inCurrentPage;
|
|
|
|
+ this.inCurrentPage = undefined;
|
|
|
|
+ }
|
|
})
|
|
})
|
|
},
|
|
},
|
|
filterDatas() {
|
|
filterDatas() {
|
|
@@ -249,7 +254,7 @@ export default {
|
|
};
|
|
};
|
|
const param = {
|
|
const param = {
|
|
tagTypeList: this.filter.tagType[0] && this.filter.tagType|| this.tagTypesList,
|
|
tagTypeList: this.filter.tagType[0] && this.filter.tagType|| this.tagTypesList,
|
|
- current: this.currentPage,
|
|
|
|
|
|
+ current: this.inCurrentPage||this.currentPage,
|
|
size: this.pageSize,
|
|
size: this.pageSize,
|
|
type: this.filter.tagAdscription,
|
|
type: this.filter.tagAdscription,
|
|
tagName: this.filter.tagSysName.trim(),
|
|
tagName: this.filter.tagSysName.trim(),
|