blade/Saber
1
0
Fork 0
mirror of https://github.com/chillzhuang/Saber.git synced 2024-11-22 10:29:28 +08:00
Code Issues Projects Releases Wiki Activity

🎉 修复分页参数丢失的bug

Browse Source
This commit is contained in:
smallchill 2019-06-25 10:33:21 +08:00
parent 0606c430d5
commit 0e5378fb1e
14 changed files with 78 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/page/login/userlogin.vue
View File

@ -100,8 +100,10 @@
});
this.$store.dispatch("LoginByUsername", this.loginForm).then(() => {
this.$router.push({ path: this.tagWel.value });
loading.close();
}).catch(() => {
loading.close()
});
loading.close();
}
});
}

5
src/views/desk/notice.vue
View File

@ -40,6 +40,7 @@
data() {
return {
form: {},
query: {},
page: {
pageSize: 10,
currentPage: 1,
@ -169,9 +170,11 @@
});
},
searchReset() {
this.query = {};
this.onLoad(this.page);
},
searchChange(params) {
this.query = params;
this.onLoad(this.page, params);
},
selectionChange(list) {
@ -214,7 +217,7 @@
this.page.pageSize = pageSize;
},
onLoad(page, params = {}) {
getList(page.currentPage, page.pageSize, params).then(res => {
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;

5
src/views/monitor/log/api.vue
View File

@ -25,6 +25,7 @@
return {
form: {},
selectionList: [],
query: {},
page: {
pageSize: 10,
currentPage: 1,
@ -104,9 +105,11 @@
},
methods: {
searchReset() {
this.query = {};
this.onLoad(this.page);
},
searchChange(params) {
this.query = params;
this.onLoad(this.page, params);
},
beforeOpen(done, type) {
@ -124,7 +127,7 @@
this.page.pageSize = pageSize;
},
onLoad(page, params = {}) {
getApiList(page.currentPage, page.pageSize, params).then(res => {
getApiList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;

9
src/views/monitor/log/error.vue
View File

@ -25,6 +25,7 @@
return {
form: {},
selectionList: [],
query: {},
page: {
pageSize: 10,
currentPage: 1,
@ -111,9 +112,11 @@
},
methods: {
searchReset() {
this.query = {};
this.onLoad(this.page);
},
searchChange(params) {
this.query = params;
this.onLoad(this.page, params);
},
beforeOpen(done, type) {
@ -124,14 +127,14 @@
}
done();
},
currentChange(currentPage){
currentChange(currentPage) {
this.page.currentPage = currentPage;
},
sizeChange(pageSize){
sizeChange(pageSize) {
this.page.pageSize = pageSize;
},
onLoad(page, params = {}) {
getErrorList(page.currentPage, page.pageSize, params).then(res => {
getErrorList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;

5
src/views/monitor/log/usual.vue
View File

@ -25,6 +25,7 @@
return {
form: {},
selectionList: [],
query: {},
page: {
pageSize: 10,
currentPage: 1,
@ -103,9 +104,11 @@
},
methods: {
searchReset() {
this.query = {};
this.onLoad(this.page);
},
searchChange(params) {
this.query = params;
this.onLoad(this.page, params);
},
beforeOpen(done, type) {
@ -123,7 +126,7 @@
this.page.pageSize = pageSize;
},
onLoad(page, params = {}) {
getUsualList(page.currentPage, page.pageSize, params).then(res => {
getUsualList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;

5
src/views/system/client.vue
View File

@ -36,6 +36,7 @@
data() {
return {
form: {},
query: {},
page: {
pageSize: 10,
currentPage: 1,
@ -227,9 +228,11 @@
});
},
searchReset() {
this.query = {};
this.onLoad(this.page);
},
searchChange(params) {
this.query = params;
this.onLoad(this.page, params);
},
selectionChange(list) {
@ -272,7 +275,7 @@
this.page.pageSize = pageSize;
},
onLoad(page, params = {}) {
getList(page.currentPage, page.pageSize, params).then(res => {
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;

17
src/views/system/dept.vue
View File

@ -29,14 +29,7 @@
</template>
<script>
import {
getList,
remove,
update,
add,
getDept,
getDeptTree
} from "@/api/system/dept";
import {add, getDept, getDeptTree, getList, remove, update} from "@/api/system/dept";
import {mapGetters} from "vuex";
import website from '@/config/website';
@ -45,6 +38,7 @@
return {
form: {},
selectionList: [],
query: {},
page: {
pageSize: 10,
currentPage: 1,
@ -226,9 +220,11 @@
});
},
searchReset() {
this.query = {};
this.onLoad(this.page);
},
searchChange(params) {
this.query = params;
this.onLoad(this.page, params);
},
selectionChange(list) {
@ -249,9 +245,8 @@
this.page.pageSize = pageSize;
},
onLoad(page, params = {}) {
getList(page.currentPage, page.pageSize, params).then(res => {
const data = res.data.data;
this.data = data;
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
this.data = res.data.data;
getDeptTree().then(res => {
const data = res.data.data;
const index = this.$refs.crud.findColumnIndex("parentId");

17
src/views/system/dict.vue
View File

@ -29,14 +29,7 @@
</template>
<script>
import {
getList,
remove,
update,
add,
getDict,
getDictTree
} from "@/api/system/dict";
import {add, getDict, getDictTree, getList, remove, update} from "@/api/system/dict";
import {mapGetters} from "vuex";
export default {
@ -44,6 +37,7 @@
return {
form: {},
selectionList: [],
query: {},
page: {
pageSize: 10,
currentPage: 1,
@ -188,9 +182,11 @@
});
},
searchReset() {
this.query = {};
this.onLoad(this.page);
},
searchChange(params) {
this.query = params;
this.onLoad(this.page, params);
},
selectionChange(list) {
@ -233,9 +229,8 @@
this.page.pageSize = pageSize;
},
onLoad(page, params = {}) {
getList(page.currentPage, page.pageSize, params).then(res => {
const data = res.data.data;
this.data = data;
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
this.data = res.data.data;
getDictTree().then(res => {
const data = res.data.data;
const index = this.$refs.crud.findColumnIndex("parentId");

10
src/views/system/menu.vue
View File

@ -35,7 +35,7 @@
</template>
<script>
import {getList, remove, update, add, getMenu} from "@/api/system/menu";
import {add, getList, getMenu, remove, update} from "@/api/system/menu";
import {mapGetters} from "vuex";
import iconList from "@/config/iconList";
@ -44,6 +44,7 @@
return {
form: {},
selectionList: [],
query: {},
page: {
pageSize: 10,
currentPage: 1,
@ -290,9 +291,11 @@
});
},
searchReset() {
this.query = {};
this.onLoad(this.page);
},
searchChange(params) {
this.query = params;
this.onLoad(this.page, params);
},
selectionChange(list) {
@ -335,9 +338,8 @@
this.page.pageSize = pageSize;
},
onLoad(page, params = {}) {
getList(page.currentPage, page.pageSize, params).then(res => {
const data = res.data.data;
this.data = data;
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
this.data = res.data.data;
});
}
}

5
src/views/system/param.vue
View File

@ -37,6 +37,7 @@
return {
form: {},
selectionList: [],
query: {},
page: {
pageSize: 10,
currentPage: 1,
@ -146,9 +147,11 @@
});
},
searchReset() {
this.query = {};
this.onLoad(this.page);
},
searchChange(params) {
this.query = params;
this.onLoad(this.page, params);
},
selectionChange(list) {
@ -183,7 +186,7 @@
this.page.pageSize = pageSize;
},
onLoad(page, params = {}) {
getList(page.currentPage, page.pageSize, params).then(res => {
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;

45
src/views/system/role.vue
View File

@ -50,20 +50,11 @@
</template>
<script>
import {
getList,
remove,
update,
add,
grant,
grantTree,
getRole,
getRoleTree
} from "@/api/system/role";
import { mapGetters } from "vuex";
import website from '@/config/website';
import {add, getList, getRole, getRoleTree, grant, grantTree, remove, update} from "@/api/system/role";
import {mapGetters} from "vuex";
import website from '@/config/website';
export default {
export default {
data() {
return {
form: {},
@ -75,11 +66,12 @@ export default {
list: [],
defaultObj: [],
selectionList: [],
page: {
pageSize: 10,
currentPage: 1,
total: 0
},
query: {},
page: {
pageSize: 10,
currentPage: 1,
total: 0
},
option: {
tip: false,
tree: true,
@ -248,11 +240,13 @@ export default {
},
searchReset() {
this.onLoad(this.page);
},
searchChange(params) {
this.onLoad(this.page, params);
},
this.query = {};
this.onLoad(this.page);
},
searchChange(params) {
this.query = params;
this.onLoad(this.page, params);
},
selectionChange(list) {
this.selectionList = list;
},
@ -301,9 +295,8 @@ export default {
this.page.pageSize = pageSize;
},
onLoad(page, params = {}) {
getList(page.currentPage, page.pageSize, params).then(res => {
const data = res.data.data;
this.data = data;
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
this.data = res.data.data;
getRoleTree().then(res => {
const data = res.data.data;
const index = this.$refs.crud.findColumnIndex("parentId");

5
src/views/system/tenant.vue
View File

@ -37,6 +37,7 @@
return {
form: {},
selectionList: [],
query: {},
page: {
pageSize: 10,
currentPage: 1,
@ -166,9 +167,11 @@
});
},
searchReset() {
this.query = {};
this.onLoad(this.page);
},
searchChange(params) {
this.query = params;
this.onLoad(this.page, params);
},
selectionChange(list) {
@ -203,7 +206,7 @@
this.page.pageSize = pageSize;
},
onLoad(page, params = {}) {
getList(page.currentPage, page.pageSize, params).then(res => {
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;

5
src/views/system/user.vue
View File

@ -79,6 +79,7 @@
return {
form: {},
selectionList: [],
query: {},
page: {
pageSize: 10,
currentPage: 1,
@ -325,9 +326,11 @@
});
},
searchReset() {
this.query = {};
this.onLoad(this.page);
},
searchChange(params) {
this.query = params;
this.onLoad(this.page, params);
},
selectionChange(list) {
@ -399,7 +402,7 @@
this.page.pageSize = pageSize;
},
onLoad(page, params = {}) {
getList(page.currentPage, page.pageSize, params).then(res => {
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;

5
src/views/tool/code.vue
View File

@ -44,6 +44,7 @@
return {
form: {},
selectionList: [],
query: {},
page: {
pageSize: 10,
currentPage: 1,
@ -205,9 +206,11 @@
},
searchReset() {
this.query = {};
this.onLoad(this.page);
},
searchChange(params) {
this.query = params;
this.onLoad(this.page, params);
},
selectionChange(list) {
@ -273,7 +276,7 @@
this.page.pageSize = pageSize;
},
onLoad(page, params = {}) {
getList(page.currentPage, page.pageSize, params).then(res => {
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;