From ba5e65e7bda57e18bd0dcf65d1d9596f967e0ae0 Mon Sep 17 00:00:00 2001
From: xing <xingjs@qq.com>
Date: 星期日, 26 二月 2023 12:25:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/AuthorizationManagement/roleResAuthorization.vue | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/src/views/AuthorizationManagement/roleResAuthorization.vue b/src/views/AuthorizationManagement/roleResAuthorization.vue
index e1fe9f6..c7e3af6 100644
--- a/src/views/AuthorizationManagement/roleResAuthorization.vue
+++ b/src/views/AuthorizationManagement/roleResAuthorization.vue
@@ -1,7 +1,7 @@
<template>
<div class="menuSettings_box">
<div class="menuSettings_tree">
- <div class="content_box subpage_Div">
+ <div class="content_left_box subpage_Div content-border">
<My-bread :list="[
`${$t('operatManage.operatManage')}`,
`${$t('operatManage.RoleResAuthorization')}`,
@@ -22,7 +22,7 @@
</el-tree>
</div>
</div>
- <div class="content_box subpage_Div">
+ <div class="content_box subpage_Div content-border">
<div style="
font-size: 14px;
color: #216fe6;
@@ -40,7 +40,7 @@
style="width: 100%"
@row-click="singleElection"
highlight-current-row
- height="calc(100% - 50px)"
+ height="calc(100% - 80px)"
>
<el-table-column
align="center"
@@ -81,14 +81,14 @@
</el-pagination>
</div>
</div>
- <div class="content_box subpage_Div">
+ <div class="content_box subpage_Div content-border">
<div style="
font-size: 14px;
color: #216fe6;
line-height: 1;
cursor: text;
position: relative;
- top: 5px;
+ top: 0px;
margin-left: 10px;
display: flex;
align-items: center;
@@ -127,7 +127,7 @@
:data="usertableData"
style="width: 100%"
- height="calc(100% - 50px)"
+ height="calc(100% - 80px)"
@selection-change="handleSelectionChange"
>
<el-table-column
@@ -681,21 +681,26 @@
<style lang="less" scoped>
//@import url(); 寮曞叆鍏叡css绫�
.menuSettings_box {
- height: 100%;
+ height: calc(100% - 20px);
//height: 98%;
width: 98%;
- padding:0 1%;
+ padding:10px 1%;
.menuSettings_tree {
width: 100%;
height: 100%;
display: flex;
justify-content: space-around;
+ .content_left_box{
+ padding: 10px;
+ width: 20%;
+ height: 94%;
+ border-radius: 5px;
+ }
.content_box {
padding: 10px;
- width: 31%;
+ width: 36%;
height: 94%;
-
border-radius: 5px;
}
.divider {
--
Gitblit v1.9.3