diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue
index bc43095be..f078cfe8f 100644
--- a/src/components/navMenu/index.vue
+++ b/src/components/navMenu/index.vue
@@ -299,10 +299,10 @@ export default {
         //       path: '/convertDocView',
         //       menuId: '3F52K25546'
         //     },
-        //     // {
-        //     //   title: '菜单管理',
-        //     //   path: '/menuManage'
-        //     // },
+            {
+              title: '菜单管理',
+              path: '/menuManage'
+            },
         //     // {
         //     //   title: '保密管理',
         //     //   path: '/convertDocView'
diff --git a/src/pages/config/pages/mechanismManage/index.vue b/src/pages/config/pages/mechanismManage/index.vue
index ed2956fe3..b5e1f5053 100644
--- a/src/pages/config/pages/mechanismManage/index.vue
+++ b/src/pages/config/pages/mechanismManage/index.vue
@@ -188,7 +188,6 @@ export default {
   computed: {},
   watch: {
     filterText(val) {
-      console.log(val);
       this.$refs.tree.filter(val);
     }
   },
diff --git a/src/pages/config/pages/menuManage/index.vue b/src/pages/config/pages/menuManage/index.vue
index 50cb3a232..55b79fe33 100644
--- a/src/pages/config/pages/menuManage/index.vue
+++ b/src/pages/config/pages/menuManage/index.vue
@@ -2,89 +2,67 @@
 <template>
   <div id="permission-menu-manage">
     <div class="permission-menu-manage-left">
-      <laws-tree
-        ref="permissionManage"
-        treeDivId="permissionManage"
-        :zNodes="zNodes"
-        autoSelect
-        deptSelect
-        showRMenu
-        @treeClick="(treeId, treeNode) => handleClick(treeId, treeNode)"
-        @treeAdd="(treeId, treeNode) => handleAdd(treeId, treeNode)"
-        @treeEdit="(treeId, treeNode) => handleEdit(treeId, treeNode)"
-        @treeRightClick="(treeId, treeNode) => treeRightClick(treeId, treeNode)"
-        @treeRemove="(treeId, treeNode) => handleRemove(treeId, treeNode)"
-      ></laws-tree>
+      <el-tree
+              class="filter-tree"
+              :data="treeData"
+              :props="defaultProps"
+              default-expand-all
+              ref="tree"
+              @node-contextmenu="rightHandleNodeClick"
+              @node-click="handleNodeClick">
+      </el-tree>
     </div>
     <div class="permission-menu-manage-right" v-if="showSarMenuInfoFlag">
-      <div class="permission-content">
-        <el-form ref="sarMenuForm" :model="sarMenuEO" :rules="sarMenuRules" class="label-input-form">
-          <el-row>
-            <el-col :span="6">
-              <span style="color: #fff">1</span>
-            </el-col>
-            <el-col :span="18">
-              <el-form-item label="ID" prop="id" label-width="130px" class="standards-info-item">
-                <el-input v-model="sarMenuEO.id" :disabled="formdisableflag" class="permission-input"></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="6">
-              <span style="color: #fff">1</span>
-            </el-col>
-            <el-col :span="18">
-              <el-form-item label="名称" prop="name" label-width="130px" class="standards-info-item">
-                <el-input v-model="sarMenuEO.name" class="permission-input"></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <Row>
-            <el-col :span="6">
-              <span style="color: #fff">1</span>
-            </el-col>
-            <el-col :span="18">
-              <el-form-item label="父节点ID" prop="pId" label-width="130px" class="standards-info-item">
-                <el-input v-model="sarMenuEO.pId" :disabled="formdisableflag" class="permission-input"></el-input>
-              </el-form-item>
-            </el-col>
-          </Row>
-          <Row>
-            <el-col :span="6">
-              <span style="color: #fff">1</span>
-            </el-col>
-            <el-col :span="18">
-              <el-form-item label="前台页面地址" prop="href" label-width="130px" class="standards-info-item">
-                <el-input v-model="sarMenuEO.href" class="permission-input"></el-input>
-              </el-form-item>
-            </el-col>
-          </Row>
-          <Row>
-            <el-col :span="6">
-              <span style="color: #fff">1</span>
-            </el-col>
-            <el-col :span="18">
-              <el-form-item label="排序号" prop="isShow" label-width="130px" class="standards-info-item">
-                <el-input v-model="sarMenuEO.isShow" maxlength="2" class="permission-input"></el-input>
-              </el-form-item>
-            </el-col>
-          </Row>
-          <Row>
-            <el-col :span="6">
-              <span style="color: #fff">1</span>
-            </el-col>
-            <el-col :span="18">
-              <el-form-item label="后台接口权限" prop="permission" label-width="130px" class="standards-info-item">
-                <el-input v-model="sarMenuEO.permission" class="permission-input"></el-input>
-              </el-form-item>
-            </el-col>
-          </Row>
-        </el-form>
-      </div>
-      <div class="permission-btn" v-if="submitBtnFlag">
-        <el-button type="primary" :loading="isSubmit" @click="saveMenuInfo">提交</el-button>
-      </div>
+      <el-row>
+        <el-col :span="12">
+            <el-button type="primary"
+                       class="common-button-primary add-button"
+                       @click="Add"
+                       size="mini">新增</el-button>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form
+                  ref="sarStandardsInfoForm"
+                  :model="form"
+                  label-width="100px"
+                  class="label-input-form"
+          >
+            <el-form-item label="Id" class="search-item">
+              <el-input v-model="form.id" clearable disabled/>
+            </el-form-item>
+            <el-form-item label="名称" class="search-item">
+              <el-input v-model="form.menuName" clearable disabled/>
+            </el-form-item>
+            <el-form-item label="父节点Id" class="search-item">
+              <el-input v-model="form.parentId" clearable disabled/>
+            </el-form-item>
+          </el-form>
+        </el-col>
+      </el-row>
     </div>
+    <el-dialog
+            title="新增"
+            :visible.sync="modalshowflag"
+            :wrapperClosable="false"
+            :before-close="closeDialog"
+            size="800px">
+      <el-form
+              ref="sarStandardsInfoForm"
+              :model="NewForm"
+              label-width="100px"
+              class="label-input-form"
+      >
+        <el-form-item label="名称" class="search-item">
+          <el-input v-model="NewForm.menuName" clearable/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer">
+        <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="closeDialog">取消</el-button>
+        <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="confirmDialog">提交</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -96,212 +74,59 @@ export default {
   name: 'permission-menu-manage',
   data () {
     return {
-      formdisableflag: true,
-      zNodes: [],
-      sarMenuEO: {
+      modalshowflag: false,
+      showSarMenuInfoFlag: false,
+      treeData: [],
+      defaultProps: {
+        children: 'children',
+        label: 'menuName'
+      },
+      form: {
         id: '',
-        name: '',
-        pId: '',
-        href: '',
-        isShow: '',
-        permission: '',
+        menuName: '',
         parentId: ''
       },
-      sarMenuRules: {
-        name: [
-          { required: true, message: '不能为空', trigger: 'blur' }
-        ]
-        // isShow: [
-        //   { type: 'string', required: true, message: '不能为空', trigger: 'blur' }
-        // ]
-      },
-      isSubmit: false,
-      showSarMenuInfoFlag: false,
-      submitBtnFlag: false,
-      saveClickNodeInfo: '',
-      clickType: '' // 1为新增，2为修改
+      NewForm: {
+        menuName: '',
+      }
     }
   },
   methods: {
-    getTree () {
-      return new Promise((resolve, reject) => {
-        this.$http.get('sys/menu/listAllMenu', {}, {
-          _this: this
-        }, res => {
-          if (res.ok) {
-            let zNodes = []
-            for (let i = 0; i < res.data.length; i++) {
-              let zObj = {}
-              zObj.id = res.data[i].id
-              zObj.pId = res.data[i].parentId
-              zObj.name = res.data[i].name
-              zObj.href = res.data[i].href
-              zObj.isShow = res.data[i].isShow
-              zObj.permission = res.data[i].permission
-              zObj.remarks = res.data[i].remarks
-              zNodes[i] = zObj
-              if (res.data[i].parentIds !== null) {}
-            }
-            this.zNodes = zNodes
-          }
-          resolve()
-        }, e => {
-          reject(e)
-        })
-      })
-    },
-    /**
-     * @description: 树节点点击
-     * @author: chenxiaoxi
-     * @date: 2018-09-25 16:13:25
-     */
-    handleClick (treeId, treeNode) {
-      this.submitBtnFlag = false
-      this.showSarMenuInfoFlag = true
-      this.sarMenuEO = treeNode
-      if (treeNode.href == null || treeNode.href === '' || treeNode.href === 'null') {
-        this.sarMenuEO.href = ''
-      }
-      if (treeNode.permission == null || treeNode.permission === '' || treeNode.permission === 'null') {
-        this.sarMenuEO.permission = ''
-      }
-    },
-    /**
-     * @description: 树节点添加
-     * @author: chenxiaoxi
-     * @date: 2018/12/26 15:39:22
-     */
-    handleAdd (treeId, treeNode) {
-      this.resetForm()
-      this.submitBtnFlag = true
-      this.clickType = '1'
-      this.showSarMenuInfoFlag = true
-      this.sarMenuEO.pId = treeNode.id
-    },
-
-    /**
-     * @description: 树节点删除
-     * @author: chenxiaoxi
-     * @date: 2018-09-25 14:05:25
-     */
-    handleRemove (treeId, treeNode) {
-      if (treeNode.pId == null || treeNode.pId === '') {
-        this.$Message.error('不能删除根级节点')
-      } else {
-        this.$http.get('sys/menu/judgeContentChild', {
-          id: treeNode.id
-        }, {
-          _this: this
-        }, res => {
-          if (res.data != null && res.data.length > 0) {
-            this.$message.error('该节点包含子节点，不能删除')
-          } else {
-            this.sureDeleteMenu(treeNode)
-          }
-        }, e => {})
-      }
-    },
-    sureDeleteMenu (treeNode) {
-      this.$confirm('确认删除该条数据?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-        confirmButtonClass: 'common-button-primary',
-        roundButton: true
-      }).then(() => {
-        if (treeNode.id != null && treeNode.id !== '') {
-          this.$http.put('sys/menu/deleteMenuById', {
-            id: treeNode.id
-          }, {
-            _this: this
-          }, res => {
-            if (res.data != null) {
-              this.getTree()
-              this.showSarMenuInfoFlag = false
-              this.resetForm()
-            }
-          }, e => {
-          })
-        } else {
-          this.$message.warning('没有获取到所选节点id')
+    confirmDialog () {
+      var form = {}
+      form.parentId = this.form.id
+      form.menuName = this.NewForm.menuName
+      this.$http.postData('lawss/sarMenu/add', form, {}, res=> {
+        if (res.ok) {
+          this.getTree()
+          this.modalshowflag = false
+          this.$message.success('成功')
         }
       })
     },
-    /**
-     * @description: 节点编辑
-     * @author: chenxiaoxi
-     * @date: 2018/12/26 15:29:46
-     */
-    handleEdit (treeId, treeNode) {
-      this.submitBtnFlag = true
-      this.clickType = '2'
+    Add () {
+      this.modalshowflag = true
+    },
+    closeDialog () {
+      this.modalshowflag = false
+      this.NewForm.menuName = ''
+    },
+    rightHandleNodeClick (e, data) {},
+    handleNodeClick (data) {
+      this.form.id = data.id
+      this.form.menuName = data.menuName
+      this.form.parentId = data.parentId
       this.showSarMenuInfoFlag = true
-      this.saveClickNodeInfo = treeNode
-      this.sarMenuEO = treeNode
-      if (treeNode.href == null || treeNode.href === '' || treeNode.href === 'null') {
-        this.sarMenuEO.href = ''
-      }
-      if (treeNode.permission == null || treeNode.permission === '' || treeNode.permission === 'null') {
-        this.sarMenuEO.permission = ''
-      }
     },
-    treeRightClick (treeId, treeNode) {
-    },
-    resetForm () {
-      this.sarMenuEO.id = ''
-      this.sarMenuEO.pId = ''
-      this.sarMenuEO.name = ''
-      this.sarMenuEO.href = ''
-      this.sarMenuEO.isShow = ''
-      this.sarMenuEO.permission = ''
-    },
-    saveMenuInfo () {
-      if (this.sarMenuEO.isShow != null && this.sarMenuEO.isShow !== '') {
-        this.isSubmit = true
-        this.$refs['sarMenuForm'].validate((valid) => {
-          if (valid) {
-            this.sarMenuEO.parentId = this.sarMenuEO.pId
-            let menuEO = JSON.parse(JSON.stringify(this.sarMenuEO))
-            if (this.clickType === '1') {
-              this.$http.post('sys/menu/addMenu', menuEO, {
-                _this: this,
-                loading: 'isSubmit'
-              }, res => {
-                if (res.ok) {
-                  this.isSubmit = false
-                  this.submitBtnFlag = false
-                  this.getTree()
-                }
-              }, e => {
-                this.isSubmit = false
-              })
-            } else {
-              this.$http.put('sys/menu/updateMenu', this.sarMenuEO, {
-                _this: this,
-                loading: 'isSubmit'
-              }, res => {
-                this.isSubmit = false
-                this.submitBtnFlag = false
-                this.getTree()
-              }, e => {
-                this.isSubmit = false
-              })
-            }
-          } else {
-            this.isSubmit = false
-            this.$message.error('请检查表单是否填写正确!')
-          }
-        })
-      } else {
-        this.$message.warning('排序号不能为空!')
-      }
-    }
-  },
-  props: {
-    sideClose: {
-      type: Boolean
+    getTree () {
+      this.$http.get('lawss/sarMenu', {}, {}, res=> {
+        if (res.ok) {
+          this.treeData = res.data
+        }
+      })
     }
   },
+  props: {},
   computed: {},
   watch: {},
   mounted () {
@@ -312,177 +137,29 @@ export default {
 
 <style lang="less">
 //@import '~styles/mixins';
-#permission-menu-manage{
+#permission-menu-manage {
   display: flex;
-  //.flex();
   background: #FFF;
-  .permission-menu-manage-left{
+  height: 100%;
+  .permission-menu-manage-left {
     width: 240px;
     height: 100%;
     border-right: 1px solid #DDD;
     position: relative;
     overflow-x: auto;
     padding: 5px;
-    .node_name{
-      display: inline-block;
-      max-width: 200px;
-      //.ellipsis();
-    }
   }
-  .permission-menu-manage-right{
+
+  .permission-menu-manage-right {
     width: calc(~'100% - 240px');
     display: inline-block;
     height: 100%;
     padding: 10px;
     position: relative;
-    .content{
+
+    .content {
       height: calc(~'100% - 150px');
       background: #CCC;
-      .hasNoData{
-        background: #FFF;
-        width: 100%;
-        height: 100%;
-        .no-data-icon{
-          width: 150px;
-        }
-      }
-    }
-    .ivu-table-overflowX{
-      overflow-x: auto;
-    }
-    .pagination{
-      .ivu-divider{
-        margin-bottom: 0;
-      }
-    }
-    .syncInfo{
-      padding-bottom: 0.2rem;
-      //.flex();
-      flex: 1;
-      align-items: center;
-    }
-    .permission-content{
-      padding-top: 30px;
-      .permission-input{
-        width: 300px;
-      }
-    }
-    .permission-btn{
-      text-align: center;
-    }
-  }
-  .ivu-tree-children{
-    .ivu-tree-arrow{
-      margin-right: 5px;
-    }
-  }
-  .content .btn-group{
-    margin-bottom: 0.5rem;
-  }
-  .permission-menu-manage-right-search{
-    .ivu-form-item-label{
-      padding: 0;
-    }
-    .ivu-form-item-content{
-      width: calc(~'100% - 60px');
-      .ivu-select{
-        width: 100%;
-      }
-    }
-    .ivu-form-item{
-      margin: 0;
-    }
-    .ivu-btn{
-      position: relative;
-      top: 1px;
-    }
-  }
-  .ivu-divider-horizontal{
-    margin: 8px 0;
-  }
-  .ivu-table-body{
-    overflow-x: auto;
-  }
-  .ivu-table-tip{
-    width: 100%;
-    height: calc(~'100% - 41px');
-    table{
-      display: block;
-      tbody,tr,td{
-        display: block;
-        width: 100% !important;
-        height: 100%;
-      }
-      td{
-        //.flex();
-        justify-content: center;
-        align-items: center;
-      }
-    }
-  }
-  .hasNoData{
-    background: #FFF;
-    .no-data-icon{
-      width: 85px;
-    }
-  }
-  .ivu-table-fixed,
-  .ivu-table-fixed-right{
-    height: 100%;
-    .ivu-table-fixed-body{
-      height: calc(~'100% - 41px');
-    }
-  }
-  .ivu-select-item{
-    max-width: 200px;
-    //.ellipsis();
-  }
-  .demo-drawer-footer{
-    width: 100%;
-    position: absolute;
-    bottom: 0;
-    left: 0;
-    border-top: 1px solid #e8e8e8;
-    padding: 10px 16px;
-    text-align: right;
-    background: #fff;
-  }
-  .btn-show{
-    display: inline-block !important;
-  }
-  .btn-hide{
-    display: none !important;
-  }
-  .ivu-tag{
-    cursor: default;
-  }
-}
-.role-setting-form{
-  .ivu-modal-body{
-    overflow-y: inherit;
-  }
-}
-.demo-drawer-profile{
-  font-size: 14px;
-}
-.demo-drawer-profile .ivu-col{
-  margin-bottom: 12px;
-}
-.user-info-text{
-  color: #A59D9D;
-}
-.mechanism-tree-modal{
-  .ivu-modal{
-    width: 350px !important;
-    .form-content{
-      width: 300px;
-      margin: 0 auto;
-      .ivu-form-item{
-        //.flex();
-        .ivu-form-item-content{
-          flex: 1;
-        }
-      }
     }
   }
 }
diff --git a/src/pages/config/pages/postManage/index.vue b/src/pages/config/pages/postManage/index.vue
index f18f716da..064f1bcc6 100644
--- a/src/pages/config/pages/postManage/index.vue
+++ b/src/pages/config/pages/postManage/index.vue
@@ -88,10 +88,20 @@
                     v-if="modalRole"
                     :props="props"
                     :data="roleList"
-                    show-checkbox
-                    @check="handleCheckChange">
+                    check-strictly
+                    show-checkbox>
             </el-tree>
-            <el-button @click="add"></el-button>
+            <div id="roleFormButton" class="demo-drawer-footer">
+                <el-button
+                        size="mini"
+                        class="common-button-primary"
+                        icon="el-icon-check"
+                        type="primary"
+                        @click="RoleSubmit"
+                        :loading="submitLoading"
+                >确定</el-button>
+                <el-button size="mini" class="common-button-default" icon="el-icon-close" @click="resetFormRole">取消</el-button>
+            </div>
         </el-drawer>
     </div>
 </template>
@@ -101,6 +111,7 @@
         name: 'PostManage',
         data () {
             return {
+                submitLoading: false,
                 selectList: [],
                 data: [],
                 Loading: false,
@@ -122,14 +133,24 @@
             }
         },
         methods: {
-            add () {
-                console.log(this.$refs.tree.getCheckedKeys().concat(this.$refs.tree.getHalfCheckedKeys()));
+            RoleSubmit () { // 配置角色提交
+                this.submitLoading = true
+                this.$http.postData('sarPosition/position/role', {
+                    positionId: this.selectList[0].id,
+                    roleIds: this.$refs.tree.getCheckedKeys().concat(this.$refs.tree.getHalfCheckedKeys())
+                }, {}, res=> {
+                    if (res.ok) {
+                        this.$message.success('配置成功')
+                        this.modalRole = false
+                        this.getData()
+                    } else {
+                        this.$message.warning(res.message)
+                    }
+                    this.submitLoading = false
+                })
             },
-            handleCheckChange (checkedNodes, checkedKeys) {
-                var list = []
-                for (var a = 0; a < checkedKeys.checkedNodes.length; a++) {
-                    list.push(checkedKeys.checkedNodes[a].id)
-                }
+            resetFormRole () { // 配置角色关闭事件
+                this.modalRole = false
             },
             getRole () {
                 this.$http.get('sarRole/role', {}, {}, res=> {
@@ -140,10 +161,12 @@
                 this.selectList = val
             },
             addRole () { // 点击配置角色按钮
-                if (this.selectList.length > 0) {
+                if (this.selectList.length === 1) {
                     this.modalRole = true
-                } else {
+                } else if (this.selectList.length === 0) {
                     this.$message.warning('请选择要配置角色的岗位')
+                } else {
+                    this.$message.warning('请选择一条岗位')
                 }
             },
             getData () { // 获取岗位数据
@@ -161,8 +184,6 @@
                 this.$refs['sarStandardsInfoForm'].resetFields();
                 this.modalshowflag = false
             },
-            resetFormRole () { // 配置角色关闭事件
-            },
             submit () { // 新增角色确认
                 this.$refs['sarStandardsInfoForm'].validate((valid) => {
                     if (valid) {
@@ -179,7 +200,7 @@
                                 this.modalshowflag = false
                                 this.getData()
                             } else {
-                                this.$message.warning('新增失败')
+                                this.$message.warning(res.message)
                             }
                         })
                     } else {
@@ -204,5 +225,8 @@
         .content {
             height: calc(~'100% - 53px')
         }
+        .filter-tree {
+            height: calc(~'100% - 50px')
+        }
     }
 </style>
diff --git a/src/pages/config/pages/roleManage/index.vue b/src/pages/config/pages/roleManage/index.vue
index add59698b..d7fecfe7c 100644
--- a/src/pages/config/pages/roleManage/index.vue
+++ b/src/pages/config/pages/roleManage/index.vue
@@ -1,1322 +1,187 @@
 <!-- 配置管理 - 角色管理 -->
 <template>
-  <div class="role-manage v-class" :class="{ 'tree-close': sideClose }">
-    <div class="tree-content" :class="{ 'tree-closed': sideClose }">
-      <div class="tree">
-        <div class="search-area" style="border-top: 3px solid #f4f4f4;">
-          <div class="left">
-            <el-form inline class="label-input-form" >
-              <el-form-item label="角色分组" class="search-item">
-                <el-select
-                  placeholder="请选择系统角色"
-                  style="margin-top: 10px; width: 100%;"
-                  v-model="roleHierarchy"
-                  filterable
-                  @change="roleHierarchyChange"
-                  clearable
-                >
-                  <el-option
-                    v-for="item in roleHierarchyOption"
-                    :key="item.id"
-                    :value="item.id"
-                    :label="item.name"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
-            </el-form>
-          </div>
-          <el-button
-            type="primary"
-            class="common-button-primary"
-            round
-            style="position: absolute; top: 15px; right: 90px;"
-            @click="getAllRole"
-          >{{ !isAll ? '全选' : '取消'}}</el-button>
-          <el-button class="common-button-default delete-button"
-                     round
-                     v-btn-permission="'AVWDGCV3PA'"
-                     style="position: absolute; top: 15px; right: 5px;"
-                     @click="roleBatchDeleteMore()">批量删除</el-button>
+    <div class="role-manage v-class" :class="{ 'tree-close': sideClose }">
+        <div class="tree-content" :class="{ 'tree-closed': sideClose }">
+            <div class="tree">
+                <el-input
+                        class="filter-tree-input"
+                        placeholder="输入关键字进行过滤"
+                        v-model="filterText">
+                </el-input>
+                <el-tree
+                        class="filter-tree"
+                        :data="treeData"
+                        :props="defaultProps"
+                        default-expand-all
+                        :filter-node-method="filterNode"
+                        ref="tree"
+                        @node-click="handleNodeClick">
+                </el-tree>
+            </div>
+            <div class="tree-collapse" @click="treeCollapse" :class="{ 'tree-close': sideClose }">
+                <!--切换折叠样式-->
+                <i class="el-icon-arrow-left" v-if="sideClose === false"></i>
+                <i class="el-icon-arrow-right" v-if="sideClose === true"></i>
+            </div>
         </div>
-        <!--    角色组    -->
-<!--        <el-form :model="roleSelect">-->
-<!--          <el-form-item prop="role" style="margin-bottom: 0">-->
-        <el-select v-model="roleSelect.role" placeholder="请选择自定义角色" class="secondSelect" @change="roleChange" clearable>
-          <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
-            <span>{{ item.label }}</span>
-            <span @click.stop="del(item, $event)" class="btnSelect"><i class="el-icon-circle-close"></i></span>
-          </el-option>
-        </el-select>
-<!--          </el-form-item>-->
-<!--        </el-form>-->
-        <laws-tree
-          ref="roleTree"
-          :zNodes="zNodes"
-          treeDivId="roleTree"
-          deptSelect
-          showRMenu
-          role
-          expandFirst
-          :chkboxType="{ 'Y': '', 'N': '' }"
-          :check-enable="true"
-          :loading="loading"
-          :checkIdList="checkIdList"
-          :add-id="'4C796W933W'"
-          :edit-id="'ZRVPAQZ85G'"
-          :remove-id="'AVWDGCV3PA'"
-          @treeAdd="clickDropMenu"
-          @treeEdit="roleEdit"
-          @treeClick="handleClick"
-          @treeRemove="roleBatchDelete"
-          @treeRightClick="treeRightClick"
-          @treeOnCheck="handleTreeOnCheck"
-        ></laws-tree>
-      </div>
-      <div class="tree-collapse" @click="treeCollapse" :class="{ 'tree-close': sideClose }">
-        <!--切换折叠样式-->
-        <i class="el-icon-arrow-left" v-if="sideClose === false"></i>
-        <i class="el-icon-arrow-right" v-if="sideClose === true"></i>
-      </div>
+        <div class="tree-right">
+            <div class="action-bar">
+                <el-button type="primary"
+                           class="common-button-primary add-button"
+                           @click="roleAdd"
+                           size="mini">配置角色资源</el-button>
+            </div>
+            <div class="content">
+                <el-table
+                        ref="multipleTable"
+                        :data="data"
+                        tooltip-effect="dark"
+                        border
+                        style="width: 100%; flex: auto;"
+                        class="drag-table"
+                        height="100%"
+                        :header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
+         fontWeight: 'bold', height: '48px'}">
+                    <el-table-column
+                            prop="name"
+                            label="角色名称"
+                            width="170px">
+                    </el-table-column>
+                    <el-table-column
+                            prop="remarks"
+                            label="角色描述">
+                    </el-table-column>
+                    <el-table-column
+                            prop="phone"
+                            label="上级角色"
+                            width="170px">
+                    </el-table-column>
+                    <el-table-column
+                            prop="useFlag"
+                            label="角色状态"
+                            width="170px">
+                    </el-table-column>
+                    <el-table-column
+                            prop="operator"
+                            label="操作人"
+                            width="140px">
+                    </el-table-column>
+                    <el-table-column
+                            prop="operateTime.data"
+                            width="160px"
+                            label="操作时间">
+                    </el-table-column>
+                </el-table>
+            </div>
+            <loading :loading="Loading">加载中...</loading>
+        </div>
+        <loading style="z-index: 2099;" :loading="treeLoading">导入中...</loading>
+        <el-dialog
+                title="系统菜单"
+                :visible.sync="modalshowflag"
+                :wrapperClosable="false"
+                size="800px">
+            <el-tree
+                    node-key="id"
+                    class="filter-tree"
+                    :data="treeData2"
+                    :props="defaultProps2"
+                    :default-checked-keys="nodeList"
+                    default-expand-all
+                    check-strictly
+                    show-checkbox
+                    ref="tree">
+            </el-tree>
+        </el-dialog>
     </div>
-    <div class="tree-right">
-      <div class="action-bar">
-        <el-button class="common-button-default" @click="roleConfigure" v-btn-permission="'SBY9NR5AZ8Q'">配置角色资源</el-button>
-        <el-button class="common-button-default" @click="roleJurisdiction" v-btn-permission="'NMDGHE78SD'">配置法规库权限</el-button>
-        <el-button class="common-button-default" @click="addGroup" v-btn-permission="'4C796W933W'">新增分组</el-button>
-      </div>
-      <div class="content">
-        <loading :loading="roleDataLoading">{{$t('m.dataProcessing')}}</loading>
-        <el-table
-          border
-          ref="selection"
-          :data="roleList"
-          tooltip-effect="dark"
-          style="width: 100%;"
-          height="100%"
-          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-         fontWeight: 'bold', height: '48px'}"
-        >
-<!--          <el-table-column-->
-<!--            type="selection"-->
-<!--            width="55"-->
-<!--            align="center">-->
-<!--          </el-table-column>-->
-          <el-table-column
-            prop="name"
-            :label="$t('m.roleName')"
-            show-overflow-tooltip>
-          </el-table-column>
-          <el-table-column
-            prop="remarks"
-            :label="$t('m.roleDescription')"
-            show-overflow-tooltip>
-          </el-table-column>
-          <el-table-column
-            prop="useFlag"
-            :label="$t('m.state')">
-            <template slot-scope="scope">
-              <div v-if="scope.row.useFlag === 0">{{$t('m.enable')}}</div>
-              <div v-else>{{$t('m.disable')}}</div>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="roleType"
-            :label="$t('m.type')">
-            <template slot-scope="scope">
-              <div v-if="scope.row.roleType === 'LOCAL_USER'">{{$t('m.researchInstituteUsers')}}</div>
-              <div v-else-if="scope.row.roleType === 'OTHER_USER'">{{$t('m.nonGraduateUsers')}}</div>
-              <div v-else-if="scope.row.roleType === 'CONADMIN'">{{$t('m.configurationAdministrator')}}</div>
-              <div v-else>{{$t('m.notYet')}}</div>
-            </template>
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            prop="pName"
-            label="上级角色名称"
-            width="110px"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            prop="roleHierarchyName"
-            label="角色分组">
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            prop="dyOrgName"
-            label="部门">
-          </el-table-column>
-          <el-table-column
-            prop="operUserName"
-            :label="$t('m.operator')">
-          </el-table-column>
-          <el-table-column
-            prop="modifyTime"
-            :label="$t('m.operationTime')"
-            sortable
-            width="150">
-            <template slot-scope="scope">
-              <div>{{ scope.row.modifyTime.substring(0, 10) }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column label="操作" align="center" width="50" fixed="right">
-            <template slot-scope="scope">
-              <div @click.stop style="display: inline-block">
-                <el-dropdown trigger="click" @command="handleCommand">
-                  <i class="iconfont">&#xe61e;</i>
-                  <el-dropdown-menu slot="dropdown">
-                    <el-dropdown-item :command="[scope.row, '查看']">查看</el-dropdown-item>
-<!--                    <el-dropdown-item :command="[scope.row, '编辑']">编辑</el-dropdown-item>-->
-<!--                    <el-dropdown-item :command="[scope.row, '删除']">删除</el-dropdown-item>-->
-                  </el-dropdown-menu>
-                </el-dropdown>
-              </div>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-      <pagination :total="total" @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
-    </div>
-    <el-dialog
-      :visible.sync="sysMenu"
-      :title="$t('m.systemMenu')"
-      @close="modalCancel"
-      destroy-on-close
-    >
-      <div class="sysMenuTreeDiv" >
-        <laws-tree
-          v-if="sysMenu"
-          :zNodes="sysMenuTree"
-          :loadingTips="$t('m.gettingSystemMenu')"
-          treeDivId="menuTree"
-          :editable="false"
-          checkEnable
-          initNotCheck
-          :chkboxType="menuTreeType2"
-          ref="menuTree"></laws-tree>
-      </div>
-      <div slot="footer">
-        <el-button class="common-button-default" icon="el-icon-close" @click="closeSysMenu">{{$t('m.cancel')}}</el-button>
-        <el-button
-          round
-          class="common-button-primary"
-          icon="el-icon-check"
-          type="primary"
-          @click="saveRoleMenu"
-          :loading="submitLoading"
-        >{{$t('m.sure')}}</el-button>
-      </div>
-    </el-dialog>
-    <el-dialog
-      :visible.sync="jurisdictionModal"
-      title="配置法规库权限"
-      @close="jurisdictionModalClose"
-    >
-      <el-tabs v-model="jurisdictionTabs" @tab-click="jurisdictionTab">
-        <el-tab-pane label="法规库权限" name="jurisdictionOne">
-          <div class="sysMenuTreeDiv" >
-            <laws-tree
-              v-if="jurisdictionModal"
-              :zNodes="jurisdictionTree"
-              :loadingTips="$t('m.gettingMenu')"
-              treeDivId="jurisdictionTree"
-              :editable="false"
-              checkEnable
-              initNotCheck
-              :check-id-list="checkIdJurisdictionTreeList"
-              ref="roleTree"></laws-tree>
-          </div>
-        </el-tab-pane>
-<!--        <el-tab-pane label="资料中心" name="jurisdictionTwo">-->
-<!--          <el-table-->
-<!--            border-->
-<!--            :data="jurisdictionData"-->
-<!--            :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',-->
-<!--         fontWeight: 'bold', height: '48px'}"-->
-<!--          >-->
-<!--            <el-table-column-->
-<!--              type="selection"-->
-<!--              width="55"-->
-<!--              align="center">-->
-<!--            </el-table-column>-->
-<!--            <el-table-column-->
-<!--              prop="moduleName"-->
-<!--              label="参数"-->
-<!--              align="center">-->
-<!--            </el-table-column>-->
-<!--          </el-table>-->
-<!--        </el-tab-pane>-->
-      </el-tabs>
-      <loading :loading="jurisdictionLoading">{{$t('m.getting')}}……</loading>
-      <div slot="footer">
-        <el-button class="common-button-default" icon="el-icon-close" @click="jurisdictionModalClose">{{$t('m.cancel')}}</el-button>
-        <el-button
-          round
-          class="common-button-primary"
-          icon="el-icon-check"
-          type="primary"
-          @click="jurisdictionModalOk"
-          :loading="submitLoading"
-        >{{$t('m.sure')}}</el-button>
-      </div>
-    </el-dialog>
-    <!-- 新建抽屉 -->
-    <el-drawer
-      :title="roleTitle"
-      :wrapperClosable="false"
-      :visible.sync="showRoleInfoModal"
-      size="800px"
-      destroy-on-close
-      @close="closeDrawer">
-      <div class="demo-drawer-content">
-        <el-form
-          v-if="showRoleInfoModal"
-          ref="roleVO"
-          :model="roleVO"
-          :rules="roleVOFormRules"
-          class="label-input-form"
-          label-width="150px"
-        >
-          <input v-model="roleVO.id" v-show="false">
-          <el-form-item :label="$t('m.roleName')" prop="name" class="add-form-item">
-            <el-input v-model.trim="roleVO.name" :placeholder="$t('m.pleaseEnterTheRoleName')" clearable/>
-          </el-form-item>
-          <el-form-item :label="$t('m.roleDescription')" prop="remarks"  class="add-form-item">
-            <el-input v-model.trim="roleVO.remarks" :placeholder="$t('m.pleaseEnterTheRoleDescription')" clearable />
-          </el-form-item>
-          <el-form-item :label="$t('m.roleType')" prop="roleType" class="add-form-item">
-            <el-select v-model="roleVO.roleType" filterable :placeholder="$t('m.pleaseSelectRoleType')">
-              <el-option
-                v-for="item in roleTypeOptions"
-                :key="item.value"
-                :value="item.value"
-                :label="item.label"
-                :disabled="item.disabled"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item :label="$t('m.roleStatus')" prop="useFlag" class="add-form-item">
-            <el-select v-model="roleVO.useFlag" filterable :placeholder="$t('m.pleaseSelectRoleStatus')">
-              <el-option
-                value="0"
-                :label="$t('m.enable')"
-              ></el-option>
-              <el-option
-                value="1"
-                :label="$t('m.disable')"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="角色分组" prop="roleHierarchy" class="add-form-item">
-            <el-select
-              v-model="roleVO.roleHierarchy"
-              filterable
-              clearable
-            >
-              <el-option
-                v-for="item in roleHierarchyOption"
-                :key="item.id"
-                :value="item.id"
-                :label="item.name"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-          <el-row>
-            <custom-org
-              key="dyOrgId"
-              :config="{
-                attrName: '部门',
-                attrField: 'dyOrgId',
-                attrType: 'SEL_OPTION',
-                selVal: 'ORGLIST',
-                valueName: roleVO.dyOrgName
-              }"
-              :zNodes="orgData"
-              v-model="roleVO.dyOrgId"
-              @on-checked="(checkedName) => roleVO.dyOrgName = checkedName"
-            ></custom-org>
-          </el-row>
-        </el-form>
-      </div>
-      <div id="roleFormButton" class="demo-drawer-footer">
-        <el-button
-          round
-          class="common-button-primary"
-          icon="el-icon-check"
-          type="primary"
-          @click="saveRoleInfo('roleVO')"
-          :loading="submitLoading"
-        >{{$t('m.submit')}}</el-button>
-        <el-button class="common-button-default" icon="el-icon-close" @click="closeDrawer">{{$t('m.cancel')}}</el-button>
-      </div>
-    </el-drawer>
-    <!-- 查看抽屉-->
-    <el-drawer
-      :show-close="true"
-      :wrapperClosable="false"
-      size="800px"
-      :title="$t('m.seeInformation')"
-      :visible.sync="roleInfoModel"
-    >
-      <div class="see-drawer-content">
-        <div class="see-drawer-div">
-          <label class="see-drawer-name">{{$t('m.roleName')}}</label>
-          <span class="see-drawer-val">{{roleVO.name}}</span>
-        </div>
-        <div class="see-drawer-div">
-          <label class="see-drawer-name">{{$t('m.roleDescription')}}</label>
-          <el-tooltip v-if="roleVO.remarks" effect="dark" :content="roleVO.remarks" placement="top">
-            <div slot="content">{{roleVO.remarks}}</div>
-            <div style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;" class="see-drawer-val">{{roleVO.remarks}}</div>
-          </el-tooltip>
-          <span v-else class="see-drawer-val">{{roleVO.remarks}}</span>
-        </div>
-        <div class="see-drawer-div">
-          <label class="see-drawer-name">{{$t('m.roleType')}}</label>
-          <span class="see-drawer-val" v-if="roleVO.roleType ===  'LOCAL_USER'">{{$t('m.researchInstituteUsers')}}</span>
-          <span class="see-drawer-val" v-if="roleVO.roleType ===  'OTHER_USER'">{{$t('m.nonGraduateUsers')}}</span>
-          <span class="see-drawer-val" v-if="roleVO.roleType ===  'CONADMIN'">{{$t('m.configurationAdministrator')}}</span>
-          <span class="see-drawer-val" v-if="roleVO.roleType ===  'null' || roleVO.roleType ===  '暂无' || roleVO.roleType ===  ''">{{$t('m.notYet')}}</span>
-        </div>
-        <div class="see-drawer-div">
-          <label class="see-drawer-name">{{$t('m.roleStatus')}}</label>
-          <span class="see-drawer-val">{{roleVO.useFlag === '0' ? $t('m.enable'):$t('m.disable')}}</span>
-        </div>
-      </div>
-    </el-drawer>
-    <!--  角色分组  -->
-    <el-dialog
-            :visible.sync="roleGroupDialog"
-            title="新增分组"
-            width="30%"
-            @close="roleGroupDialogClose"
-            destroy-on-close
-    >
-      <el-form ref="GroupForm" :model="GroupForm" label-width="80px" :rules="rulesGroup" >
-        <el-form-item label="分组名称" prop="name">
-          <el-input v-model="GroupForm.name"></el-input>
-        </el-form-item>
-      </el-form>
-      <loading :loading="roleGroupDialogLoading">{{$t('m.getting')}}……</loading>
-      <div slot="footer">
-        <el-button class="common-button-default" icon="el-icon-close" @click="roleGroupDialogClose">{{$t('m.cancel')}}</el-button>
-        <el-button
-                round
-                class="common-button-primary"
-                icon="el-icon-check"
-                type="primary"
-                @click="roleGroupDialogOk"
-                :loading="roleGroupDialogLoading"
-        >{{$t('m.sure')}}</el-button>
-      </div>
-    </el-dialog>
-  </div>
 </template>
 
 <script>
-import CustomOrg from '@/components/CustomFormComponents/OrgTree'
 export default {
   name: 'role-manage',
-  components: {
-    CustomOrg
-  },
   data () {
     return {
-      roleGroupDialog: false,
-      roleGroupDialogLoading: false,
-      GroupForm: {
-        name: ''
-    },
-      rulesGroup:{
-        name: [
-          { required: true, message: '请输入分组名称', trigger: 'change' }
-        ]
-      },
-      roleSelect: {
-        role:''
-      },
-      options: [],
-      loading: false,
-      submitLoading: false,
-      jurisdictionTabs: 'jurisdictionOne',
-      jurisdictionLoading: false,
-      jurisdictionName: '',
-      jurisdictionRow: '',
-      jurisdictionModal: false,
-      roleDataLoading: false,
-      roleInfoModel: false,
-      total: 0,
-      tableHeight: 600,
-      roleTitle: '',
-      selectNum: '',
-      sysMenu: false,
-      sysMenuTree: [],
-      menuTreeType: {'Y': 'ps', 'N': 'p'},
-      menuTreeType2: {'Y': 'ps', 'N': 'ps'},
-      jurisdictionTree: [],
-      selectRoleId: '',
-      // roleSearch: {
-      //   roleName: '',
-      //   type: '',
-      //   state: '',
-      //   typeOptions: [{label: '全部', value: '-1'}, {label: '启用', value: '0'}, {label: '禁用', value: '1'}
-      //   ],
-      //   typeOptions1: [ {label: '正常', value: '0'}, { label: '禁用', value: '1' } ],
-      //   roleTypeOptions: [{ label: '暂无', value: 'null' }, {label: '研究院用户', value: 'LOCAL_USER'}, {label: '非研究院用户', value: 'OTHER_USER'}, {label: '配置管理员', value: 'CONADMIN'}]
-      //   // roleTypeOptions: [{ label: '暂无', value: 'null' }, {label: '广汽研究院用户', value: 'LOCAL_USER'}, {label: '非广汽研究院用户', value: 'OTHER_USER'}, {label: '配置管理员', value: 'CONADMIN'}]
-      // },
-      pageNo: 1,
-      pageSize: 10,
-      userList: [],
-      showRoleInfoModal: false,
-      roleVO: {
-        pId: '',
-        id: '',
-        name: '',
-        remarks: '',
-        useFlag: '',
-        roleType: '',
-        roleHierarchy: '', // 角色分组
-        dyOrgId: '',
-        dyOrgName: ''
-      },
-      roleVODefault: {
-        pId: '',
-        id: '',
-        name: '',
-        remarks: '',
-        useFlag: '',
-        roleType: '',
-        roleHierarchy: '', // 角色分组
-        dyOrgId: '',
-        dyOrgName: ''
-      },
-      roleVOFormRules: {
-        name: [
-          {required: true, message: '角色名称不能为空', trigger: 'blur'},
-          {type: 'string', max: 100, message: '最多输入100位', trigger: 'blur'}
-        ],
-        roleType: [
-          {required: true, message: '角色类型不能为空', trigger: 'change'}
-        ],
-        useFlag: [
-          {required: true, message: '角色状态不能为空', trigger: 'change'}
-        ],
-        remarks: [
-          {type: 'string', max: 100, message: '最多输入100位', trigger: 'blur'}
-        ],
-        roleHierarchy: [
-          {required: true, message: '角色分组不能为空', trigger: 'change'}
-        ]
-      },
-      roleTypeOptions: [
-        { label: '暂无', value: 'null' },
-        {label: '研究院用户', value: 'LOCAL_USER'},
-        {label: '非研究院用户', value: 'OTHER_USER'},
-        {label: '配置管理员', value: 'CONADMIN'},
-        {label: 'IDM同步', value: 'IDM_ROLE', disabled: true}
-      ],
-      // roleTypeOptions: [{ label: '暂无', value: 'null' }, {label: '广汽研究院用户', value: 'LOCAL_USER'}, {label: '非广汽研究院用户', value: 'OTHER_USER'}, {label: '配置管理员', value: 'CONADMIN'}],
-      roleList: [],
-      jurisdictionColumns: [
-        {
-          type: 'selection',
-          width: 60,
-          align: 'center'
+        sideClose: false, // 边栏收展状态
+        filterText: '',
+        treeData: [],
+        defaultProps: {
+            children: 'children',
+            label: 'name'
         },
-        {
-          title: '参数',
-          key: 'moduleName',
-          align: 'center'
-        }
-      ],
-      jurisdictionData: [],
-      parentNode: [],
-      zNodes: [],
-      sideClose: false, // 边栏收展状态
-      roleHierarchy: '',
-      roleHierarchyOption: [],
-      roleVoId: '',
-      isTree: false,
-      orgData: [],
-      checkIdList: [],
-      isAll: false,
-      checkIdJurisdictionTreeList: [],
-      selectSecond: ''
+        Loading: false,
+        treeLoading: false,
+        id: '',
+        data: [],
+        modalshowflag: false,
+        treeData2: [],
+        defaultProps2: {
+            children: 'children',
+            label: 'menuName'
+        },
+        nodeList: []
     }
   },
   methods: {
-    addGroup () {
-      if (this.selectNum.length > 0) {
-        this.roleGroupDialog = true
-      } else {
-        this.$message({
-          type: 'warning',
-          message: '请选择角色'
-        })
-      }
-       this.GroupForm.name = ''
-    },
-    roleGroupDialogClose () {
-      this.roleGroupDialog = false
-      this.$refs['GroupForm'].clearValidate()
-      // 取消树的勾选状态
-      // var ztree = $.fn.zTree.getZTreeObj("roleTree");
-      // ztree.checkAllNodes(false);
-    },
-    roleGroupDialogOk () {
-      this.$refs['GroupForm'].validate((valid) => {
-          if (valid) {
-            let selectIds = this.selectNum.toString()
-            this.$http.postData('sys/roleGroup/insert',
-                    {
-                      groupId: this.GroupForm.name,
-                      groupName: this.GroupForm.name,
-                      roleId: selectIds
-                    },
-                    {
-                      _this: this,
-                      loading: 'roleGroupDialogLoading'
-                    },
-                    res => {
+      getTree2 () {
+          this.$http.get('lawss/sarMenu', {}, {}, res=> {
               if (res.ok) {
-                this.roleGroupDialogLoading = false
-                this.roleGroupDialog = false
-                this.getRoleSelect()
+                  this.treeData2 = res.data
               }
-              }, e => {})
-          } else {
-
-          }
-        });
-    },
-    // 角色组-数组
-    getRoleSelect () {
-      this.$http.get('sys/roleGroup/getGroup',
-          {}, {_this: this},
-          res => {
-            if (res.ok) {
-              this.options = []
-              res.data.map( item => {
-                let optionsGroup  = {}
-                optionsGroup.value = item.groupId
-                optionsGroup.label = item.groupName
-                this.options.push(optionsGroup)
-              })
-            }
-        }, e => {})
-    },
-    roleChange (val) {
-      this.isTree = true
-      return new Promise((resolve, reject) => {
-        this.loading = true
-        this.$http.get('sys/role/getRoleByOrgId', {
-          roleHierarchy: this.roleHierarchy,
-          type: 0,
-          groupId:val
-        }, {
-          _this: this
-        }, res => {
-          this.loading = false
-          if (res.ok) {
-            const treeNodeList = []
-            for (let i = 0; i < res.data.length; i++) {
-              let obj = {}
-              for (let key in res.data[i]) {
-                if (key === 'usid') {
-                  obj.id = res.data[i][key]
-                } else if (key === 'orgId') {
-                  obj.pId = res.data[i][key]
-                } else {
-                  obj[key] = res.data[i][key]
-                }
+          })
+      },
+      roleAdd () { // 配置角色资源
+          this.$http.get('sarRole/role/menu', {
+              roleId: this.id
+          }, {}, res=> {
+              if (res.ok) {
+                  this.nodeList = res.data
+                  this.modalshowflag = true
               }
-              treeNodeList.push(obj)
-            }
-            // 获取组织与人员完毕，开始组装树结构
-            let zNodes = []
-            for (let i = 0; i < treeNodeList.length; i++) {
-              let zObj = {}
-              zObj.id = treeNodeList[i].id
-              zObj.pId = treeNodeList[i].pId || '000000'
-              zObj.name = treeNodeList[i].name
-              zObj.icon = 'static/images/user.png'
-              zObj.iconSkin = 'org-user'
-              zObj.shotName = treeNodeList[i].shotName
-              zObj.remarks = treeNodeList[i].remarks
-              zObj.dyOrgName = treeNodeList[i].dyOrgName
-              zObj.dyOrgId = treeNodeList[i].dyOrgId
-              zObj.roleType = treeNodeList[i].roleType
-              zNodes[i] = zObj
-            }
-            this.zNodes = zNodes
-          }
-          resolve()
-        }, e => {
-          this.loading = false
-          reject(e)
-        })
-      })
-    },
-    del (item) {
-      this.$confirm('确认删除该条数据？', '确认删除', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        confirmButtonClass: 'common-button-primary',
-        roundButton: true,
-        type: 'warning'
-      }).then(() => {
-        this.$http.get('sys/roleGroup/delete',
-          { groupId:item.value }, {_this: this},
-          res => {
-            if (res.ok) {
-              this.$message({
-                message: '删除成功',
-                type: 'success'
-              })
-              this.getRoleSelect()
-            }
-          }, e => {})
-      }).catch(() => {})
-    },
-    // 更多
-    handleCommand (command) {
-      switch (command[1]) {
-        case '查看':
-          this.showRole(command[0])
-          break
-        case '编辑':
-          this.roleEdit(command[0])
-          break
-        case '删除':
-          this.roleDel(command[0])
-          break
-      }
-    },
-    // 角色配置对话框关闭时清空查询条件
-    modalCancel (flag) {
-      if (!flag) {
-        this.$refs.menuTree.clearSearch()
-      }
-    },
-    // 查询、加载表格
-    roleSelectPage () {
-      this.$http.get('sys/role/page',
-        {
-          pageNo: this.pageNo,
-          pageSize: this.$store.getters.userInfo.configContent,
-          id: this.roleVoId
-        },
-        {
-          _this: this,
-          loading: 'roleDataLoading'
-        },
-        res => {
-          this.roleList = res.data.list
-          this.total = res.data.count
-        }, e => {})
-      // this.$refs.selections.selectAll(false)
-    },
-    // 对话框
-    instance (type, content) {
-      const title = '请选择'
-      switch (type) {
-        case 'info':
-          this.$message.info({
-            title: title,
-            message: content
           })
-          break
-        case 'success':
-          this.$message.success({
-            title: title,
-            message: content
-          })
-          break
-        case 'warning':
-          this.$message.warning({
-            title: title,
-            message: content
-          })
-          break
-        case 'error':
-          this.$message.error({
-            title: title,
-            message: content
-          })
-          break
-      }
-    },
-    // 关闭模态框
-    closeDrawer () {
-      this.$refs['roleVO'].resetFields()
-      this.showRoleInfoModal = false
-    },
-    // 添加角色信息
-    clickDropMenu (treeId, treeNode) {
-      this.roleVO.id = ''
-      this.roleTitle = '新增信息'
-      this.showRoleInfoModal = true
-      this.roleVO = {...this.roleVODefault}
-      this.$nextTick(() => {
-        this.$refs['roleVO'].clearValidate()
-      })
-    },
-    // 编辑角色信息
-    roleEdit (treeId, treeNode) {
-      if (treeNode.roleType === 'IDM_ROLE') {
-        return this.$message.warning('角色状态为IDM同步的数据不可编辑')
-      }
-      this.$http.get('sys/role/page', {
-        pageNo: this.pageNo,
-        pageSize: this.$store.getters.userInfo.configContent,
-        id: treeNode.id
-      }, {
-        _this: this
-      }, res => {
-        if (res.ok) {
-          let roleInfo = JSON.parse(JSON.stringify(res.data.list[0]))
-          roleInfo.useFlag = roleInfo.useFlag.toString()
-          this.roleVO = roleInfo
-          this.roleTitle = '编辑信息'
-          this.showRoleInfoModal = true
-        }
-      }, e => {})
-    },
-    // 批量删除
-    roleBatchDeleteMore() {
-      if (this.selectNum.length === 0) {
-        return this.$message.warning('请选择至少一个节点')
-      } else {
-        this.$confirm('确认删除当前节点?', '提示', {
-          confirmButtonText: '确定',
-          confirmButtonClass: 'common-button-primary',
-          cancelButtonText: '取消',
-          type: 'warning',
-          roundButton: true
-        }).then(() => {
-          const ids = []
-          this.selectNum.map((item) => {
-            ids.push(item)
-          })
-          this.$http.delete('sys/role/deleteList', {
-                ids: ids.toString()
-              },
-              {
-                _this: this
-              }, res => {
-                if (res.ok) {
-                  this.isTree = false
-                  this.getUserByRole()
-                }
-              })
-        }).catch(() => {
-        })
-      }
-    },
-    roleBatchDelete (treeId, treeNode) {
-      if (treeNode.roleType === 'IDM_ROLE') {
-        return this.$message.warning('角色状态为IDM同步的数据不可删除')
-      }
-      this.$confirm('确认删除当前节点?', '提示', {
-        confirmButtonText: '确定',
-        confirmButtonClass: 'common-button-primary',
-        cancelButtonText: '取消',
-        type: 'warning',
-        roundButton: true
-      }).then(() => {
-        this.$http.get('sys/role/isDelete', {
-          id: treeNode.id
-        }, {}, res => {
-          if (res.ok) {
-            if (res.data > 0) {
-              this.$message.warning('当前节点下有子节点，不可删除')
-            } else {
-              this.$http.delete('sys/role/deleteList', {
-                ids: treeNode.id
-              },
-              {
-                _this: this
-              }, res => {
-                if (res.ok) {
-                  this.isTree = false
-                  this.getUserByRole()
-                }
-              })
-            }
-          }
-        })
-      }).catch(() => {})
-    },
-    // 删除角色
-    roleDel (row) {
-      // 此处需要confirm功能
-      this.$confirm('确定删除这一条数据?', '提示', {
-        confirmButtonText: '确定',
-        confirmButtonClass: 'common-button-primary',
-        cancelButtonText: '取消',
-        roundButton: true,
-        type: 'warning'
-      }).then(() => {
-        this.$http.delete('sys/role/' + row.id, {},
-          {
-            _this: this
-          }, res => {
-            if (res.ok) {
-              this.roleSelectPage()
-            }
-          })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        })
-      })
-    },
-    // 保存角色信息
-    saveRoleInfo (name) {
-      this.$refs[name].validate((valid) => {
-        if (valid) {
-          this.roleVO.pId = this.roleVoId
-          let roleInfoVO = JSON.parse(JSON.stringify(this.roleVO))
-          if (roleInfoVO.id != null && roleInfoVO.id !== '') {
-            // 修改角色信息
-            // 此处暂未实现
-            delete this.roleVO.pId
-            this.$http.putData('sys/role', this.roleVO,
-              {
-                _this: this, loading: 'submitLoading'
-              }, res => {
-                if (res.ok) {
-                  this.closeDrawer()
-                  this.roleSelectPage()
-                  this.getUserByRole()
-                } else {
-                }
+      },
+      handleNodeClick (data) {
+          this.id = data.id
+          this.getData()
+      },
+      getData () {
+          this.$http.get('sarRole/role/id', {
+              roleId: this.id
+          },{
+              _this: this,
+              loading: 'Loading'
+          }, res=> {
+              if (res.ok) {
+                  this.data = []
+                  this.data.push(res.data)
               }
-            )
-          } else {
-            this.$http.postData('sys/role', this.roleVO,
-              {
-                _this: this,
-                loading: 'submitLoading'
-              }, res => {
-                if (res.ok) {
-                  this.$nextTick(() => {
-                    this.$refs['roleVO'].resetFields()
-                    this.closeDrawer()
-                    this.getUserByRole()
-                  })
-                  // this.roleSelectPage()
-                  // this.$nextTick(() => {
-                  //   this.$refs['roleVO'].resetFields()
-                  // })
-                } else {
-                }
-              })
-          }
-        } else {
-        }
-      })
-    },
-    // 查看角色信息
-    showRole (row) {
-      this.roleTitle = '查看角色信息'
-      this.roleInfoModel = true
-      this.roleVO = JSON.parse(JSON.stringify(row))
-      this.roleVO.useFlag = this.roleVO.useFlag.toString()
-    },
-    jurisdictionTableChange (row) {
-      this.jurisdictionRow = row
-    },
-    // 配置角色信息
-    roleConfigure () {
-      if (this.selectNum === '' || this.selectNum.length === 0) {
-        this.instance('warning', '请选择角色')
-      } else {
-        let roleId = this.selectNum.join(',')
-        this.selectRoleId = roleId
-        // 此处加载资源列表数据
-        this.getSysResource(roleId)
-        // 然后获取选中角色ID集合
-        // this.getRoleMenuInfo(roleId)
-      }
-    },
-    // 配置企标细类
-    roleJurisdiction () {
-      if (this.selectNum === '' || this.selectNum.length === 0) {
-        this.instance('warning', '请选择角色')
-      } else {
-        this.jurisdictionModal = true
-        let roleId = this.selectNum.join(',')
-        this.selectRoleId = roleId
-        this.selectMenu(roleId)
-        this.selectInformation(roleId)
-      }
-    },
-    selectRoleMenu (id, node) {
-      this.$http.postData('sys/roleSarMenu/listPost', {
-        roleId: id,
-        pageSize: 9999
-      }, {
-        _this: this
-      }, res => {
-        this.checkIdJurisdictionTreeList = []
-        for (let i = 0; i < node.length; i++) {
-          for (let j = 0; j < res.data.length; j++) {
-            if (res.data[j].sarMenuId === node[i].id) {
-              node[i].checked = true
-              this.checkIdJurisdictionTreeList.push(node[i].id)
-            }
-          }
-        }
-        this.jurisdictionTree = node
-      }, e => {
-      })
-    },
-    selectInformation (id) {
-      this.$http.get('lawss/msgModule/page', {
-        page: 1,
-        pageSize: 9999
-      }, {
-        _this: this,
-        loading: 'jurisdictionLoading'
-      }, res => {
-        // this.jurisdictionData = res.data.list
-        this.informationCheck(id, res.data.list)
-      }, e => {
-      })
-    },
-    informationCheck (id, list) {
-      this.$http.postData('sys/roleMsgModule/listPost', {
-        roleId: id,
-        pageSize: 9999
-      }, {
-        _this: this
-      }, res => {
-        if (res.ok) {
-          this.jurisdictionData = list
-          for (let i = 0; i < res.data.length; i++) {
-            for (let j = 0; j < this.jurisdictionData.length; j++) {
-              if (res.data[i].msgModuleId === this.jurisdictionData[j].id) {
-                this.jurisdictionData[j]._checked = true
-              }
-            }
-          }
-        } else {
-          // this.jurisdictionData = []
-        }
-      }, e => {
-      })
-    },
-    selectMenu (id) {
-      this.$http.get('lawss/sarMenu/selectmenu', {}, {
-        _this: this,
-        loading: 'jurisdictionLoading'
-      }, res => {
-        let treeNode = []
-        this.parentNode = {}
-        res.data.map((item, index) => {
-          let treeItem = {}
-          for (let key in item) {
-            if (key === 'parentId') {
-              treeItem.pId = item[key]
-              treeItem.parentId = item[key]
-            } else if (key === 'menuName') {
-              treeItem.name = item[key]
-            } else {
-              treeItem[key] = item[key]
-            }
-          }
-          treeNode[index] = treeItem
-          // 记录最外层父节点
-          if (treeItem.parentId === '' || treeItem.parentId == null) {
-            this.parentNode = treeItem
-          }
-        })
-        // treeNodes = JSON.parse(JSON.stringify(treeNode))
-
-        this.selectRoleMenu(id, JSON.parse(JSON.stringify(treeNode)))
-      }, e => {
-      })
-    },
-    // 权限对话框关闭
-    jurisdictionModalClose () {
-      this.jurisdictionModal = false
-      this.jurisdictionTabs = 'jurisdictionOne'
-      this.$refs.roleTree.clearSearch()
-    },
-    // 权限对话框提交
-    jurisdictionModalOk () {
-      let roleId = this.selectNum.join(',')
-      if (this.jurisdictionName === 'jurisdictionOne' || this.jurisdictionName === '') {
-        let checkRoleMenu = this.$refs.roleTree.getCheckNodes()
-        let ids = []
-        for (let i = 0; i < checkRoleMenu.length; i++) {
-          let id = checkRoleMenu[i].id
-          let parentIds = checkRoleMenu[i].parentIds
-          if ($.inArray(id, ids) === -1) {
-            ids.push(id)
-          }
-          if (parentIds !== null) {
-            let parentIdArray = parentIds.split(',')
-            for (let n = 0; n < parentIdArray.length; n++) {
-              if ($.inArray(parentIdArray[n], ids) === -1) {
-                ids.push(parentIdArray[n])
-              }
-            }
-          }
-        }
-        this.$http.postData('sys/roleSarMenu/bindRoleSarMenuId', {
-          roleId: roleId,
-          sarMenuIds: ids
-        }, {
-          _this: this,
-          loading: 'submitLoading'
-        }, res => {
-          this.$message.success('配置成功')
-          this.jurisdictionModal = false
-        })
-      } else if (this.jurisdictionName === 'jurisdictionTwo') {
-        let ids = []
-        for (let i = 0; i < this.jurisdictionRow.length; i++) {
-          ids.push(this.jurisdictionRow[i].id)
-        }
-        this.$http.postData('sys/roleMsgModule/bindRoleMoudleId', {
-          roleId: roleId,
-          msgModuleIds: ids
-        }, {
-          _this: this
-        }, res => {
-          this.$message.success('配置成功')
-          this.jurisdictionModal = false
-        })
-      }
-      this.jurisdictionName = ''
-    },
-    // 标签页切换
-    jurisdictionTab (name) {
-      this.jurisdictionName = name
-    },
-    // 获取系统资源
-    getSysResource (roleId) {
-      this.$http.postData('sys/menu/listPost', {roleId: roleId}, {_this: this, loading: 'roleDataLoading'}, res => {
-        this.sysMenuTree = this.procesMenuData(res.data)
-        // this.sysMenuTree = res.data
-        // this.getRoleMenuInfo(roleId)
-        this.sysMenu = true
-      }, e => {})
-    },
-    // 根据角色ID获取菜单性信息
-    getRoleMenuInfo (roleId) {
-      this.$http.get('sys/menu/listMenuByUserId/' + roleId, {}, {_this: this, loading: 'roleDataLoading'}, res => {
-        let resMenuList = res.data
-        if (resMenuList !== null && resMenuList.length > 0) {
-          this.sysMenuTree = this.procesMenuData(resMenuList)
-          // this.sysMenuTree = resMenuList
-          this.sysMenu = true
-        } else {
-          this.getSysResource()
-        }
-      }, e => {})
-    },
-    // 关闭菜单弹出框
-    closeSysMenu () {
-      // 首先清空树结构内容
-      this.sysMenuTree = []
-      this.sysMenu = false
-      this.selectRoleId = ''
-    },
-    // 保存角色菜单信息
-    saveRoleMenu () {
-      let checkMenu = this.$refs.menuTree.getCheckNodes()
-      if (checkMenu != null && checkMenu.length > 0) {
-        let checkMenuList = []
-        for (let i = 0; i < checkMenu.length; i++) {
-          checkMenuList.push(checkMenu[i].id)
-        }
-        this.$http.postData('sys/role/saveRoleMenu', {
-          rid: this.selectRoleId,
-          menusstr: checkMenuList
-        }, {_this: this, loading: 'submitLoading'}, res => {
-          this.sysMenuTree = []
-          this.sysMenu = false
-          this.selectRoleId = ''
-          this.roleSelectPage()
-        })
-      } else {
-        this.instance('warning', '请选择系统菜单')
-        return false
-      }
-    },
-    // 将数据转换为zTree可是识别的格式
-    procesMenuData (sysMenuData) {
-      if (sysMenuData !== null && sysMenuData.length > 0) {
-        let zTreeNodes = []
-        for (let index = 0; index < sysMenuData.length; index++) {
-          let option = {}
-          option.id = sysMenuData[index].id
-          option.pId = sysMenuData[index].parentId
-          option.parentId = sysMenuData[index].parentId
-          option.name = sysMenuData[index].name
-          option.parentIds = sysMenuData[index].parentIds
-          option.remarks = sysMenuData[index].remarks
-          option.href = sysMenuData[index].href
-          option.permission = sysMenuData[index].permission
-          option.checked = sysMenuData[index].checked
-          zTreeNodes.push(option)
-        }
-        return zTreeNodes
-      } else {
-        return []
-      }
-    },
-    pageChange (page) {
-      this.pageNo = page
-      this.roleSelectPage()
-    },
-    pageSizeChange () {
-      this.roleSelectPage()
-    },
-    treeCollapse () {
-      this.sideClose = !this.sideClose
-    },
-    // 查询指定角色树
-    getUserByRole (roleHierarchy) {
-      this.isTree = true
-      return new Promise((resolve, reject) => {
-        this.loading = true
-        this.$http.get('sys/role/getRoleByOrgId', {
-          roleHierarchy,
-          type: 0
-        }, {
-          _this: this
-        }, res => {
-          this.loading = false
-          if (res.ok) {
-            const treeNodeList = []
-            for (let i = 0; i < res.data.length; i++) {
-              let obj = {}
-              for (let key in res.data[i]) {
-                if (key === 'usid') {
-                  obj.id = res.data[i][key]
-                } else if (key === 'orgId') {
-                  obj.pId = res.data[i][key]
-                } else {
-                  obj[key] = res.data[i][key]
-                }
-              }
-              treeNodeList.push(obj)
-            }
-            // 获取组织与人员完毕，开始组装树结构
-            let zNodes = []
-            for (let i = 0; i < treeNodeList.length; i++) {
-              let zObj = {}
-              zObj.id = treeNodeList[i].id
-              zObj.pId = treeNodeList[i].pId || '000000'
-              zObj.name = treeNodeList[i].name
-              zObj.icon = 'static/images/user.png'
-              zObj.iconSkin = 'org-user'
-              zObj.shotName = treeNodeList[i].shotName
-              zObj.remarks = treeNodeList[i].remarks
-              zObj.dyOrgName = treeNodeList[i].dyOrgName
-              zObj.dyOrgId = treeNodeList[i].dyOrgId
-              zObj.roleType = treeNodeList[i].roleType
-              zNodes[i] = zObj
-            }
-            this.zNodes = zNodes
-          }
-          resolve()
-        }, e => {
-          this.loading = false
-          reject(e)
-        })
-      })
-    },
-    // 树节点点击
-    handleClick (treeId, treeNode) {
-      this.roleVoId = treeNode.id
-      this.roleSelectPage()
-    },
-    // 查询角色组
-    getRoleGroup () {
-      this.$http.get('sys/role/getRoleGroup', {}, {
-        _this: this
-      }, res => {
-        if (res.ok) {
-          this.roleHierarchyOption = res.data
-        }
-      })
-    },
-    // 角色组change查询角色树
-    roleHierarchyChange (val) {
-      this.getUserByRole(val)
-    },
-    treeRightClick (treeId, treeNode) {
-      if (this.roleVoId !== treeNode.id) {
-        this.roleVoId = treeNode.id
-        this.roleSelectPage()
-      }
-    },
-    handleTreeOnCheck (treeCheckNode) {
-      this.selectNum = []
-      treeCheckNode.map(item => {
-        this.selectNum.push(item.id)
-      })
-      if (this.checkIdList.length !== this.selectNum.length) {
-        this.isAll = false
-      }
-    },
-    getDept () {
-      return new Promise((resolve, reject) => {
-        let url = 'sys/org/getTree'
-        this.$http.get(url, {}, {
-          _this: this
-        }, res => {
-          if (res.ok) {
-            let zNodesDept = []
-            res.data.map((item, i) => {
-              let zObj = {}
-              // 该节点为机构
-              zObj.name = item.orgName
-              zObj.icon = 'static/images/dept.png'
-              // zObj.isParent = true
-              zObj.shotName = item.shotName
-              zObj.remarks = item.remarks
-              zObj.id = item.id
-              zObj.pId = item.pId
-              zNodesDept[i] = zObj
-            })
-            this.orgData = zNodesDept
-            resolve(res.data)
-          }
-        }, e => {
-          reject(e)
-        })
-      })
-    },
-    // 全选\取消全选角色事件
-    getAllRole () {
-      if (!this.isAll) {
-        this.zNodes.map(item => {
-          this.checkIdList.push(item.id)
-        })
-      } else {
-        this.checkIdList = []
-      }
-      this.isAll = !this.isAll
-    }
+          })
+      },
+      filterNode(value, data) {
+          if (!value) return true;
+          return data.name.indexOf(value) !== -1;
+      },
+      treeCollapse () {
+          this.sideClose = !this.sideClose
+      },
+      getTree () {
+          this.$http.get('sarRole/role', {}, {
+              _this: this,
+              loading: 'treeLoading'
+          }, res=> {
+              this.treeData = res.data
+              this.id = res.data[0].id
+              this.getData()
+          })
+      },
   },
+    watch: {
+        filterText(val) {
+            this.$refs.tree.filter(val);
+        }
+    },
   mounted () {
-    this.getUserByRole()
-    this.getRoleGroup()
-    this.getDept()
-    this.getRoleSelect()
-    this.pageNo = 1
+      this.getTree()
+      this.getTree2()
   }
 }
 </script>
@@ -1324,108 +189,72 @@ export default {
 <style lang="less" scoped>
   @import '~@/assets/styles/mixins';
   .role-manage {
-    display: flex;
-    height: 100%;
-    .tree-close{
-      .tree{
-        left: -200px !important;
-      }
-      .tree-right{
-        width: calc(~'100% - 15px') !important;
-      }
-      .side-bar-collapse{
-        background: #5596CC !important;
-        color: #FFF;
-      }
-    }
-    .tree-closed {
-      width: 15px !important;
-    }
-    .tree-content {
-      background: #fff;
-      width: 20%;
-      position: relative;
-      .tree {
-        width: calc(~'100% - 15px');
-        position: absolute;
-        left: 0;
-        .laws-tree{
-          height: calc(~'100% - 85px');
-          .content_wrap{
-            .input-wrapper{
-              .empty{
-                width: 165px;
-              }
-            }
-          }
-        }
-      }
-      .tree-collapse {
-        position: absolute;
-        right: 0;
-      }
-    }
-    .tree-right {
-      overflow-y: hidden;
-      padding:0;
-      position: relative;
-      width: 100%;
+      display: flex;
       height: 100%;
-      .content{
-        padding: 0 10px;
-        height: calc(~'100% - 55px - 56px');
+      .tree-close{
+          .tree{
+              left: -200px !important;
+          }
+          .tree-right{
+              width: calc(~'100% - 15px') !important;
+          }
+          .side-bar-collapse{
+              background: #5596CC !important;
+              color: #FFF;
+          }
       }
-      .pagination{
-        width: 100% !important;
-        left: 0 !important;
+      .tree-closed {
+          width: 15px !important;
       }
-    }
-  }
-  .sysMenuTreeDiv{
-    height: 400px;
-    overflow-y: auto;
-  }
-  .search-area {
-    padding: 10px 5px 0;
-    .left {
-      /deep/ .el-form-item {
-        margin: 0;
-        .el-input__inner {
+      .tree-content {
+          background: #fff;
+          width: 16%;
+          position: relative;
+          .tree {
+              width: 95%;
+              position: absolute;
+              left: 0;
+          }
+          .tree-collapse {
+              position: absolute;
+              right: 0;
+          }
+      }
+      .tree-right {
+          overflow-y: hidden;
+          padding:0;
+          position: relative;
           width: 100%;
-        }
-        .el-form-item__content{
-          width: 100%;
-        }
+          height: 100%;
+          display: flex;
+          flex-direction: column;
+          .content{
+              padding: 0px;
+              display: flex;
+              flex-direction: column;
+              position: relative;
+              flex: auto;
+              //height: calc(~'100% - 105px - 56px');
+          }
+          .pagination{
+              position: static;
+              width: 100% !important;
+              left: 0 !important;
+          }
       }
-    }
   }
-  .input-wrapper {
-    input {
-      width: 100% !important;
-    }
+  /deep/.el-select__tags {
+      overflow-x: hidden;
   }
-   .secondSelect {
-    width: 100%;
-    padding: 10px 5px 0 5px;
-    /deep/.el-input--suffix .el-input__inner {
-      display: inline-block;
+  /deep/.width-all{
       width: 100%;
-      height: 32px;
-      line-height: 1.5;
-      padding: 4px 30px 4px 10px;
-      color: #515a6e;
-      background-color: #fff;
-      position: relative;
-      cursor: text;
-      font-family: inherit;
-      border: 1px solid #DDD;
-    }
-     /deep/.el-input__icon {
-       line-height: 30px;
-     }
   }
-  .btnSelect{
-    position: absolute;
-    right: 20px;
+  .laws-tree{
+      /deep/.clearable {
+          top: 20px;
+      }
+  }
+  .add-form-item {
+      display: flex;
   }
 </style>