diff --git a/src/pages/admin/api.js b/src/pages/admin/api.js index cecfbecb1..c78f7ac26 100644 --- a/src/pages/admin/api.js +++ b/src/pages/admin/api.js @@ -55,11 +55,14 @@ export default { }) }, // 获取用户列表 - getUserList (offset, limit, keyword) { + getUserList (offset, limit, keyword, onlyadmin) { let params = {paging: true, offset, limit} if (keyword) { params.keyword = keyword } + if (onlyadmin) { + params.onlyadmin = true + } return ajax('admin/user', 'get', { params: params }) diff --git a/src/pages/admin/views/general/User.vue b/src/pages/admin/views/general/User.vue index e0867a470..4a6d88f4c 100644 --- a/src/pages/admin/views/general/User.vue +++ b/src/pages/admin/views/general/User.vue @@ -57,6 +57,18 @@
+ + + + + + + + + + + { + api.getUserList((page - 1) * this.pageSize, this.pageSize, this.keyword, this.onlyadmin).then(res => { this.loadingTable = false this.total = res.data.data.total this.userList = res.data.data.results @@ -400,6 +413,9 @@ } }, watch: { + 'onlyadmin' () { + this.currentChange(1) + }, 'keyword' () { this.currentChange(1) }, diff --git a/src/utils/utils.js b/src/utils/utils.js index 75b3debcf..7f09f67f0 100644 --- a/src/utils/utils.js +++ b/src/utils/utils.js @@ -69,7 +69,8 @@ function downloadFile (url) { } let link = document.createElement('a') link.href = window.URL.createObjectURL(new window.Blob([resp.data], {type: headers['content-type']})) - link.download = (headers['content-disposition'] || '').split('filename=')[1] + let filename = (headers['content-disposition'] || '').split('filename=')[1] + link.download = decodeURI(filename) document.body.appendChild(link) link.click() link.remove()