diff --git a/src/page/login/userlogin.vue b/src/page/login/userlogin.vue index 822ce77..792b464 100644 --- a/src/page/login/userlogin.vue +++ b/src/page/login/userlogin.vue @@ -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(); } }); } diff --git a/src/views/desk/notice.vue b/src/views/desk/notice.vue index 02ce8bc..933aeb3 100644 --- a/src/views/desk/notice.vue +++ b/src/views/desk/notice.vue @@ -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; diff --git a/src/views/monitor/log/api.vue b/src/views/monitor/log/api.vue index 70b5390..f211c2d 100644 --- a/src/views/monitor/log/api.vue +++ b/src/views/monitor/log/api.vue @@ -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; diff --git a/src/views/monitor/log/error.vue b/src/views/monitor/log/error.vue index 6da5cd3..071c19a 100644 --- a/src/views/monitor/log/error.vue +++ b/src/views/monitor/log/error.vue @@ -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; diff --git a/src/views/monitor/log/usual.vue b/src/views/monitor/log/usual.vue index 13743bd..3e79ced 100644 --- a/src/views/monitor/log/usual.vue +++ b/src/views/monitor/log/usual.vue @@ -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; diff --git a/src/views/system/client.vue b/src/views/system/client.vue index 3b0cc1d..a22592b 100644 --- a/src/views/system/client.vue +++ b/src/views/system/client.vue @@ -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; diff --git a/src/views/system/dept.vue b/src/views/system/dept.vue index 88497fc..f33d3ad 100644 --- a/src/views/system/dept.vue +++ b/src/views/system/dept.vue @@ -29,14 +29,7 @@