diff --git a/src/assets/styles/mixin.scss b/src/assets/styles/mixin.scss index 10dbbfb..a1a5b59 100644 --- a/src/assets/styles/mixin.scss +++ b/src/assets/styles/mixin.scss @@ -251,6 +251,43 @@ } } +@mixin tree_tab_style{ + [data-theme="dark"] & { + border-bottom: 1px solid $mainColor; + } + [data-theme="light"] & { + border-bottom: 1px solid #E3E7EE; + } +} + +@mixin tree_tab_item{ + [data-theme="dark"] & { + padding: 15px 0; + } + [data-theme="light"] & { + color: #A6ADB6; + padding-bottom: 15px; + } +} + +@mixin tree_tab_item_active{ + [data-theme="dark"] & { + border-bottom: 3px solid #3a99fd; + } + [data-theme="light"] & { + color: #000; + border-bottom: 3px solid #0348F3; + } +} + +@mixin tree_no_header{ + [data-theme="dark"] & { + margin-top:120px; + min-height: calc(100vh - 260px); + padding: 0 20px; + } +} + @mixin table_height_min{ [data-theme="dark"] & { min-height: calc(100vh - 260px); diff --git a/src/assets/styles/yxk-admin.scss b/src/assets/styles/yxk-admin.scss index 92e16d9..6ad0400 100644 --- a/src/assets/styles/yxk-admin.scss +++ b/src/assets/styles/yxk-admin.scss @@ -8,6 +8,7 @@ } .container-left{ @include tree_height_min; + @include tree_no_header; } } .elect-cont-right{ @@ -1533,3 +1534,26 @@ input[type ='number'] { } } +// 角色权限选择 +.tree-tab { + display: flex; + justify-content: space-between; + align-items: first baseline; + @include tree_tab_style; + span.role-span{ + display: block; + font-size: 14px; + @include tree_tab_item; + line-height: 26px; + &.role-tab-active{ + font-size: 16px; + @include tree_tab_item_active; + } + } + .el-button--mini{ + width: 46px; + height: 26px; + padding: 0; + } +} + diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue index 85151fc..6ec9019 100644 --- a/src/views/system/role/index.vue +++ b/src/views/system/role/index.vue @@ -88,17 +88,18 @@