From 9ecbbb4ef83804e7efd6d428575394a504721ac3 Mon Sep 17 00:00:00 2001
From: haoxr <1490493387@qq.com>
Date: Wed, 23 Nov 2022 23:24:06 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=92=E8=89=B2=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E9=87=8D=E7=BD=AE=E6=97=A0=E6=95=88=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: ec9a83d9b6081345cfca5a91ef96471729c20854
---
 src/api/role/index.ts           |  2 +-
 src/views/system/role/index.vue | 19 ++++++++-----------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/api/role/index.ts b/src/api/role/index.ts
index f900a7d0..68ab349b 100644
--- a/src/api/role/index.ts
+++ b/src/api/role/index.ts
@@ -65,7 +65,7 @@ export function updateRoleMenus(
  *
  * @param id
  */
-export function getRoleFormDetail(id: number): AxiosPromise<RoleForm> {
+export function getRoleDetail(id: number): AxiosPromise<RoleForm> {
   return request({
     url: '/api/v1/roles/' + id,
     method: 'get'
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index edf88289..887f0366 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -9,7 +9,7 @@ import { onMounted, reactive, ref, toRefs } from 'vue';
 import {
   listRolePages,
   updateRole,
-  getRoleFormDetail,
+  getRoleDetail,
   addRole,
   deleteRoles,
   getRoleMenuIds,
@@ -49,10 +49,8 @@ const state = reactive({
   },
   menuDialogVisible: false,
   resourceOptions: [] as OptionType[],
-  btnPerms: {} as any,
   // 勾选的菜单ID
   checkedMenuIds: new Set([]),
-  allPermIds: [] as string[],
   // 选中的角色
   checkedRole: {
     id: '',
@@ -78,12 +76,11 @@ const {
  * 查询
  */
 function handleQuery() {
-  emit('roleClick', {});
-  state.loading = true;
+  loading.value = true;
   listRolePages(state.queryParams).then(({ data }) => {
-    state.roleList = data.list;
-    state.total = data.total;
-    state.loading = false;
+    roleList.value = data.list;
+    total.value = data.total;
+    loading.value = false;
   });
 }
 /**
@@ -115,8 +112,8 @@ function handleUpdate(row: any) {
     visible: true
   };
   const roleId = row.id || state.ids;
-  getRoleFormDetail(roleId).then(({ data }) => {
-    state.formData = data;
+  getRoleDetail(roleId).then(({ data }) => {
+    formData.value = data;
   });
 }
 
@@ -230,7 +227,7 @@ onMounted(() => {
   <div class="app-container">
     <div class="search">
       <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-        <el-form-item prop="name" label="关键字">
+        <el-form-item prop="keywords" label="关键字">
           <el-input
             v-model="queryParams.keywords"
             placeholder="角色名称"