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/userRoleAuthorization.vue | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/src/views/AuthorizationManagement/userRoleAuthorization.vue b/src/views/AuthorizationManagement/userRoleAuthorization.vue
index da29669..f714432 100644
--- a/src/views/AuthorizationManagement/userRoleAuthorization.vue
+++ b/src/views/AuthorizationManagement/userRoleAuthorization.vue
@@ -1,6 +1,6 @@
<template>
<div class="menuSettings_box userRoleAuthorization userRoleAuthorization1">
- <div class="menuSettings_tree subpage_Div userRoleAuthorization_left">
+ <div class="menuSettings_left_tree subpage_Div userRoleAuthorization_left content-border">
<My-bread
:list="[
`${$t('operatManage.operatManage')}`,
@@ -32,6 +32,7 @@
menuSettings_tree
subpage_Div
userRoleAuthorization_mid userRoleAuthorization_left1
+ content-border
"
>
<div
@@ -91,7 +92,7 @@
</div>
</div>
<!-- <div class="userRoleAuthorization_resize1" title="鏀剁缉渚ц竟鏍�">鈰�</div> -->
- <div class="menuSettings_tree subpage_Div userRoleAuthorization_mid1">
+ <div class="menuSettings_tree subpage_Div userRoleAuthorization_mid1 content-border">
<div
style="
font-size: 14px;
@@ -99,7 +100,7 @@
line-height: 1;
cursor: text;
position: relative;
- top: 5px;
+ top: 0px;
margin-left: 10px;
display: flex;
align-items: center;
@@ -109,7 +110,7 @@
<span>
{{ $t("operatManage.UserRoleAuthorizationObj.userTable") }}</span
>
- <div class="btn" style="margin-left: auto">
+ <div class="btn" style="margin-left: auto;">
<el-button
v-if="menuStatus.insert"
type="success"
@@ -592,14 +593,26 @@
display: flex;
justify-content: space-between;
- .menuSettings_tree {
- width: 33%;
- //height: 98%;
- height: 100%;
+ .menuSettings_left_tree{
+ width: 20%;
+ height: 98%;
+ margin-top: 10px;
position: relative;
padding: 10px;
border-radius: 10px;
box-sizing: border-box;
+ overflow-y: auto;
+ }
+ .menuSettings_tree {
+ width: 39%;
+ height: 98%;
+ margin-top: 10px;
+ //height: 100%;
+ position: relative;
+ //padding: 1%;
+ padding: 10px;
+ border-radius: 10px;
+ box-sizing: border-box;
.saveBtn {
position: absolute;
left: 250px;
--
Gitblit v1.9.3