From 6395a7c8d46f7c9794756457e72a1050ede2c98e Mon Sep 17 00:00:00 2001
From: valarchie <343928303@qq.com>
Date: Sun, 9 Apr 2023 17:50:10 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=8E=BB=E9=99=A4=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E5=92=8C=E9=83=A8=E9=97=A8=E4=B8=8E=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E7=9A=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/deptApi.js       |  8 ------
 src/api/system/menuApi.js       |  8 ------
 src/views/system/role/index.vue | 43 ++++++++++++++-------------------
 3 files changed, 18 insertions(+), 41 deletions(-)

diff --git a/src/api/system/deptApi.js b/src/api/system/deptApi.js
index 1393beb..3527de3 100644
--- a/src/api/system/deptApi.js
+++ b/src/api/system/deptApi.js
@@ -25,14 +25,6 @@ export function getDeptSelectTree() {
   });
 }
 
-// 根据角色ID查询部门树结构
-export function getDeptSelectTreeByRole(roleId) {
-  return request({
-    url: `/system/dept/dropdownList/role/${roleId}`,
-    method: 'get',
-  });
-}
-
 // 新增部门
 export function addDept(data) {
   return request({
diff --git a/src/api/system/menuApi.js b/src/api/system/menuApi.js
index c07deee..7e18c34 100644
--- a/src/api/system/menuApi.js
+++ b/src/api/system/menuApi.js
@@ -25,14 +25,6 @@ export function getMenuSelectTree() {
   });
 }
 
-// 根据角色ID查询菜单下拉树结构
-export function getMenuSelectTreeByRole(roleId) {
-  return request({
-    url: `/system/menu/roleMenuTreeSelect/${roleId}`,
-    method: 'get',
-  });
-}
-
 // 新增菜单
 export function addMenu(data) {
   return request({
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index e8d92d2..91d7702 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -255,9 +255,6 @@
 </template>
 
 <script setup name="Role">
-// import { addRole, changeRoleStatus, changeDataScope, deleteRole,  getRole,listRole,updateRole,} from '@/api/system/role';
-// import { getMenuSelectTreeByRole, getMenuSelectTree } from '@/api/system/menuApi';
-// import { getDeptSelectTree, getDeptTreeSelectByRole } from '@/api/system/deptApi';
 import * as roleApi from '@/api/system/roleApi';
 import * as menuApi from '@/api/system/menuApi';
 import * as deptApi from '@/api/system/deptApi';
@@ -441,21 +438,19 @@ function handleAdd() {
   title.value = '添加角色';
 }
 /** 修改角色 */
-function handleUpdate(row) {
+async function handleUpdate(row) {
   reset();
   const roleId = row.roleId || ids.value;
-  const roleMenu = getRoleMenuTreeSelect(roleId);
+  const roleMenu = await getRoleMenuTreeSelect(roleId);
   roleApi.getRole(roleId).then((response) => {
     form.value = response;
     form.value.roleSort = Number(form.value.roleSort);
     open.value = true;
+    const selectedMenuList = response.selectedMenuList;
     nextTick(() => {
-      roleMenu.then((res) => {
-        const { checkedKeys } = res;
-        checkedKeys.forEach((v) => {
-          nextTick(() => {
-            menuRef.value.setChecked(v, true, false);
-          });
+      selectedMenuList.forEach((v) => {
+        nextTick(() => {
+          menuRef.value.setChecked(v, true, false);
         });
       });
     });
@@ -464,16 +459,16 @@ function handleUpdate(row) {
 }
 /** 根据角色ID查询菜单树结构 */
 function getRoleMenuTreeSelect(roleId) {
-  return menuApi.getMenuSelectTreeByRole(roleId).then((response) => {
-    menuOptions.value = response.menus;
+  return menuApi.getMenuSelectTree(roleId).then((response) => {
+    menuOptions.value = response;
     return response;
   });
 }
 
 /** 根据角色ID查询部门树结构 */
 function getRoleDeptTreeSelect(roleId) {
-  return deptApi.getDeptSelectTreeByRole(roleId).then((response) => {
-    deptOptions.value = response.depts;
+  return deptApi.getDeptSelectTree(roleId).then((response) => {
+    deptOptions.value = response;
     return response;
   });
 }
@@ -549,24 +544,22 @@ function dataScopeSelectChange(value) {
   }
 }
 /** 分配数据权限操作 */
-function handleDataScope(row) {
+async function handleDataScope(row) {
   reset();
-  const roleDeptTreeResponse = getRoleDeptTreeSelect(row.roleId);
+  const roleDeptTreeResponse = await getRoleDeptTreeSelect(row.roleId);
+
   roleApi.getRole(row.roleId).then((response) => {
     form.value = response;
     openDataScope.value = true;
     nextTick(() => {
-      roleDeptTreeResponse.then((res) => {
-        nextTick(() => {
-          if (deptRef.value) {
-            deptRef.value.setCheckedKeys(res.checkedKeys);
-          }
-        });
-      });
+      if (deptRef.value) {
+        deptRef.value.setCheckedKeys(response.selectedDeptList);
+      }
     });
-    title.value = '分配数据权限';
   });
+  title.value = '分配数据权限';
 }
+
 /** 提交按钮（数据权限） */
 function submitDataScope() {
   if (form.value.roleId != undefined) {