diff --git a/README.md b/README.md index 9fd5ddd4..15aa426d 100644 --- a/README.md +++ b/README.md @@ -221,7 +221,7 @@ QQ技术群:732230670 ## 曾获荣誉

- +

## 版权说明 diff --git a/snowy-admin-web/src/api/biz/bizUserApi.js b/snowy-admin-web/src/api/biz/bizUserApi.js index 3b1437a4..f8d57837 100644 --- a/snowy-admin-web/src/api/biz/bizUserApi.js +++ b/snowy-admin-web/src/api/biz/bizUserApi.js @@ -70,20 +70,16 @@ export default { grantRole(data) { return request('grantRole', data) }, - // 下载用户导入模板 - userDownloadImportUserTemplate(data) { - return request('downloadImportUserTemplate', data, 'get', { - responseType: 'blob' - }) - }, - // 用户导入 - userImport(data) { - return request('import', data) - }, - // 用户导出 + // 人员导出 userExport(data) { return request('export', data, 'get', { responseType: 'blob' }) + }, + // 导出人员个人信息 + userExportUserInfo(data) { + return request('exportUserInfo', data, 'get', { + responseType: 'blob' + }) } } diff --git a/snowy-admin-web/src/api/sys/userApi.js b/snowy-admin-web/src/api/sys/userApi.js index cb710760..4e2a4a11 100644 --- a/snowy-admin-web/src/api/sys/userApi.js +++ b/snowy-admin-web/src/api/sys/userApi.js @@ -102,7 +102,7 @@ export default { responseType: 'blob' }) }, - // 按模板导出用户个人信息 + // 导出用户个人信息 userExportUserInfo(data) { return request('exportUserInfo', data, 'get', { responseType: 'blob' diff --git a/snowy-admin-web/src/views/biz/user/impExp.vue b/snowy-admin-web/src/views/biz/user/impExp.vue deleted file mode 100644 index 5d9675ff..00000000 --- a/snowy-admin-web/src/views/biz/user/impExp.vue +++ /dev/null @@ -1,134 +0,0 @@ - - - diff --git a/snowy-admin-web/src/views/biz/user/index.vue b/snowy-admin-web/src/views/biz/user/index.vue index b44ffb32..602df0c0 100644 --- a/snowy-admin-web/src/views/biz/user/index.vue +++ b/snowy-admin-web/src/views/biz/user/index.vue @@ -69,12 +69,8 @@ {{ $t('common.addButton') }}{{ $t('model.user') }} - - - {{ $t('common.imports') }} - - + {{ $t('user.batchExportButton') }} - - + + {{ $t('common.more') }} @@ -149,7 +145,6 @@ :role-global="false" @onBack="roleBack" /> -