Browse Source

fix🐛: 修复用户删除404的问题

zhangwenjian 4 years ago
parent
commit
f2d103f439
2 changed files with 36 additions and 32 deletions
  1. 29 27
      src/api/admin/sys-user.js
  2. 7 5
      src/views/admin/sys-user/index.vue

+ 29 - 27
src/api/admin/sys-user.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询用户列表
 export function listUser(query) {
   return request({
-    url: '/api/v1/sysUser',
+    url: '/api/v1/sys-user',
     method: 'get',
     params: query
   })
@@ -12,14 +12,14 @@ export function listUser(query) {
 // 查询用户详细
 export function getUser(userId) {
   return request({
-    url: '/api/v1/sysUser/' + userId,
+    url: '/api/v1/sys-user/' + userId,
     method: 'get'
   })
 }
 
 export function getUserInit() {
   return request({
-    url: '/api/v1/sysUser/',
+    url: '/api/v1/sys-user/',
     method: 'get'
   })
 }
@@ -27,7 +27,7 @@ export function getUserInit() {
 // 新增用户
 export function addUser(data) {
   return request({
-    url: '/api/v1/sysUser',
+    url: '/api/v1/sys-user',
     method: 'post',
     data: data
   })
@@ -36,24 +36,25 @@ export function addUser(data) {
 // 修改用户
 export function updateUser(data) {
   return request({
-    url: '/api/v1/sysUser',
+    url: '/api/v1/sys-user',
     method: 'put',
     data: data
   })
 }
 
 // 删除用户
-export function delUser(userId) {
+export function delUser(data) {
   return request({
-    url: '/api/v1/sysUser/' + userId,
-    method: 'delete'
+    url: '/api/v1/sys-user',
+    method: 'delete',
+    data: data
   })
 }
 
 // 导出用户
 export function exportUser(query) {
   return request({
-    url: '/api/v1/sysUser/export',
+    url: '/api/v1/sys-user/export',
     method: 'get',
     params: query
   })
@@ -66,42 +67,42 @@ export function resetUserPwd(userId, password) {
     password
   }
   return request({
-    url: '/api/v1/sysUser',
+    url: '/api/v1/user/pwd/reset',
     method: 'put',
     data: data
   })
 }
 
 // 用户状态修改
-export function changeUserStatus(userId, status) {
+export function changeUserStatus(e) {
   const data = {
-    userId,
-    status
+    userId: e.userId,
+    status: e.status
   }
   return request({
-    url: '/api/v1/sysUser',
+    url: '/api/v1/user/status',
     method: 'put',
     data: data
   })
 }
 
-// 查询用户个人信息
-export function getUserProfile() {
-  return request({
-    url: '/api/v1/user/profile',
-    method: 'get'
-  })
-}
-
 // 修改用户个人信息
 export function updateUserProfile(data) {
   return request({
-    url: '/api/v1/sysUser/profile',
+    url: '/api/v1/sys-user/profile',
     method: 'put',
     data: data
   })
 }
 
+// 下载用户导入模板
+export function importTemplate() {
+  return request({
+    url: '/api/v1/sys-user/importTemplate',
+    method: 'get'
+  })
+}
+
 // 用户密码重置
 export function updateUserPwd(oldPassword, newPassword) {
   const data = {
@@ -109,7 +110,7 @@ export function updateUserPwd(oldPassword, newPassword) {
     newPassword
   }
   return request({
-    url: '/api/v1/user/pwd',
+    url: '/api/v1/user/pwd/set',
     method: 'put',
     data: data
   })
@@ -124,10 +125,11 @@ export function uploadAvatar(data) {
   })
 }
 
-// 下载用户导入模板
-export function importTemplate() {
+// 查询用户个人信息
+export function getUserProfile() {
   return request({
-    url: '/api/v1/sysUser/importTemplate',
+    url: '/api/v1/user/profile',
     method: 'get'
   })
 }
+

+ 7 - 5
src/views/admin/sys-user/index.vue

@@ -139,7 +139,9 @@
               </el-table-column>
               <el-table-column
                 label="操作"
-                width="120"
+                width="160"
+
+                fix="right"
                 class-name="small-padding fixed-width"
               >
                 <template slot-scope="scope">
@@ -491,7 +493,7 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(function() {
-        return changeUserStatus(row.userId, row.status)
+        return changeUserStatus(row)
       }).then(() => {
         this.msgSuccess(text + '成功')
       }).catch(function() {
@@ -616,13 +618,13 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const userIds = row.userId || this.ids
-      this.$confirm('是否确认删除用户编号为"' + userIds + '"的数据项?', '警告', {
+      const Ids = (row.userId && [row.userId]) || this.ids
+      this.$confirm('是否确认删除用户编号为"' + Ids + '"的数据项?', '警告', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(function() {
-        return delUser(userIds)
+        return delUser({ 'ids': Ids })
       }).then(() => {
         this.getList()
         this.msgSuccess('删除成功')