Merge branch 'master_dev_permission'

@@ -157,7 +157,7 @@
 		<el-dialog title="岗位的权限设置"
 				   :visible.sync="PermFormVisible"
 				   :close-on-click-modal="false"
-				   top="5vh"
+				   top="5vh" width="75%"
 		>
 			<el-row>
 				<el-col :span="4" >
@@ -168,11 +168,11 @@
 				</el-col>
 			</el-row>
 			<el-divider></el-divider>
-			<el-form :model="permForm" label-width="80px"  ref="permForm">
+			<el-form :model="permForm"  style="width: 95%"  ref="permForm">
 				<el-tree :data="permissons" :props="treeDefaultProps"
 					@check="clickDeal"
 					:default-expand-all = "treeExpand"
-					show-checkbox highlight-current  check-on-click-node check-strictly
+					show-checkbox highlight-current
 					node-key="permissionId" ref="tree">
 				</el-tree>
 			</el-form>
@@ -224,7 +224,7 @@
                     children: 'children',
                     label: 'name',
                 },
-				treeExpand: false,
+				treeExpand: true,
                 departmentNameList:[],
 				roles: [],
 				permissons: [],
@@ -376,6 +376,7 @@
                 NProgress.start();
                 permList(para).then((res) => {
                     this.permissons = res.data.list;
+                    console.log(this.permissons);
                     NProgress.done();
                 }).catch((error) => {
                     if(null!= error.response && error.response!==undefined){
@@ -623,7 +624,6 @@
                     return;
                 }
             },
-
             // 统一处理子节点为相同的勾选状态
             uniteChildSame(treeList, isSelected){
                 this.$refs.tree.setChecked(treeList.permissionId, isSelected);
@@ -684,7 +684,44 @@
 
 </style>
 
+
 <style lang="scss">
+	/*//一级节点选择器*!*!*/
+	.el-tree-node>.el-tree-node__content {
+		font-weight: 900;
+		color: #000000;
+	}
+	/*//二级节点选择器*!*!*/
+	.el-tree-node>.el-tree-node__children>.el-tree-node>.el-tree-node__content>.el-tree-node__label {
+		font-size: 14px;
+		color: #000000;
+		font-weight: 500;
+		width: 800px;
+	}
+	.el-tree-node>.el-tree-node__children>.el-tree-node>.el-tree-node__children>.el-tree-node>.el-tree-node__content>.el-tree-node__label {
+		font-size: 13px;
+		color: #777777;
+		width: 100px;
+		/*flex-direction: column;*/
+	}
+	.el-tree-node>.el-tree-node__children>.el-tree-node>.el-tree-node__children>.el-tree-node>.el-tree-node__children>.el-tree-node>.el-tree-node__content>.el-tree-node__label {
+		font-size: 14px;
+		color: #777777;
+		width: 300px;
+		/*flex-direction: column;*/
+	}
+	/* 控制树形节点横向显示 */
+	.el-tree-node.is-expanded>.el-tree-node__children{
+		display:flex;
+		flex-wrap: wrap; /* flex横向布局换行显示 */
+	}
+
+	/* 去除点击收缩图标时：横向显示的数据会先晃动成纵向显示的再收缩的现象*/
+	.collapse-transition{
+		transition:none !important;
+	}
+
+
 	.grid-content {
 		height: 36px;
 		line-height: 36px;

@@ -4,12 +4,12 @@
 		<el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
 			<el-form :inline="true" :model="filters">
 				<el-form-item>
-					<el-input v-model="filters.realName" placeholder="真实姓名">
+					<el-input v-model="filters.realName" placeholder="真实姓名" style="width: 200px">
 						<template slot="prepend">姓名</template>
 					</el-input>
 				</el-form-item>
 				<el-form-item>
-					<el-input v-model="filters.userName" placeholder="登录账号">
+					<el-input v-model="filters.userName" placeholder="登录账号" style="width: 200px">
 						<template slot="prepend">账号</template>
 					</el-input>
 				</el-form-item>
@@ -17,7 +17,7 @@
 					<div class="my-text-area">
 						<div class="el-input-group__prepend prepand">状态</div>
 						<el-select v-model="filters.userStatus"
-								   clearable placeholder="请选择"   style="width: 225px">
+								   clearable placeholder="请选择"   style="width: 125px">
 							<el-option
 									v-for="item in userStatusOption"
 									:key="item.code"
@@ -223,7 +223,7 @@
 		</el-dialog>
 
 		<!--权限设置-->
-		<el-dialog title="权限设置" :visible.sync="roleFormVisible" :close-on-click-modal="false" class="roleDialog">
+		<el-dialog title="权限设置" :visible.sync="roleFormVisible" :close-on-click-modal="false" class="roleDialog" width="65%">
 			<el-form :model="roleEditForm" label-width="80px"  ref="roleEditForm" >
 				<el-form-item label="ID">
 					<span>{{roleEditForm.userId}}</span>