From d5db4ebd0092521b8fbca0d3c7197b67322903ba Mon Sep 17 00:00:00 2001
From: izory <791736813@qq.com>
Date: Mon, 11 Oct 2021 15:23:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/System/SysRoleController.cs    |  2 +-
 ZR.Vue/src/views/login.vue                     |  2 +-
 ZR.Vue/src/views/system/roleusers/index.vue    | 18 +++++++++---------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/ZR.Admin.WebApi/Controllers/System/SysRoleController.cs b/ZR.Admin.WebApi/Controllers/System/SysRoleController.cs
index 73a12fb..9fe0d43 100644
--- a/ZR.Admin.WebApi/Controllers/System/SysRoleController.cs
+++ b/ZR.Admin.WebApi/Controllers/System/SysRoleController.cs
@@ -124,7 +124,7 @@ namespace ZR.Admin.WebApi.Controllers.System
         /// <param name="sysRoleDto"></param>
         /// <returns></returns>
         [HttpPut("dataScope")]
-        [ActionPermissionFilter(Permission = "system:role:update")]
+        [ActionPermissionFilter(Permission = "system:role:authorize")]
         [Log(Title = "角色管理", BusinessType = BusinessType.UPDATE)]
         public IActionResult DataScope([FromBody] SysRole sysRoleDto)
         {
diff --git a/ZR.Vue/src/views/login.vue b/ZR.Vue/src/views/login.vue
index dce5e28..c13c14c 100644
--- a/ZR.Vue/src/views/login.vue
+++ b/ZR.Vue/src/views/login.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">{{title}}管理系统</h3>
+      <h3 class="title">{{title}}后台管理系统</h3>
       <el-form-item prop="username">
         <el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="账号">
           <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
diff --git a/ZR.Vue/src/views/system/roleusers/index.vue b/ZR.Vue/src/views/system/roleusers/index.vue
index 5e2fbe2..6d74979 100644
--- a/ZR.Vue/src/views/system/roleusers/index.vue
+++ b/ZR.Vue/src/views/system/roleusers/index.vue
@@ -9,8 +9,8 @@
       <el-col :span="20">
         <el-form style="display:flex" :inline="true" @submit.native.prevent>
           <el-form-item>
-            <el-button type="primary" size="mini" @click="handleGetUserTable" v-hasPermi="['system:roleusers:add']">添加用户</el-button>
-            <el-button type="danger" size="mini" @click="handleDelete" v-hasPermi="['system:roleusers:del']">删除用户</el-button>
+            <el-button type="primary" plain size="mini" icon="el-icon-plus" @click="handleGetUserTable" v-hasPermi="['system:roleusers:add']">添加用户</el-button>
+            <el-button type="danger" plain size="mini" icon="el-icon-circle-close" @click="cancelAuthUserAll" v-hasPermi="['system:roleusers:del']">批量取消授权</el-button>
           </el-form-item>
           <el-form-item style="margin-left:auto">
             <el-input v-model="search" placeholder="请输入用户名称" clearable prefix-icon="el-icon-search" />
@@ -39,14 +39,14 @@
 
     <!-- 添加或修改菜单对话框 -->
     <el-dialog title="添加用户" :visible.sync="open" append-to-body :close-on-click-modal="false" @close="cancel">
-      <el-form style="display:flex" :inline="true" @submit.native.prevent>
+      <!-- <el-form style="display:flex" :inline="true" @submit.native.prevent>
         <el-form-item style="margin-left:auto">
           <el-input v-model="search" placeholder="请输入用户名称" clearable prefix-icon="el-icon-search" />
         </el-form-item>
-      </el-form>
+      </el-form> -->
       <el-row>
         <el-col>
-          <el-table ref="userTable" v-loading="loadingUser" :data="dataUserTable.filter(data => !search || data.userId.toLowerCase().includes(search.toLowerCase()) || data.userName.toLowerCase().includes(search.toLowerCase()))" row-key="userId" stripe border :height="tableHeight*0.5">
+          <el-table ref="userTable" v-loading="loadingUser" :data="dataUserTable" row-key="userId" stripe border :height="tableHeight*0.5">
             <el-table-column type="selection" width="55" align="center" />
             <el-table-column prop="userId" align="center" label="用户编号" width="150" />
             <el-table-column prop="userName" align="center" label="用户名称" width="150" />
@@ -106,7 +106,6 @@ export default {
     // 获取角色列表
     this.loadingRole = true;
     listRole({ pageSize: 50 }).then((response) => {
-      console.log(response);
       this.dataRoleTable = response.data.result;
       this.handleRoleTableSelection(this.dataRoleTable[0]);
       this.$refs.roleTable.setCurrentRow(this.dataRoleTable[0]);
@@ -122,13 +121,14 @@ export default {
         this.loadingRoleUser = false;
       });
     },
-    // 删除角色用户
-    handleDelete() {
+    // 批量删除角色用户
+    cancelAuthUserAll() {
       this.delSelections = [];
       this.$refs.roleUserTable.selection.forEach((element) => {
         this.delSelections.push(element.userId);
       });
       if (this.delSelections.length === 0) {
+        console.log('未选中')
         return;
       }
       this.$confirm(
@@ -156,6 +156,7 @@ export default {
         })
         .catch(() => {});
     },
+    // 取消授权
     handleCancelPerm(row) {
       this.delSelections = [];
       this.delSelections.push(row.userId);
@@ -183,7 +184,6 @@ export default {
       this.open = true;
       this.loadingUser = true;
       getExcludeUsers(this.roleId).then((response) => {
-        console.log(response);
         this.dataUserTable = response.data;
         this.loadingUser = false;
       });