diff --git a/README.md b/README.md index bead9db5..4dc60c8e 100644 --- a/README.md +++ b/README.md @@ -25,32 +25,32 @@ gitee: [https://gitee.com/lab1024/smart-admin](https://gitee.com/lab1024/smart- #### 演示图 - - + + - - + + - - + + - - + + - - + + - - + + - - + +
@@ -111,8 +111,8 @@ SmartAdmin微信群(**加我微信拉你入群!**) - - + +
@@ -122,7 +122,7 @@ SmartAdmin微信群(**加我微信拉你入群!**) >*佛祖保佑捐赠这些人写程序永无bug,工资翻倍,迎娶白富美,走上人生巅峰!* - +
diff --git a/smart-admin-web/src/api/file.js b/smart-admin-web/src/api/file.js index 91bcc147..e8f80248 100644 --- a/smart-admin-web/src/api/file.js +++ b/smart-admin-web/src/api/file.js @@ -1,4 +1,4 @@ -import { postAxios, getAxios } from '@/lib/http'; +import { postAxios, getAxios, getDownloadAxios} from '@/lib/http'; import config from '@/config'; const baseUrl = config.baseUrl.apiUrl; export const fileApi = { @@ -8,7 +8,7 @@ export const fileApi = { }, // 系统文件下载通过接口 downLoadFile: id => { - return getAxios('/api/file/downLoad?id=' + id); + return getDownloadAxios('/api/file/downLoad?id=' + id); }, // 文件上传 fileUpload: (type, data) => { diff --git a/smart-admin-web/src/lib/http.js b/smart-admin-web/src/lib/http.js index 0db54bdd..0223aa7b 100644 --- a/smart-admin-web/src/lib/http.js +++ b/smart-admin-web/src/lib/http.js @@ -112,6 +112,10 @@ export const postFileUploadAxios = (url, data) => { return axios.post(url, data, { headers: { 'Content-Type': 'multipart/form-data' } }); }; +export const getDownloadAxios = (url) => { + return axios.get(url, { responseType: 'blob' }); +}; + export const postDownloadAxios = (url, data) => { return axios.post(url, data, { responseType: 'blob' }); }; diff --git a/smart-admin-web/src/views/system/employee/components/department-employee-tree/department-employee-tree.vue b/smart-admin-web/src/views/system/employee/components/department-employee-tree/department-employee-tree.vue index d3367d81..be1e3c5a 100644 --- a/smart-admin-web/src/views/system/employee/components/department-employee-tree/department-employee-tree.vue +++ b/smart-admin-web/src/views/system/employee/components/department-employee-tree/department-employee-tree.vue @@ -5,11 +5,11 @@ - + diff --git a/smart-admin-web/src/views/system/employee/role/components/role-list/role-list.vue b/smart-admin-web/src/views/system/employee/role/components/role-list/role-list.vue index bfef12f5..55ab14c3 100644 --- a/smart-admin-web/src/views/system/employee/role/components/role-list/role-list.vue +++ b/smart-admin-web/src/views/system/employee/role/components/role-list/role-list.vue @@ -86,7 +86,7 @@ style="overflow-y:scroll;height: 290px;text-align: center" > - + {{item.manageName}}