Commit cb176dad by li_hongchao

权限管理 UI 问题调整

parent 8a0ad212
...@@ -183,13 +183,14 @@ ...@@ -183,13 +183,14 @@
> >
<template slot-scope="scope"> <template slot-scope="scope">
<div <div
v-if="scope.row.permissionNames && scope.row.permissionNames !== '/'"
v-for="(item, index) in scope.row.permissionNames && v-for="(item, index) in scope.row.permissionNames &&
scope.row.permissionNames.split(',')" scope.row.permissionNames.split(',')"
:key="index" :key="index">
>
{{ index > 0 ? "/" : "" }} {{ index > 0 ? "/" : "" }}
{{ item }} {{ item }}
</div> </div>
<span v-else>{{ '---' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="status" label="启用状态" width="auto"> <el-table-column prop="status" label="启用状态" width="auto">
......
...@@ -781,4 +781,8 @@ export default { ...@@ -781,4 +781,8 @@ export default {
} }
} }
@import "scss/userpermission.scss"; @import "scss/userpermission.scss";
.manage-page .line {
height: 2rem !important;
}
</style> </style>
...@@ -280,7 +280,7 @@ ...@@ -280,7 +280,7 @@
} }
.el-checkbox { .el-checkbox {
margin: 0px 0px 10px 0px; margin: 0px 0px 12px 0px;
&:last-of-type { &:last-of-type {
margin-bottom: 0px; margin-bottom: 0px;
...@@ -294,7 +294,7 @@ ...@@ -294,7 +294,7 @@
height: 85px; height: 85px;
border-bottom: 1px solid #eeeeee; border-bottom: 1px solid #eeeeee;
.el-checkbox { .el-checkbox {
margin-bottom: 10px; margin-bottom: 12px;
} }
} }
...@@ -306,7 +306,7 @@ ...@@ -306,7 +306,7 @@
.el-checkbox { .el-checkbox {
//margin: 22px 20px 0 20px; //margin: 22px 20px 0 20px;
margin-bottom: 10px; margin-bottom: 12px;
} }
} }
...@@ -355,7 +355,7 @@ ...@@ -355,7 +355,7 @@
//padding-left: 30px; //padding-left: 30px;
//padding-top: 8px; //padding-top: 8px;
.line { .line {
height: 30px; height: 32px;
width: 220px; width: 220px;
} }
} }
...@@ -372,7 +372,7 @@ ...@@ -372,7 +372,7 @@
//} //}
.line { .line {
height: 30px; height: 32px;
width: 220px; width: 220px;
} }
} }
...@@ -385,7 +385,7 @@ ...@@ -385,7 +385,7 @@
//padding-left: 30px; //padding-left: 30px;
.line { .line {
height: 30px; height: 32px;
width: 220px; width: 220px;
> .el-checkbox { > .el-checkbox {
......
...@@ -167,11 +167,12 @@ ...@@ -167,11 +167,12 @@
display: flex; display: flex;
justify-content: flex-start; justify-content: flex-start;
align-items: center; align-items: center;
margin-left: 0px;
//border: 1px solid hotpink; width: auto; //border: 1px solid hotpink; width: auto;
.info-item { .info-item {
display: flex; display: flex;
align-items: center; align-items: center;
padding: 0 20px 0 20px; padding: 0 20px 0 0px;
border-right: 1px solid #e6e6e8; border-right: 1px solid #e6e6e8;
.info-title { .info-title {
width: auto; width: auto;
...@@ -355,6 +356,7 @@ ...@@ -355,6 +356,7 @@
width: 155px; width: 155px;
border-right: 1px solid #eeeeee; border-right: 1px solid #eeeeee;
.div3 { .div3 {
padding: 20px;
width: 100%; width: 100%;
height: 165px; height: 165px;
&:first-of-type { &:first-of-type {
...@@ -365,26 +367,34 @@ ...@@ -365,26 +367,34 @@
} }
border-bottom: 1px solid #eeeeee; border-bottom: 1px solid #eeeeee;
.el-checkbox { .el-checkbox {
margin: 10px 20px 0 20px; //margin: 10px 20px 0 20px;
&:not(:first-of-type) { //&:not(:first-of-type) {
margin-top: 20px; // margin-top: 20px;
//}
margin: 0px 0px 12px 0px;
&:last-of-type {
margin-bottom: 0px;
} }
} }
} }
.div2 { .div2 {
padding: 20px;
width: 100%; width: 100%;
height: 85px; height: 85px;
border-bottom: 1px solid #eeeeee; border-bottom: 1px solid #eeeeee;
.el-checkbox { .el-checkbox {
margin: 12px 20px 0 20px; //margin: 12px 20px 0 20px;
margin-bottom: 12px;
} }
} }
.div1 { .div1 {
padding: 20px;
width: 100%; width: 100%;
height: 55px; height: 55px;
border-bottom: 1px solid #eeeeee; border-bottom: 1px solid #eeeeee;
.el-checkbox { .el-checkbox {
margin: 15px 20px 0 20px; //margin: 15px 20px 0 20px;
margin-bottom: 12px;
} }
} }
// 未选中字体颜色 // 未选中字体颜色
...@@ -410,6 +420,7 @@ ...@@ -410,6 +420,7 @@
.content { .content {
width: 100%; width: 100%;
.div3 { .div3 {
padding: 20px;
&:last-of-type { &:last-of-type {
height: 150px; height: 150px;
} }
...@@ -420,9 +431,9 @@ ...@@ -420,9 +431,9 @@
width: 100%; width: 100%;
height: 165px; height: 165px;
border-bottom: 1px solid #eeeeee; border-bottom: 1px solid #eeeeee;
padding-left: 30px; //padding-left: 30px;
padding-top: 8px; //padding-top: 8px;
.line { /deep/.line{
width: 220px; width: 220px;
height: 30px; height: 30px;
} }
...@@ -430,10 +441,11 @@ ...@@ -430,10 +441,11 @@
.div2 { .div2 {
width: 100%; width: 100%;
height: 85px; height: 85px;
padding-left: 30px; padding: 20px;
//padding-left: 30px;
border-bottom: 1px solid #eeeeee; border-bottom: 1px solid #eeeeee;
.el-checkbox { .el-checkbox {
margin: 10px 20px 0 25px; //margin: 10px 20px 0 25px;
} }
.line /deep/ { .line /deep/ {
width: 220px; width: 220px;
...@@ -444,12 +456,13 @@ ...@@ -444,12 +456,13 @@
} }
} }
.div1 { .div1 {
padding: 20px;
width: 100%; width: 100%;
height: 55px; height: 55px;
padding-left: 30px; //padding-left: 30px;
border-bottom: 1px solid #eeeeee; border-bottom: 1px solid #eeeeee;
.el-checkbox { .el-checkbox {
margin: 15px 20px 0 25px; //margin: 15px 20px 0 25px;
} }
.line /deep/ { .line /deep/ {
width: 220px; width: 220px;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment