Skip to content

F
founder_vue
Commit f270dbdf by liyuhang19990520
Options

角色管理、权限管理ui样式

parent 18da92f7
Showing with 111 additions and 48 deletions
src/views/SystemManage/GroupManage.vue
......@@ -127,7 +127,10 @@
</el-table-column>
<el-table-column prop="roleNames" label="组角色" :width="newWidth">
<template slot-scope="scope">
<div class="tagsBox">
<div
class="tagsBox"
v-if="strArr(scope.row.roleNames).length > 0"
>
<div
class="tags"
v-for="item in strArr(scope.row.roleNames).arr"
......@@ -156,6 +159,7 @@
</div>
</el-tooltip>
</div>
<span v-else class="kong">---</span>
</template>
</el-table-column>
<el-table-column :width="width4">
......@@ -1066,7 +1070,14 @@ export default {
arr: newArr,
length: arr.length,
};
if (obj.length == 1 && obj.arr[0] == "") {
return {
arr: [""],
length: 0,
};
} else {
return obj;
}
},
/**
* @function toggleSelection
......
src/views/SystemManage/PermissionManage.vue
......@@ -82,7 +82,9 @@
>
清空
</div>
<div class="btn f-primary-button" @click="searchUser('yes')">筛选</div>
<div class="btn f-primary-button" @click="searchUser('yes')">
筛选
</div>
</div>
</div>
<!-- 用户表格-->
......@@ -100,7 +102,6 @@
prop="username"
label="用户名"
:width="userWidths.width1"
align="center"
>
</el-table-column>
<el-table-column prop="name" label="姓名" :width="userWidths.width1">
......@@ -111,6 +112,9 @@
show-overflow-tooltip
:width="userWidths.width2"
>
<template slot-scope="scope">
{{ scope.row.policeNumber || "---" }}
</template>
</el-table-column>
<el-table-column
prop="userGroupNames"
......@@ -118,6 +122,9 @@
show-overflow-tooltip
:width="userWidths.width3"
>
<template slot-scope="scope">
{{ scope.row.userGroupNames || "---" }}
</template>
</el-table-column>
<el-table-column
prop="unitName"
......@@ -133,7 +140,10 @@
show-overflow-tooltip
>
<template slot-scope="scope">
<div class="tagsBox">
<div
class="tagsBox"
v-if="strArr(scope.row.roleNames).length > 0"
>
<div
class="tags"
v-for="item in strArr(scope.row.roleNames).arr"
......@@ -162,6 +172,7 @@
</div>
</el-tooltip>
</div>
<span v-else class="kong">---</span>
</template>
</el-table-column>
<el-table-column
......@@ -181,12 +192,7 @@
</div>
</template>
</el-table-column>
<el-table-column
prop="status"
label="启用状态"
width="auto"
align="center"
>
<el-table-column prop="status" label="启用状态" width="auto">
<template slot-scope="scope">
<div v-if="scope.row.status === 0" class="circle-red"></div>
<div v-if="scope.row.status === 1" class="circle-blue"></div>
......@@ -224,7 +230,6 @@
</el-table-column>
</el-table>
</div>
<div class="bottom-line"></div>
<!-- 用户分页-->
<div class="footer">
<span class="count"
......@@ -302,7 +307,9 @@
>
清空
</div>
<div class="btn f-primary-button" @click="searchGroup('yes')">筛选</div>
<div class="btn f-primary-button" @click="searchGroup('yes')">
筛选
</div>
</div>
</div>
<!-- 用户组表格-->
......@@ -319,12 +326,14 @@
prop="name"
label="用户组"
:width="groupWidths.width1"
align="center"
>
</el-table-column>
<el-table-column prop="roleNames" label="组角色" :width="newWidth2">
<template slot-scope="scope">
<div class="tagsBox">
<div
class="tagsBox"
v-if="strArr(scope.row.roleNames).length > 0"
>
<div
class="tags"
v-for="item in strArr(scope.row.roleNames).arr"
......@@ -353,17 +362,8 @@
</div>
</el-tooltip>
</div>
<span v-else class="kong">---</span>
</template>
<!-- <template slot-scope="scope">
<div
class="tags"
v-for="item in scope.row.roleNames &&
scope.row.roleNames.split(',')"
:key="item"
>
{{ item }}
</div>
</template> -->
</el-table-column>
<el-table-column
prop="userCount"
......@@ -416,7 +416,7 @@
</template>
</el-table-column>
<el-table-column prop="status" label="启用状态" align="center">
<el-table-column prop="status" label="启用状态">
<template slot-scope="scope">
<div v-if="scope.row.status === 0" class="circle-red"></div>
<div v-if="scope.row.status === 1" class="circle-blue"></div>
......@@ -454,7 +454,6 @@
</el-table-column>
</el-table>
</div>
<div class="bottom-line"></div>
<!-- 用户组分页-->
<div class="footer">
<span class="count"
......@@ -792,7 +791,14 @@ export default {
arr: newArr,
length: arr.length,
};
if (obj.length == 1 && obj.arr[0] == "") {
return {
arr: [""],
length: 0,
};
} else {
return obj;
}
},
getGroup() {
this.isUser = false;
......@@ -1112,6 +1118,11 @@ export default {
.groupTable {
// height: 550px !important;
}
.el-table {
&::before {
display: none;
}
}
.el-table /deep/ {
.el-tooltip {
width: 100% !important;
......
src/views/SystemManage/RoleManage.vue
......@@ -3,15 +3,15 @@
<div class="sider" @click="resetEdit('screen')">
<div class="btns">
<div class="add" @click.stop="add">
<svg-icon
<i
style="
width: 0.8125rem;
height: 0.8125rem;
margin-bottom: -0.0625rem;
margin-right: 0.25rem;
"
icon-class="ic_add"
/>
class="el-icon-plus"
></i>
<span class="add-role-span"> 新增角色 </span>
</div>
<div
......@@ -55,6 +55,7 @@
</div>
</div>
</div>
<div class="hr"></div>
<div class="diy-roles">
<div class="delbtns" v-if="roleArr.includes('H-3-5')">
<div
......@@ -120,12 +121,12 @@
v-model="item.value"
></el-input>
<div class="diy-edit-btn">
<img
class="img"
:src="editurl"
<i
class="iconfont icon-bianji"
v-if="!item.edit"
@click.stop="editDiyRoleItem(item)"
/>
>
</i>
<img
class="img"
v-else
......@@ -909,11 +910,19 @@ export default {
}
}
}
.add {
&:hover {
.el-icon-plus {
color: #055fe7;
}
.add-role-span {
font-size: 14px;
font-family: HarmonyOS_Sans_SC;
color: #055fe7;
}
}
}
.diy-roles {
.delbtns {
padding-right: 1.75rem;
......@@ -974,7 +983,7 @@ export default {
}
.delbtns {
position: absolute;
top: 0;
top: 4px;
left: 0;
height: 21px;
width: 100%;
......
src/views/SystemManage/UserManage.vue
......@@ -207,7 +207,7 @@
</div>
</el-tooltip>
</div>
<span v-else>---</span>
<span v-else class="kong">---</span>
</template>
</el-table-column>
<el-table-column
......
src/views/SystemManage/scss/boxShadow.scss
.kong {
padding-left: 10px;
}
.search {
/deep/ .el-select {
.el-input__icon {
......
src/views/SystemManage/scss/group.scss
......@@ -581,21 +581,21 @@
background: rgba($color: #fff, $alpha: 0.65);
filter: blur(2px);
}
.itemUser{
.itemUser {
height: 200px;
overflow: auto;
@include scrollBar();
}
.itemUserBtn /deep/{
.el-dropdown-menu__item{
.itemUserBtn /deep/ {
.el-dropdown-menu__item {
&:hover {
background-color: transparent;
}
&::before {
display: none;
}
padding-top: 16px!important;
padding-bottom: 16px!important;
padding-top: 16px !important;
padding-bottom: 16px !important;
text-align: center;
}
}
......@@ -665,7 +665,7 @@
right: 24px;
.addBtn {
width: 120px!important;
width: 120px !important;
border-color: #055fe7 !important;
color: #055fe7 !important;
}
......@@ -744,6 +744,12 @@
color: #ffffff;
line-height: 40px;
cursor: pointer;
&:hover {
background-color: #377fec !important;
}
&:active {
background-color: #044cb9 !important;
}
}
}
}
......
src/views/SystemManage/scss/permission.scss
......@@ -51,7 +51,7 @@
width: 100%;
.btns {
width: 260px;
height: 40px;
margin-bottom: 20px;
.btn {
text-align: center;
width: 129px;
......
src/views/SystemManage/scss/role.scss
......@@ -78,7 +78,6 @@
height: 366px;
display: flex;
flex-direction: column;
border-bottom: 1px solid #eeeeee;
.default-role-item {
width: 190px;
height: 40px;
......@@ -100,6 +99,12 @@
}
}
}
.hr {
height: 1px;
width: 200px;
display: block;
background-color: #eeeeee;
}
.diy-roles {
//border: saddlebrown 1px solid;
width: 215px;
......@@ -141,14 +146,23 @@
text-overflow: ellipsis;
}
.diy-edit-btn {
width: 40px;
height: 30px;
width: 35px;
height: 25px;
background: #ddebff;
box-shadow: 0px 0px 4px 0px rgba(5, 95, 231, 0.3);
border-bottom-left-radius: 250px;
border-bottom-left-radius: 200px;
position: absolute;
right: 0;
top: 0;
i {
position: absolute;
top: 5px;
right: 6px;
font-size: 14px;
line-height: 16px;
color: #055FE7;
cursor: pointer;
}
.img {
width: 13px;
height: 14px;
......
src/views/cxyrd/QueryConfirm.vue
......@@ -637,7 +637,7 @@ export default {
{ value: "-2", name: "同步特征", type: "querystates" },
{ value: "10", name: "比对完成", type: "querystates" },
{ value: "9", name: "比对出错", type: "querystates" },
{ value: "2", name: "人工认定", type: "querystates" },
{ value: "rg", name: "人工认定", type: "querystates" },
{ value: "sb", name: "闪捕未认定", type: "querystates" },
],
expanded: false, // 展开标志
......@@ -714,6 +714,7 @@ export default {
return false;
}
},
//
// 获取认定列表
search (type) {
this.getParam();
......@@ -724,7 +725,7 @@ export default {
}
let params = JSON.parse(JSON.stringify(this.reqParam));
console.log(params);
//处理闪捕未认定
if (params.contrastCustomSearchReq.querystates.includes("sb")) {
let index = params.contrastCustomSearchReq.querystates.indexOf("sb");
params.contrastCustomSearchReq.querystates.splice(index, 1);
......@@ -732,6 +733,14 @@ export default {
} else {
params.contrastCustomSearchReq.sbNotCheck = null;
}
//处理人工认定筛选
if (params.contrastCustomSearchReq.querystates.includes("rg")) {
let index = params.contrastCustomSearchReq.querystates.indexOf("rg");
params.contrastCustomSearchReq.querystates.splice(index, 1);
params.contrastCustomSearchReq.artificialAffirmFlag = '1';
} else {
params.contrastCustomSearchReq.artificialAffirmFlag = null;
}
// //console.info("请求===>", this.reqParam.contrastCustomSearchReq);
this.$axios.post("/api/queryque/standardQid", params).then((response) => {
if (response.data.code === 0) {
......
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