From 06fbda53248c3e4dfdb09db2bc05a957f918bfd9 Mon Sep 17 00:00:00 2001 From: RuoYi <yzz_ivy@163.com> Date: 星期一, 07 十一月 2022 11:20:02 +0800 Subject: [PATCH] 修复sheet超出最大行数异常问题 --- ruoyi-ui/src/views/system/role/index.vue | 27 +++++++-------------------- 1 files changed, 7 insertions(+), 20 deletions(-) diff --git a/ruoyi-ui/src/views/system/role/index.vue b/ruoyi-ui/src/views/system/role/index.vue index 5b99d17..cc9e541 100644 --- a/ruoyi-ui/src/views/system/role/index.vue +++ b/ruoyi-ui/src/views/system/role/index.vue @@ -1,12 +1,11 @@ <template> <div class="app-container"> - <el-form :model="queryParams" ref="queryForm" v-show="showSearch" :inline="true"> + <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"> <el-form-item label="角色名称" prop="roleName"> <el-input v-model="queryParams.roleName" placeholder="请输入角色名称" clearable - size="small" style="width: 240px" @keyup.enter.native="handleQuery" /> @@ -16,7 +15,6 @@ v-model="queryParams.roleKey" placeholder="请输入权限字符" clearable - size="small" style="width: 240px" @keyup.enter.native="handleQuery" /> @@ -26,7 +24,6 @@ v-model="queryParams.status" placeholder="角色状态" clearable - size="small" style="width: 240px" > <el-option @@ -40,7 +37,6 @@ <el-form-item label="创建时间"> <el-date-picker v-model="dateRange" - size="small" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" @@ -139,9 +135,7 @@ v-hasPermi="['system:role:remove']" >删除</el-button> <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:role:edit']"> - <span class="el-dropdown-link"> - <i class="el-icon-d-arrow-right el-icon--right"></i>更多 - </span> + <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button> <el-dropdown-menu slot="dropdown"> <el-dropdown-item command="handleDataScope" icon="el-icon-circle-check" v-hasPermi="['system:role:edit']">数据权限</el-dropdown-item> @@ -258,9 +252,8 @@ </template> <script> -import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus } from "@/api/system/role"; +import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role"; import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu"; -import { treeselect as deptTreeselect, roleDeptTreeselect } from "@/api/system/dept"; export default { name: "Role", @@ -368,12 +361,6 @@ this.menuOptions = response.data; }); }, - /** 查询部门树结构 */ - getDeptTreeselect() { - deptTreeselect().then(response => { - this.deptOptions = response.data; - }); - }, // 所有菜单节点数据 getMenuAllCheckedKeys() { // 目前被选中的菜单节点 @@ -400,8 +387,8 @@ }); }, /** 根据角色ID查询部门树结构 */ - getRoleDeptTreeselect(roleId) { - return roleDeptTreeselect(roleId).then(response => { + getDeptTree(roleId) { + return deptTreeSelect(roleId).then(response => { this.deptOptions = response.depts; return response; }); @@ -547,12 +534,12 @@ /** 分配数据权限操作 */ handleDataScope(row) { this.reset(); - const roleDeptTreeselect = this.getRoleDeptTreeselect(row.roleId); + const deptTreeSelect = this.getDeptTree(row.roleId); getRole(row.roleId).then(response => { this.form = response.data; this.openDataScope = true; this.$nextTick(() => { - roleDeptTreeselect.then(res => { + deptTreeSelect.then(res => { this.$refs.dept.setCheckedKeys(res.checkedKeys); }); }); -- Gitblit v1.9.2