Merge remote-tracking branch 'origin/zdTest' into zdTest

src/api/system/role.js

 import request from '@/utils/request'
-
+import Qs from 'qs'
 // 查询角色列表
 export function listRole(query) {
   return request({
@@ -10,57 +10,63 @@ export function listRole(query) {
 }
 
 // 查询角色详细
-export function getRole(roleId) {
+export function getRole(businessId) {
   return request({
-    url: '/system/role/' + roleId,
+    url: '/system/role/detail/' + businessId,
     method: 'get'
   })
 }
 
 // 新增角色
 export function addRole(data) {
+  data = Qs.stringify(data)
   return request({
-    url: '/authority/system/role',
+    url: '/system/role/add',
     method: 'post',
-    data: data
+    data: data,
+    headers: {
+      'Content-Type': 'application/x-www-form-urlencoded'
+    }
   })
 }
 
 // 修改角色
 export function updateRole(data) {
+  const businessId = data.businessId
+  data = Qs.stringify(data)
   return request({
-    url: '/authority/system/role',
+    url: '/system/role/update/' + businessId,
     method: 'put',
-    data: data
+    data
   })
 }
 
 // 角色数据权限
 export function dataScope(data) {
   return request({
-    url: '/authority/system/role/dataScope',
+    url: '/system/role/dataScope',
     method: 'put',
-    data: data
+    data
   })
 }
 
 // 角色状态修改
-export function changeRoleStatus(roleId, status) {
+export function changeRoleStatus(businessId, flag) {
   const data = {
-    roleId,
-    status
+    businessId,
+    flag
   }
   return request({
-    url: '/authority/system/role/changeStatus',
+    url: '/system/role/changeStatus',
     method: 'put',
-    data: data
+    params: data
   })
 }
 
 // 删除角色
 export function delRole(roleId) {
   return request({
-    url: '/authority/system/role/' + roleId,
+    url: '/system/role/deleteLogical/' + roleId,
     method: 'delete'
   })
 }
@@ -68,7 +74,7 @@ export function delRole(roleId) {
 // 导出角色
 export function exportRole(query) {
   return request({
-    url: '/authority/system/role/export',
+    url: '/system/role/export',
     method: 'get',
     params: query
   })

src/api/system/user.js

@@ -136,6 +136,7 @@ export function importTemplate(params) {
   return request({
     url: '/system/user/importTemplate',
     method: 'get',
+    responseType: 'blob',
     params
   })
 }

src/views/system/user/index.vue

@@ -826,9 +826,18 @@ export default {
       this.upload.open = true
     },
     /** 下载模板操作 */
-    importTemplate(params) {
+    importTemplate() {
       importTemplate().then(response => {
-        this.download(response.msg)
+        const blob = new Blob([response])
+        const downloadElement = document.createElement('a')
+        const href = window.URL.createObjectURL(blob)// 创建下载的链接
+        downloadElement.href = href
+        downloadElement.download = '用户导入模板' + '.xls' // 下载后文件名
+        document.body.appendChild(downloadElement)
+        downloadElement.click()// 点击下载
+        document.body.removeChild(downloadElement)// 下载完成移除元素
+        window.URL.revokeObjectURL(href)// 释放掉blob对象
+        // this.download(response.msg);
       })
     },
     // 文件上传中处理