From 677feb8a4d8a6bc43cd342d4dbe059bc205b93bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=89=E6=9D=A5=E6=8A=80=E6=9C=AF?= <1490493387@qq.com>
Date: Thu, 23 Dec 2021 00:34:57 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E8=A7=92=E8=89=B2=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/role.ts                    |  2 +-
 src/views/system/role/components/Perm.vue | 83 ++++++++++-------------
 src/views/system/role/index.vue           |  8 ++-
 3 files changed, 43 insertions(+), 50 deletions(-)

diff --git a/src/api/system/role.ts b/src/api/system/role.ts
index 3021cc57..635b84bf 100644
--- a/src/api/system/role.ts
+++ b/src/api/system/role.ts
@@ -114,7 +114,7 @@ export function listRolePerms(roleId: number, menuId: number) {
     return request({
         url: '/youlai-admin/api/v1/roles/' + roleId + '/permissions',
         method: 'get',
-        data: {menuId: menuId}
+        params: {menuId: menuId}
     })
 }
 
diff --git a/src/views/system/role/components/Perm.vue b/src/views/system/role/components/Perm.vue
index cbea62de..d3ad6011 100644
--- a/src/views/system/role/components/Perm.vue
+++ b/src/views/system/role/components/Perm.vue
@@ -1,27 +1,20 @@
 <template>
   <div class="perm-container">
-    <el-form size="mini">
-      <el-form-item>
-        <el-row>
-          <el-col :span="12">
-            <el-button type="success" plain :icon="Switch" @click="toggleExpandAll">展开/折叠</el-button>
-          </el-col>
-          <el-col :span="12" style="text-align: right">
-            <el-button type="primary" :icon="Check" @click="handleSubmit">提交</el-button>
-          </el-col>
-        </el-row>
-      </el-form-item>
-    </el-form>
-
-
     <div v-if="permissionOptions.length > 0">
-      <el-checkbox
-          :indeterminate="isIndeterminate"
-          v-model="checkAll"
-          @change="handleCheckAllChange"
-          style="margin-top: 20px"
-      >全选
-      </el-checkbox>
+      <el-row>
+        <el-col :span="12">
+          <el-checkbox
+              :indeterminate="isIndeterminate"
+              v-model="checkAll"
+              @change="handleCheckAllChange"
+          >全选
+          </el-checkbox>
+        </el-col>
+        <el-col :span="12" style="text-align: right">
+          <el-button type="primary" :icon="Check" size="mini" @click="handleSubmit">提交</el-button>
+        </el-col>
+      </el-row>
+
       <el-row>
         <el-col
             :span="8"
@@ -36,7 +29,7 @@
               @change="handleCheckedPermChange"
               size="mini"
           >
-            {{ permission.name }}
+            {{ item.name }}
           </el-checkbox>
         </el-col>
       </el-row>
@@ -49,10 +42,10 @@
 
 <script setup lang="ts">
 import {listPerms} from "@/api/system/perm";
-import { listRolePerms, saveRolePerms} from "@/api/system/role";
+import {listRolePerms, saveRolePerms} from "@/api/system/role";
 import {defineProps, onMounted, reactive, toRefs, watch} from "vue";
 import {ElMessage} from "element-plus";
-
+import {Check} from '@element-plus/icons'
 
 const props = defineProps({
   role: {
@@ -65,15 +58,11 @@ const props = defineProps({
   }
 })
 
-watch(() => props.role.id as any, (newVal, oldVal) => {
-  const roleId = props.role.id
-  if (roleId) {
-  }
-})
 
 watch(() => props.menu.id as any, (newVal, oldVal) => {
   const menuId = props.menu.id
   if (menuId) {
+    loadData()
   }
 })
 
@@ -98,48 +87,50 @@ function handleCheckAllChange(checked: Boolean) {
 }
 
 function handleCheckedPermChange(value: any) {
-  const checkedCount = value.length;
+  const checkedCount = state.permissionOptions.filter(item => item.checked).length;
   state.checkAll = checkedCount === state.permissionOptions.length;
   state.isIndeterminate = checkedCount > 0 && checkedCount < state.permissionOptions.length;
 }
 
 function loadData() {
-  if(! props.menu.id){
+  if (!props.menu.id) {
+    resetData()
     return false
   }
-
   state.loading = true;
   listPerms({menuId: props.menu.id}).then(response => {
-    state.permissionOptions =  response.data
+    state.permissionOptions = response.data
     listRolePerms(props.role.id, props.menu.id).then(res => {
       const checkedPermIds = res.data
-      state.permissionOptions.map((item:any)=> {
+      state.permissionOptions.map((item: any) => {
         if (checkedPermIds.includes(item.id)) {
           item.checked = true;
         } else {
           state.checkAll = false
         }
       });
-
-      state.loading=false
-
+      state.loading = false
     })
   })
 }
 
-function handleSubmit(){
+function handleSubmit() {
   const checkedPermIds = state.permissionOptions
       .filter((item) => item.checked)
       .map((item) => item.id);
+  saveRolePerms(
+      props.role.id,
+      props.menu.id,
+      checkedPermIds
+  ).then(() => {
+    ElMessage.success("提交成功");
+  });
+}
 
-
-saveRolePerms(  props.menu.id,
-    props.role.id,
-    checkedPermIds
-).then(() => {
-  ElMessage.success("提交成功");
-});
-
+function resetData() {
+  state.permissionOptions = []
+  state.isIndeterminate = true
+  state.checkAll = false
 }
 
 onMounted(() => {
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 2e7d3c6b..917a1bd6 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -39,9 +39,9 @@
             </el-tag>
             <el-tag type="warning" style="margin:0 5px  0 0;" v-else size="small"> 请选择角色</el-tag>
 
-            <el-tag type="primary" v-if="state.role.id" size="small">
+            <el-tag type="success" v-if="state.menu.id" size="small">
               <svg-icon color="red" icon-class="menu"/>
-              {{ state.role.name }}
+              {{ state.menu.name }}
             </el-tag>
             <el-tag type="warning" v-else size="small"> 请选择菜单</el-tag>
           </template>
@@ -92,10 +92,12 @@ function handleMenuClick(menuRow: any) {
     return false
   }
 
+  console.log('选择菜单',menuRow)
+
   if (menuRow) {
     state.menu = {
       id: menuRow.id,
-      name: menuRow.name
+      name: menuRow.label
     }
   } else {
     state.menu = {