feat: rbac查询页面

Yi.RuoYi.Vue3/src/api/system/dept.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询部门列表
 export function listDept(query) {
   return request({
-    url: '/dept/SelctGetList',
+    url: '/dept',
     method: 'get',
     params: query
   })
@@ -20,7 +20,7 @@ export function listDept(query) {
 // 查询部门详细
 export function getDept(deptId) {
   return request({
-    url: '/dept/getById/' + deptId,
+    url: '/dept/' + deptId,
     method: 'get'
   })
 }
@@ -28,7 +28,7 @@ export function getDept(deptId) {
 // 新增部门
 export function addDept(data) {
   return request({
-    url: '/dept/add',
+    url: '/dept',
     method: 'post',
     data: data
   })
@@ -37,7 +37,7 @@ export function addDept(data) {
 // 修改部门
 export function updateDept(data) {
   return request({
-    url: '/dept/update',
+    url: '/dept',
     method: 'put',
     data: data
   })
@@ -45,14 +45,9 @@ export function updateDept(data) {
 
 // 删除部门
 export function delDept(deptId) {
-  if("string"==typeof(deptId))
-  {
-    deptId=[deptId];
-  }
   return request({
-    url: '/dept/delList',
-    method: 'delete',
-    data:deptId
+    url: `/dept/${deptId}`,
+    method: 'delete'
   })
 }
 

Yi.RuoYi.Vue3/src/api/system/menu.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询菜单列表
 export function listMenu(query) {
   return request({
-    url: '/menu/selctGetList',
+    url: '/menu',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listMenu(query) {
 // 查询菜单详细
 export function getMenu(menuId) {
   return request({
-    url: '/menu/getById/' + menuId,
+    url: '/menu/' + menuId,
     method: 'get'
   })
 }
@@ -36,7 +36,7 @@ export function roleMenuTreeselect(roleId) {
 // 新增菜单
 export function addMenu(data) {
   return request({
-    url: '/menu/add',
+    url: '/menu',
     method: 'post',
     data: data
   })
@@ -45,7 +45,7 @@ export function addMenu(data) {
 // 修改菜单
 export function updateMenu(data) {
   return request({
-    url: '/menu/update',
+    url: '/menu',
     method: 'put',
     data: data
   })
@@ -53,13 +53,9 @@ export function updateMenu(data) {
 
 // 删除菜单
 export function delMenu(menuId) {
-  if("string"==typeof(menuId))
-  {
-    menuId=[menuId];
-  }
+
   return request({
-    url: '/menu/delList',
-    method: 'delete',
-    data:menuId
+    url: `/menu/${menuId}`,
+    method: 'delete'
   })
 }

Yi.RuoYi.Vue3/src/api/system/post.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询岗位列表
 export function listPost(query) {
   return request({
-    url: '/post/pageList',
+    url: '/post',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listPost(query) {
 // 查询岗位详细
 export function getPost(postId) {
   return request({
-    url: '/post/getById/' + postId,
+    url: '/post/' + postId,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getPost(postId) {
 // 新增岗位
 export function addPost(data) {
   return request({
-    url: '/post/add',
+    url: '/post',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addPost(data) {
 // 修改岗位
 export function updatePost(data) {
   return request({
-    url: '/post/update',
+    url: '/post',
     method: 'put',
     data: data
   })
@@ -37,21 +37,16 @@ export function updatePost(data) {
 
 // 删除岗位
 export function delPost(postId) {
-  if("string"==typeof(postId))
-  {
-    postId=[postId];
-  }
   return request({
-    url: '/post/delList',
-    method: 'delete',
-    data:postId
+    url: `/post/${postId}`,
+    method: 'delete'
   })
 }
 
 // 获取角色选择框列表
 export function postOptionselect() {
   return request({
-    url: '/post/getList',
+    url: '/post',
     method: 'get'
   })
 

Yi.RuoYi.Vue3/src/api/system/role.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询角色列表
 export function listRole(query) {
   return request({
-    url: '/role/pageList',
+    url: '/role',
     method: 'get',
     params: query
   })
@@ -14,7 +14,7 @@ export function listRole(query) {
 // 查询角色详细
 export function getRole(roleId) {
   return request({
-    url: '/role/getById/' + roleId,
+    url: '/role/' + roleId,
     method: 'get'
   })
 }
@@ -22,7 +22,7 @@ export function getRole(roleId) {
 // 新增角色
 export function addRole(data) {
   return request({
-    url: '/role/add',
+    url: '/role',
     method: 'post',
     data: data
   })
@@ -31,7 +31,7 @@ export function addRole(data) {
 // 修改角色
 export function updateRole(data) {
   return request({
-    url: '/role/update',
+    url: '/role',
     method: 'put',
     data: data
   })
@@ -56,14 +56,9 @@ export function changeRoleStatus(roleId, isDel) {
 
 // 删除角色
 export function delRole(roleId) {
-  if("string"==typeof(roleId))
-  {
-    roleId=[roleId];
-  }
   return request({
-    url: '/role/delList',
+    url: `/role/${roleId}`,
     method: 'delete',
-    data:roleId
   })
 }
 
@@ -122,7 +117,7 @@ export function authUserSelectAll(data) {
 // 获取角色选择框列表
 export function roleOptionselect() {
   return request({
-    url: '/role/getList',
+    url: '/role',
     method: 'get'
   })
 

Yi.RuoYi.Vue3/src/api/system/user.js

@@ -4,7 +4,7 @@ import { parseStrEmpty } from "@/utils/ruoyi";
 // 查询用户列表
 export function listUser(query) {
   return request({
-    url: '/user/pageList',
+    url: '/user',
     method: 'get',
     params: query
   })
@@ -13,7 +13,7 @@ export function listUser(query) {
 // 查询用户详细
 export function getUser(userId) {
   return request({
-    url: '/user/getById/' + parseStrEmpty(userId),
+    url: '/user/' + parseStrEmpty(userId),
     method: 'get'
   })
 }
@@ -28,24 +28,34 @@ export function addUser(data) {
 }
 
 // 修改用户
-export function updateUser(data) {
+export function updateUser(id, data) {
   return request({
-    url: '/user/update',
+    url: `/user/${id}`,
     method: 'put',
-    data: data
+    data: {
+
+      userName: data.user.userName,
+      nick: data.user.nick,
+      password: data.user.password,
+      phone: data.user.phone,
+      email: data.user.email,
+      sex: data.user.sex,
+      state: data.user.state,
+      remark: data.user.remark,
+      postIds: data.postIds,
+      roleIds: data.roleIds,
+      deptId: data.deptId
+
+
+    }
   })
 }
 
 // 删除用户
 export function delUser(userId) {
-  if("string"==typeof(userId))
-  {
-    userId=[userId];
-  }
   return request({
-    url: '/user/delList',
+    url: `/user/${userId}`,
     method: 'delete',
-    data:userId
   })
 }
 
@@ -85,7 +95,7 @@ export function updateUserProfile(data) {
   return request({
     url: '/user/UpdateProfile',
     method: 'put',
-    data: {user:data}
+    data: { user: data }
   })
 }
 

Yi.RuoYi.Vue3/src/views/system/dept/index.vue

@@ -191,7 +191,7 @@ const { queryParams, form, rules } = toRefs(data);
 function getList() {
   loading.value = true;
   listDept(queryParams.value).then(response => {
-    deptList.value = proxy.handleTree(response.data, "id");
+    deptList.value = proxy.handleTree(response.data.items, "id");
     loading.value = false;
   });
 }

Yi.RuoYi.Vue3/src/views/system/menu/index.vue

@@ -329,7 +329,7 @@ const { queryParams, form, rules } = toRefs(data);
 function getList() {
   loading.value = true;
   listMenu(queryParams.value).then(response => {
-    menuList.value = proxy.handleTree(response.data, "id");
+    menuList.value = proxy.handleTree(response.data.items, "id");
     loading.value = false;
   });
 }
@@ -338,7 +338,7 @@ function getTreeselect() {
   menuOptions.value = [];
   listMenu().then(response => {
     const menu = { id: 0, menuName: "主类目", children: [] };
-    menu.children = proxy.handleTree(response.data, "id");
+    menu.children = proxy.handleTree(response.data.items, "id");
     menuOptions.value.push(menu);
   });
 }

Yi.RuoYi.Vue3/src/views/system/post/index.vue

@@ -186,7 +186,7 @@ const { queryParams, form, rules } = toRefs(data);
 function getList() {
   loading.value = true;
   listPost(queryParams.value).then(response => {
-    postList.value = response.data.data;
+    postList.value = response.data.items;
     total.value = response.data.total;
     loading.value = false;
   });

Yi.RuoYi.Vue3/src/views/system/role/index.vue

@@ -442,7 +442,7 @@ function getList() {
   loading.value = true;
   listRole(proxy.addDateRange(queryParams.value, dateRange.value)).then(
     (response) => {
-      roleList.value = response.data.data;
+      roleList.value = response.data.items;
       total.value = response.data.total;
       loading.value = false;
     }
@@ -525,7 +525,7 @@ function handleAuthUser(row) {
 function getMenuTreeselect() {
   listMenu().then((response) => {
     const options = [];
-    response.data.forEach((m) => {
+    response.data.items.forEach((m) => {
       options.push({
         id: m.id,
         label: m.menuName,

Yi.RuoYi.Vue3/src/views/system/user/index.vue

@@ -81,9 +81,9 @@
                         @change="handleStatusChange(scope.row)"></el-switch>
                   </template>
                </el-table-column>
-               <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
+               <el-table-column label="创建时间" align="center" prop="creationTime" v-if="columns[6].visible" width="160">
                   <template #default="scope">
-                     <span>{{ parseTime(scope.row.createTime) }}</span>
+                     <span>{{ parseTime(scope.row.creationTime) }}</span>
                   </template>
                </el-table-column>
                <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
@@ -321,7 +321,7 @@ watch(deptName, val => {
 function getDeptTree() {
    listDept().then(response => {
       const selectList = [];
-      response.data.forEach(res => {
+      response.data.items.forEach(res => {
          selectList.push({ id: res.id, label: res.deptName, parentId: res.parentId, orderNum: res.orderNum, children: [] })
       }
 
@@ -335,7 +335,7 @@ function getList() {
    listUser(proxy.addDateRange(queryParams.value, dateRange.value)).then(res => {
 
       loading.value = false;
-      userList.value = res.data.data;
+      userList.value = res.data.items;
       total.value = res.data.total;
    });
 };
@@ -469,10 +469,10 @@ function reset() {
    if (postOptions.value.length == 0 || roleOptions.value.length == 0) {
       roleOptionselect().then(response => {
          //岗位从另一个接口获取全量
-         roleOptions.value = response.data;
+         roleOptions.value = response.data.items;
       })
       postOptionselect().then(response => {
-         postOptions.value = response.data;
+         postOptions.value = response.data.items;
 
       }
 
@@ -512,7 +512,6 @@ response.data.posts.forEach(post => {
 });
 
 form.value.deptId= response.data.deptId;
-
 response.data.roles.forEach(role => {
    form.value.roleIds.push(role.id)
 });
@@ -529,7 +528,7 @@ function submitForm() {
    proxy.$refs["userRef"].validate(valid => {
       if (valid) {
          if (form.value.user.id != undefined) {
-            updateUser(form.value).then(response => {
+            updateUser(form.value.user.id,form.value).then(response => {
                proxy.$modal.msgSuccess("修改成功");
                open.value = false;
                getList();

Yi.RuoYi.Vue3/src/views/tool/gen/genInfoForm.vue

@@ -269,7 +269,7 @@ function setSubTableColumns(value) {
 /** 查询菜单下拉树结构 */
 function getMenuTreeselect() {
   listMenu().then(response => {
-    menuOptions.value = proxy.handleTree(response.data, "menuId");
+    menuOptions.value = proxy.handleTree(response.data.items, "menuId");
   });
 }