diff --git a/src/views/system/resource/editResource.vue b/src/views/system/resource/editResource.vue
index feda38f..5f88a36 100644
--- a/src/views/system/resource/editResource.vue
+++ b/src/views/system/resource/editResource.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
-    <el-form ref="dataForm" :rules="rules" :model="resourceForm" label-position="right" label-width="80px">
+    <el-form ref="dataForm" :rules="rules" :model="resourceForm" label-position="right" label-width="100px">
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="资源名称" prop="name">
@@ -8,7 +8,13 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="资源路径" prop="url">
+          <el-form-item label="" prop="url">
+            <span slot="label">
+              资源路径
+              <el-tooltip content="资源路径必须对应后台接口名,用于功能权限判断" placement="top">
+                <i class="el-icon-warning-outline" />
+              </el-tooltip>
+            </span>
             <el-input v-model.trim="resourceForm.url" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
@@ -47,7 +53,13 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="图标" prop="icon">
+          <el-form-item label="" prop="icon">
+            <span slot="label">
+              图标
+              <el-tooltip content="对应src/icons/svg图标名称" placement="top">
+                <i class="el-icon-warning-outline" />
+              </el-tooltip>
+            </span>
             <el-input v-model.trim="resourceForm.icon" type="text" placeholder="非必填" />
           </el-form-item>
         </el-col>

diff --git a/src/views/system/resource/editResource.vue b/src/views/system/resource/editResource.vue
index feda38f..5f88a36 100644
--- a/src/views/system/resource/editResource.vue
+++ b/src/views/system/resource/editResource.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
-    <el-form ref="dataForm" :rules="rules" :model="resourceForm" label-position="right" label-width="80px">
+    <el-form ref="dataForm" :rules="rules" :model="resourceForm" label-position="right" label-width="100px">
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="资源名称" prop="name">
@@ -8,7 +8,13 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="资源路径" prop="url">
+          <el-form-item label="" prop="url">
+            <span slot="label">
+              资源路径
+              <el-tooltip content="资源路径必须对应后台接口名,用于功能权限判断" placement="top">
+                <i class="el-icon-warning-outline" />
+              </el-tooltip>
+            </span>
             <el-input v-model.trim="resourceForm.url" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
@@ -47,7 +53,13 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="图标" prop="icon">
+          <el-form-item label="" prop="icon">
+            <span slot="label">
+              图标
+              <el-tooltip content="对应src/icons/svg图标名称" placement="top">
+                <i class="el-icon-warning-outline" />
+              </el-tooltip>
+            </span>
             <el-input v-model.trim="resourceForm.icon" type="text" placeholder="非必填" />
           </el-form-item>
         </el-col>
diff --git a/src/views/system/role/dataPerm.vue b/src/views/system/role/dataPerm.vue
index d2a6299..8c9b0a7 100644
--- a/src/views/system/role/dataPerm.vue
+++ b/src/views/system/role/dataPerm.vue
@@ -1,17 +1,29 @@
 <template>
   <el-dialog :visible.sync="dialogFormVisible" :title="titleText" width="330px" append-to-body>
+    <!--功能-->
+    <div class="tool-line">
+      <el-checkbox v-model="treeExpand" @change="handleCheckedTreeExpand($event)">
+        展开
+      </el-checkbox>
+      <el-checkbox v-model="nodeCheckedAll" @change="handleCheckedTreeNodeAll($event)">
+        全选
+      </el-checkbox>
+      <el-checkbox v-model="treeCheckStrictly">
+        父子联动
+      </el-checkbox>
+    </div>
     <el-scrollbar>
       <el-tree
         ref="tree"
         v-loading="loading"
         :props="defaultProps"
-        :data="resourceTreeList"
+        :data="treeList"
         :default-expanded-keys="defaultExpanded"
         :default-checked-keys="defaultChecked"
+        :check-strictly="!treeCheckStrictly"
         show-checkbox
         node-key="id"
-        check-strictly
-        @check-change="handleCheckChange"
+        empty-text="加载中，请稍后"
       />
     </el-scrollbar>
     <div slot="footer" class="dialog-footer">
@@ -41,10 +53,13 @@
         label: 'name',
         children: 'children'
       },
-      resourceTreeList: null, // 资源树列表数据
+      treeList: null, // 资源树列表数据
       defaultExpanded: [], // 默认展开的项
       defaultChecked: [], // 默认选中的树
-      loading: false // 加载动态效果
+      loading: false, // 加载动态效果
+      treeExpand: false, // 展开
+      nodeCheckedAll: false, // 全选
+      treeCheckStrictly: true // 父子联动
     }
   },
   computed: {
@@ -52,12 +67,9 @@
       return this.roleName + ''
     }
   },
-  mounted: function() {
-    // this.fetchResourceData()
-  },
   methods: {
     // 初始化对话框
-    initDialog: function(row) {
+    initDialog(row) {
       this.loading = true
       this.roleId = row.id
       this.roleName = row.name
@@ -65,11 +77,11 @@
       this.fetchResourceTree()
     },
     // 获取资源列表
-    fetchResourceTree: function() {
+    fetchResourceTree() {
       console.log('fetchResourceTree')
       getDeptTreeByRole(this.roleId).then(response => {
         if (response.data) {
-          this.resourceTreeList = toTreeList(response.data)
+          this.treeList = toTreeList(response.data)
           const temp = getShowItem(response.data) // 获取展开项和选中项
           this.defaultExpanded = temp[0]
           this.defaultChecked = temp[1]
@@ -78,7 +90,7 @@
       })
     },
     // 保存数据
-    saveData: function() {
+    saveData() {
       this.ids = this.$refs.tree.getCheckedKeys()
       dataAuthor(this.roleId, this.ids).then(response => {
         if (response.code === 200) {
@@ -88,22 +100,45 @@
       })
       console.log('授权成功')
     },
-    handleCheckChange() {
-      console.log('handleCheckChange')
+    // 展开/折叠
+    handleCheckedTreeExpand(value) {
+      this.changeTreeNodeStatus(this.$refs.tree.store.root, value)
+    },
+    /**
+     * 改变树节点展开状态，递归
+     * @param node 改变的节点
+     * @param value 展开/折叠
+     */
+    changeTreeNodeStatus(node, value) {
+      node.expanded = value // 给当前节点赋值
+      for (let i = 0; i < node.childNodes.length; i++) { // 给子节点赋值
+        node.childNodes[i].expanded = value
+        if (node.childNodes[i].childNodes.length > 0) { // 如果子节点还有子节点，递归
+          this.changeTreeNodeStatus(node.childNodes[i], value)
+        }
+      }
+    },
+    // 全选或全不选
+    handleCheckedTreeNodeAll(value) {
+      this.$refs.tree.setCheckedNodes(value ? this.treeList : [])
     }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-
-  .el-dialog{
-    min-width:350px !important;
-  }
-  .el-tree{
-    max-height:300px;
-  }
-  .el-select{
-    width: 100%;
-  }
+.tool-line{
+  margin-bottom: 10px;
+  margin-top: -15px;
+}
+.el-dialog{
+  min-width:350px !important;
+}
+.el-tree{
+  min-height:100px;
+  max-height:300px;
+}
+.el-select{
+  width: 100%;
+}
 </style>

diff --git a/src/views/system/resource/editResource.vue b/src/views/system/resource/editResource.vue
index feda38f..5f88a36 100644
--- a/src/views/system/resource/editResource.vue
+++ b/src/views/system/resource/editResource.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
-    <el-form ref="dataForm" :rules="rules" :model="resourceForm" label-position="right" label-width="80px">
+    <el-form ref="dataForm" :rules="rules" :model="resourceForm" label-position="right" label-width="100px">
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="资源名称" prop="name">
@@ -8,7 +8,13 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="资源路径" prop="url">
+          <el-form-item label="" prop="url">
+            <span slot="label">
+              资源路径
+              <el-tooltip content="资源路径必须对应后台接口名,用于功能权限判断" placement="top">
+                <i class="el-icon-warning-outline" />
+              </el-tooltip>
+            </span>
             <el-input v-model.trim="resourceForm.url" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
@@ -47,7 +53,13 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="图标" prop="icon">
+          <el-form-item label="" prop="icon">
+            <span slot="label">
+              图标
+              <el-tooltip content="对应src/icons/svg图标名称" placement="top">
+                <i class="el-icon-warning-outline" />
+              </el-tooltip>
+            </span>
             <el-input v-model.trim="resourceForm.icon" type="text" placeholder="非必填" />
           </el-form-item>
         </el-col>
diff --git a/src/views/system/role/dataPerm.vue b/src/views/system/role/dataPerm.vue
index d2a6299..8c9b0a7 100644
--- a/src/views/system/role/dataPerm.vue
+++ b/src/views/system/role/dataPerm.vue
@@ -1,17 +1,29 @@
 <template>
   <el-dialog :visible.sync="dialogFormVisible" :title="titleText" width="330px" append-to-body>
+    <!--功能-->
+    <div class="tool-line">
+      <el-checkbox v-model="treeExpand" @change="handleCheckedTreeExpand($event)">
+        展开
+      </el-checkbox>
+      <el-checkbox v-model="nodeCheckedAll" @change="handleCheckedTreeNodeAll($event)">
+        全选
+      </el-checkbox>
+      <el-checkbox v-model="treeCheckStrictly">
+        父子联动
+      </el-checkbox>
+    </div>
     <el-scrollbar>
       <el-tree
         ref="tree"
         v-loading="loading"
         :props="defaultProps"
-        :data="resourceTreeList"
+        :data="treeList"
         :default-expanded-keys="defaultExpanded"
         :default-checked-keys="defaultChecked"
+        :check-strictly="!treeCheckStrictly"
         show-checkbox
         node-key="id"
-        check-strictly
-        @check-change="handleCheckChange"
+        empty-text="加载中，请稍后"
       />
     </el-scrollbar>
     <div slot="footer" class="dialog-footer">
@@ -41,10 +53,13 @@
         label: 'name',
         children: 'children'
       },
-      resourceTreeList: null, // 资源树列表数据
+      treeList: null, // 资源树列表数据
       defaultExpanded: [], // 默认展开的项
       defaultChecked: [], // 默认选中的树
-      loading: false // 加载动态效果
+      loading: false, // 加载动态效果
+      treeExpand: false, // 展开
+      nodeCheckedAll: false, // 全选
+      treeCheckStrictly: true // 父子联动
     }
   },
   computed: {
@@ -52,12 +67,9 @@
       return this.roleName + ''
     }
   },
-  mounted: function() {
-    // this.fetchResourceData()
-  },
   methods: {
     // 初始化对话框
-    initDialog: function(row) {
+    initDialog(row) {
       this.loading = true
       this.roleId = row.id
       this.roleName = row.name
@@ -65,11 +77,11 @@
       this.fetchResourceTree()
     },
     // 获取资源列表
-    fetchResourceTree: function() {
+    fetchResourceTree() {
       console.log('fetchResourceTree')
       getDeptTreeByRole(this.roleId).then(response => {
         if (response.data) {
-          this.resourceTreeList = toTreeList(response.data)
+          this.treeList = toTreeList(response.data)
           const temp = getShowItem(response.data) // 获取展开项和选中项
           this.defaultExpanded = temp[0]
           this.defaultChecked = temp[1]
@@ -78,7 +90,7 @@
       })
     },
     // 保存数据
-    saveData: function() {
+    saveData() {
       this.ids = this.$refs.tree.getCheckedKeys()
       dataAuthor(this.roleId, this.ids).then(response => {
         if (response.code === 200) {
@@ -88,22 +100,45 @@
       })
       console.log('授权成功')
     },
-    handleCheckChange() {
-      console.log('handleCheckChange')
+    // 展开/折叠
+    handleCheckedTreeExpand(value) {
+      this.changeTreeNodeStatus(this.$refs.tree.store.root, value)
+    },
+    /**
+     * 改变树节点展开状态，递归
+     * @param node 改变的节点
+     * @param value 展开/折叠
+     */
+    changeTreeNodeStatus(node, value) {
+      node.expanded = value // 给当前节点赋值
+      for (let i = 0; i < node.childNodes.length; i++) { // 给子节点赋值
+        node.childNodes[i].expanded = value
+        if (node.childNodes[i].childNodes.length > 0) { // 如果子节点还有子节点，递归
+          this.changeTreeNodeStatus(node.childNodes[i], value)
+        }
+      }
+    },
+    // 全选或全不选
+    handleCheckedTreeNodeAll(value) {
+      this.$refs.tree.setCheckedNodes(value ? this.treeList : [])
     }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-
-  .el-dialog{
-    min-width:350px !important;
-  }
-  .el-tree{
-    max-height:300px;
-  }
-  .el-select{
-    width: 100%;
-  }
+.tool-line{
+  margin-bottom: 10px;
+  margin-top: -15px;
+}
+.el-dialog{
+  min-width:350px !important;
+}
+.el-tree{
+  min-height:100px;
+  max-height:300px;
+}
+.el-select{
+  width: 100%;
+}
 </style>
diff --git a/src/views/system/role/editRole.vue b/src/views/system/role/editRole.vue
index 69219e8..fd0fc41 100644
--- a/src/views/system/role/editRole.vue
+++ b/src/views/system/role/editRole.vue
@@ -8,7 +8,13 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="别名" prop="tips">
+          <el-form-item label="" prop="tips">
+            <span slot="label">
+              别名
+              <el-tooltip content="用于后台身份识别。administrator表示超级管理员, user表示其他用户" placement="top">
+                <i class="el-icon-warning-outline" />
+              </el-tooltip>
+            </span>
             <el-input v-model.trim="roleForm.tips" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>

diff --git a/src/views/system/resource/editResource.vue b/src/views/system/resource/editResource.vue
index feda38f..5f88a36 100644
--- a/src/views/system/resource/editResource.vue
+++ b/src/views/system/resource/editResource.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
-    <el-form ref="dataForm" :rules="rules" :model="resourceForm" label-position="right" label-width="80px">
+    <el-form ref="dataForm" :rules="rules" :model="resourceForm" label-position="right" label-width="100px">
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="资源名称" prop="name">
@@ -8,7 +8,13 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="资源路径" prop="url">
+          <el-form-item label="" prop="url">
+            <span slot="label">
+              资源路径
+              <el-tooltip content="资源路径必须对应后台接口名,用于功能权限判断" placement="top">
+                <i class="el-icon-warning-outline" />
+              </el-tooltip>
+            </span>
             <el-input v-model.trim="resourceForm.url" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
@@ -47,7 +53,13 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="图标" prop="icon">
+          <el-form-item label="" prop="icon">
+            <span slot="label">
+              图标
+              <el-tooltip content="对应src/icons/svg图标名称" placement="top">
+                <i class="el-icon-warning-outline" />
+              </el-tooltip>
+            </span>
             <el-input v-model.trim="resourceForm.icon" type="text" placeholder="非必填" />
           </el-form-item>
         </el-col>
diff --git a/src/views/system/role/dataPerm.vue b/src/views/system/role/dataPerm.vue
index d2a6299..8c9b0a7 100644
--- a/src/views/system/role/dataPerm.vue
+++ b/src/views/system/role/dataPerm.vue
@@ -1,17 +1,29 @@
 <template>
   <el-dialog :visible.sync="dialogFormVisible" :title="titleText" width="330px" append-to-body>
+    <!--功能-->
+    <div class="tool-line">
+      <el-checkbox v-model="treeExpand" @change="handleCheckedTreeExpand($event)">
+        展开
+      </el-checkbox>
+      <el-checkbox v-model="nodeCheckedAll" @change="handleCheckedTreeNodeAll($event)">
+        全选
+      </el-checkbox>
+      <el-checkbox v-model="treeCheckStrictly">
+        父子联动
+      </el-checkbox>
+    </div>
     <el-scrollbar>
       <el-tree
         ref="tree"
         v-loading="loading"
         :props="defaultProps"
-        :data="resourceTreeList"
+        :data="treeList"
         :default-expanded-keys="defaultExpanded"
         :default-checked-keys="defaultChecked"
+        :check-strictly="!treeCheckStrictly"
         show-checkbox
         node-key="id"
-        check-strictly
-        @check-change="handleCheckChange"
+        empty-text="加载中，请稍后"
       />
     </el-scrollbar>
     <div slot="footer" class="dialog-footer">
@@ -41,10 +53,13 @@
         label: 'name',
         children: 'children'
       },
-      resourceTreeList: null, // 资源树列表数据
+      treeList: null, // 资源树列表数据
       defaultExpanded: [], // 默认展开的项
       defaultChecked: [], // 默认选中的树
-      loading: false // 加载动态效果
+      loading: false, // 加载动态效果
+      treeExpand: false, // 展开
+      nodeCheckedAll: false, // 全选
+      treeCheckStrictly: true // 父子联动
     }
   },
   computed: {
@@ -52,12 +67,9 @@
       return this.roleName + ''
     }
   },
-  mounted: function() {
-    // this.fetchResourceData()
-  },
   methods: {
     // 初始化对话框
-    initDialog: function(row) {
+    initDialog(row) {
       this.loading = true
       this.roleId = row.id
       this.roleName = row.name
@@ -65,11 +77,11 @@
       this.fetchResourceTree()
     },
     // 获取资源列表
-    fetchResourceTree: function() {
+    fetchResourceTree() {
       console.log('fetchResourceTree')
       getDeptTreeByRole(this.roleId).then(response => {
         if (response.data) {
-          this.resourceTreeList = toTreeList(response.data)
+          this.treeList = toTreeList(response.data)
           const temp = getShowItem(response.data) // 获取展开项和选中项
           this.defaultExpanded = temp[0]
           this.defaultChecked = temp[1]
@@ -78,7 +90,7 @@
       })
     },
     // 保存数据
-    saveData: function() {
+    saveData() {
       this.ids = this.$refs.tree.getCheckedKeys()
       dataAuthor(this.roleId, this.ids).then(response => {
         if (response.code === 200) {
@@ -88,22 +100,45 @@
       })
       console.log('授权成功')
     },
-    handleCheckChange() {
-      console.log('handleCheckChange')
+    // 展开/折叠
+    handleCheckedTreeExpand(value) {
+      this.changeTreeNodeStatus(this.$refs.tree.store.root, value)
+    },
+    /**
+     * 改变树节点展开状态，递归
+     * @param node 改变的节点
+     * @param value 展开/折叠
+     */
+    changeTreeNodeStatus(node, value) {
+      node.expanded = value // 给当前节点赋值
+      for (let i = 0; i < node.childNodes.length; i++) { // 给子节点赋值
+        node.childNodes[i].expanded = value
+        if (node.childNodes[i].childNodes.length > 0) { // 如果子节点还有子节点，递归
+          this.changeTreeNodeStatus(node.childNodes[i], value)
+        }
+      }
+    },
+    // 全选或全不选
+    handleCheckedTreeNodeAll(value) {
+      this.$refs.tree.setCheckedNodes(value ? this.treeList : [])
     }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-
-  .el-dialog{
-    min-width:350px !important;
-  }
-  .el-tree{
-    max-height:300px;
-  }
-  .el-select{
-    width: 100%;
-  }
+.tool-line{
+  margin-bottom: 10px;
+  margin-top: -15px;
+}
+.el-dialog{
+  min-width:350px !important;
+}
+.el-tree{
+  min-height:100px;
+  max-height:300px;
+}
+.el-select{
+  width: 100%;
+}
 </style>
diff --git a/src/views/system/role/editRole.vue b/src/views/system/role/editRole.vue
index 69219e8..fd0fc41 100644
--- a/src/views/system/role/editRole.vue
+++ b/src/views/system/role/editRole.vue
@@ -8,7 +8,13 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="别名" prop="tips">
+          <el-form-item label="" prop="tips">
+            <span slot="label">
+              别名
+              <el-tooltip content="用于后台身份识别。administrator表示超级管理员, user表示其他用户" placement="top">
+                <i class="el-icon-warning-outline" />
+              </el-tooltip>
+            </span>
             <el-input v-model.trim="roleForm.tips" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
diff --git a/src/views/system/role/functionPerm.vue b/src/views/system/role/functionPerm.vue
index e7b5d51..cee37d6 100644
--- a/src/views/system/role/functionPerm.vue
+++ b/src/views/system/role/functionPerm.vue
@@ -1,14 +1,26 @@
 <template>
-  <el-dialog v-loading="dialogLoading" :visible.sync="dialogFormVisible" :title="titleText" width="330px" append-to-body>
+  <el-dialog :visible.sync="dialogFormVisible" :title="titleText" width="350px" append-to-body>
+    <!--功能-->
+    <div class="tool-line">
+      <el-checkbox v-model="treeExpand" @change="handleCheckedTreeExpand($event)">
+        展开
+      </el-checkbox>
+      <el-checkbox v-model="nodeCheckedAll" @change="handleCheckedTreeNodeAll($event)">
+        全选
+      </el-checkbox>
+      <el-checkbox v-model="treeCheckStrictly">
+        父子联动
+      </el-checkbox>
+    </div>
     <el-scrollbar>
       <el-tree
         ref="tree"
         v-loading="loading"
         :props="defaultProps"
-        :data="resourceTreeList"
+        :data="treeList"
         :default-expanded-keys="defaultExpanded"
         :default-checked-keys="defaultChecked"
-        check-strictly
+        :check-strictly="!treeCheckStrictly"
         show-checkbox
         node-key="id"
       />
@@ -40,22 +52,23 @@
         label: 'name',
         children: 'children'
       },
-      resourceTreeList: [], // 资源树列表数据
+      treeList: [], // 资源树列表数据
       defaultExpanded: [], // 默认展开的项
       defaultChecked: [], // 默认选中的树
-      ids: [],
       loading: false, // 加载动态效果
-      dialogLoading: false
+      treeExpand: false, // 展开
+      nodeCheckedAll: false, // 全选
+      treeCheckStrictly: true // 父子联动
     }
   },
   computed: {
-    titleText: function() {
+    titleText() {
       return this.roleName + ''
     }
   },
   methods: {
     // 初始化对话框
-    initDialog: function(row) {
+    initDialog(row) {
       this.loading = true
       this.roleName = row.name
       this.roleId = row.id
@@ -63,10 +76,10 @@
       this.fetchResourceTree()
     },
     // 获取资源列表
-    fetchResourceTree: function() {
+    fetchResourceTree() {
       getResourceListByRole(this.roleId).then(response => {
         if (response.data) {
-          this.resourceTreeList = toTreeList(response.data)
+          this.treeList = toTreeList(response.data)
           const temp = getShowItem(response.data) // 获取展开项和选中项
           this.defaultExpanded = temp[0]
           this.defaultChecked = temp[1]
@@ -75,28 +88,51 @@
       })
     },
     // 保存数据
-    saveData: function() {
-      this.ids = this.$refs.tree.getCheckedKeys()
-      this.dialogLoading = true
-      funcAuthor(this.roleId, this.ids).then(response => {
+    saveData() {
+      const ids = this.$refs.tree.getCheckedKeys()
+      funcAuthor(this.roleId, ids).then(response => {
         if (response.code === 200) {
-          this.dialogLoading = false
           this.$message.success('权限配置成功')
           this.dialogFormVisible = false
         }
       })
+    },
+    // 展开/折叠
+    handleCheckedTreeExpand(value) {
+      this.changeTreeNodeStatus(this.$refs.tree.store.root, value)
+    },
+    /**
+     * 改变树节点展开状态，递归
+     * @param node 改变的节点
+     * @param value 展开/折叠
+     */
+    changeTreeNodeStatus(node, value) {
+      node.expanded = value // 给当前节点赋值
+      for (let i = 0; i < node.childNodes.length; i++) { // 给子节点赋值
+        node.childNodes[i].expanded = value
+        if (node.childNodes[i].childNodes.length > 0) { // 如果子节点还有子节点，递归
+          this.changeTreeNodeStatus(node.childNodes[i], value)
+        }
+      }
+    },
+    // 全选或全不选
+    handleCheckedTreeNodeAll(value) {
+      this.$refs.tree.setCheckedNodes(value ? this.treeList : [])
     }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-
+.tool-line{
+  margin-bottom: 10px;
+  margin-top: -15px;
+}
   .el-dialog{
     min-width:350px !important;
   }
   .el-tree{
-    max-height:300px;
+    height:300px;
   }
   .el-select{
     width: 100%;

diff --git a/src/views/system/resource/editResource.vue b/src/views/system/resource/editResource.vue
index feda38f..5f88a36 100644
--- a/src/views/system/resource/editResource.vue
+++ b/src/views/system/resource/editResource.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
-    <el-form ref="dataForm" :rules="rules" :model="resourceForm" label-position="right" label-width="80px">
+    <el-form ref="dataForm" :rules="rules" :model="resourceForm" label-position="right" label-width="100px">
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="资源名称" prop="name">
@@ -8,7 +8,13 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="资源路径" prop="url">
+          <el-form-item label="" prop="url">
+            <span slot="label">
+              资源路径
+              <el-tooltip content="资源路径必须对应后台接口名,用于功能权限判断" placement="top">
+                <i class="el-icon-warning-outline" />
+              </el-tooltip>
+            </span>
             <el-input v-model.trim="resourceForm.url" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
@@ -47,7 +53,13 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="图标" prop="icon">
+          <el-form-item label="" prop="icon">
+            <span slot="label">
+              图标
+              <el-tooltip content="对应src/icons/svg图标名称" placement="top">
+                <i class="el-icon-warning-outline" />
+              </el-tooltip>
+            </span>
             <el-input v-model.trim="resourceForm.icon" type="text" placeholder="非必填" />
           </el-form-item>
         </el-col>
diff --git a/src/views/system/role/dataPerm.vue b/src/views/system/role/dataPerm.vue
index d2a6299..8c9b0a7 100644
--- a/src/views/system/role/dataPerm.vue
+++ b/src/views/system/role/dataPerm.vue
@@ -1,17 +1,29 @@
 <template>
   <el-dialog :visible.sync="dialogFormVisible" :title="titleText" width="330px" append-to-body>
+    <!--功能-->
+    <div class="tool-line">
+      <el-checkbox v-model="treeExpand" @change="handleCheckedTreeExpand($event)">
+        展开
+      </el-checkbox>
+      <el-checkbox v-model="nodeCheckedAll" @change="handleCheckedTreeNodeAll($event)">
+        全选
+      </el-checkbox>
+      <el-checkbox v-model="treeCheckStrictly">
+        父子联动
+      </el-checkbox>
+    </div>
     <el-scrollbar>
       <el-tree
         ref="tree"
         v-loading="loading"
         :props="defaultProps"
-        :data="resourceTreeList"
+        :data="treeList"
         :default-expanded-keys="defaultExpanded"
         :default-checked-keys="defaultChecked"
+        :check-strictly="!treeCheckStrictly"
         show-checkbox
         node-key="id"
-        check-strictly
-        @check-change="handleCheckChange"
+        empty-text="加载中，请稍后"
       />
     </el-scrollbar>
     <div slot="footer" class="dialog-footer">
@@ -41,10 +53,13 @@
         label: 'name',
         children: 'children'
       },
-      resourceTreeList: null, // 资源树列表数据
+      treeList: null, // 资源树列表数据
       defaultExpanded: [], // 默认展开的项
       defaultChecked: [], // 默认选中的树
-      loading: false // 加载动态效果
+      loading: false, // 加载动态效果
+      treeExpand: false, // 展开
+      nodeCheckedAll: false, // 全选
+      treeCheckStrictly: true // 父子联动
     }
   },
   computed: {
@@ -52,12 +67,9 @@
       return this.roleName + ''
     }
   },
-  mounted: function() {
-    // this.fetchResourceData()
-  },
   methods: {
     // 初始化对话框
-    initDialog: function(row) {
+    initDialog(row) {
       this.loading = true
       this.roleId = row.id
       this.roleName = row.name
@@ -65,11 +77,11 @@
       this.fetchResourceTree()
     },
     // 获取资源列表
-    fetchResourceTree: function() {
+    fetchResourceTree() {
       console.log('fetchResourceTree')
       getDeptTreeByRole(this.roleId).then(response => {
         if (response.data) {
-          this.resourceTreeList = toTreeList(response.data)
+          this.treeList = toTreeList(response.data)
           const temp = getShowItem(response.data) // 获取展开项和选中项
           this.defaultExpanded = temp[0]
           this.defaultChecked = temp[1]
@@ -78,7 +90,7 @@
       })
     },
     // 保存数据
-    saveData: function() {
+    saveData() {
       this.ids = this.$refs.tree.getCheckedKeys()
       dataAuthor(this.roleId, this.ids).then(response => {
         if (response.code === 200) {
@@ -88,22 +100,45 @@
       })
       console.log('授权成功')
     },
-    handleCheckChange() {
-      console.log('handleCheckChange')
+    // 展开/折叠
+    handleCheckedTreeExpand(value) {
+      this.changeTreeNodeStatus(this.$refs.tree.store.root, value)
+    },
+    /**
+     * 改变树节点展开状态，递归
+     * @param node 改变的节点
+     * @param value 展开/折叠
+     */
+    changeTreeNodeStatus(node, value) {
+      node.expanded = value // 给当前节点赋值
+      for (let i = 0; i < node.childNodes.length; i++) { // 给子节点赋值
+        node.childNodes[i].expanded = value
+        if (node.childNodes[i].childNodes.length > 0) { // 如果子节点还有子节点，递归
+          this.changeTreeNodeStatus(node.childNodes[i], value)
+        }
+      }
+    },
+    // 全选或全不选
+    handleCheckedTreeNodeAll(value) {
+      this.$refs.tree.setCheckedNodes(value ? this.treeList : [])
     }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-
-  .el-dialog{
-    min-width:350px !important;
-  }
-  .el-tree{
-    max-height:300px;
-  }
-  .el-select{
-    width: 100%;
-  }
+.tool-line{
+  margin-bottom: 10px;
+  margin-top: -15px;
+}
+.el-dialog{
+  min-width:350px !important;
+}
+.el-tree{
+  min-height:100px;
+  max-height:300px;
+}
+.el-select{
+  width: 100%;
+}
 </style>
diff --git a/src/views/system/role/editRole.vue b/src/views/system/role/editRole.vue
index 69219e8..fd0fc41 100644
--- a/src/views/system/role/editRole.vue
+++ b/src/views/system/role/editRole.vue
@@ -8,7 +8,13 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="别名" prop="tips">
+          <el-form-item label="" prop="tips">
+            <span slot="label">
+              别名
+              <el-tooltip content="用于后台身份识别。administrator表示超级管理员, user表示其他用户" placement="top">
+                <i class="el-icon-warning-outline" />
+              </el-tooltip>
+            </span>
             <el-input v-model.trim="roleForm.tips" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
diff --git a/src/views/system/role/functionPerm.vue b/src/views/system/role/functionPerm.vue
index e7b5d51..cee37d6 100644
--- a/src/views/system/role/functionPerm.vue
+++ b/src/views/system/role/functionPerm.vue
@@ -1,14 +1,26 @@
 <template>
-  <el-dialog v-loading="dialogLoading" :visible.sync="dialogFormVisible" :title="titleText" width="330px" append-to-body>
+  <el-dialog :visible.sync="dialogFormVisible" :title="titleText" width="350px" append-to-body>
+    <!--功能-->
+    <div class="tool-line">
+      <el-checkbox v-model="treeExpand" @change="handleCheckedTreeExpand($event)">
+        展开
+      </el-checkbox>
+      <el-checkbox v-model="nodeCheckedAll" @change="handleCheckedTreeNodeAll($event)">
+        全选
+      </el-checkbox>
+      <el-checkbox v-model="treeCheckStrictly">
+        父子联动
+      </el-checkbox>
+    </div>
     <el-scrollbar>
       <el-tree
         ref="tree"
         v-loading="loading"
         :props="defaultProps"
-        :data="resourceTreeList"
+        :data="treeList"
         :default-expanded-keys="defaultExpanded"
         :default-checked-keys="defaultChecked"
-        check-strictly
+        :check-strictly="!treeCheckStrictly"
         show-checkbox
         node-key="id"
       />
@@ -40,22 +52,23 @@
         label: 'name',
         children: 'children'
       },
-      resourceTreeList: [], // 资源树列表数据
+      treeList: [], // 资源树列表数据
       defaultExpanded: [], // 默认展开的项
       defaultChecked: [], // 默认选中的树
-      ids: [],
       loading: false, // 加载动态效果
-      dialogLoading: false
+      treeExpand: false, // 展开
+      nodeCheckedAll: false, // 全选
+      treeCheckStrictly: true // 父子联动
     }
   },
   computed: {
-    titleText: function() {
+    titleText() {
       return this.roleName + ''
     }
   },
   methods: {
     // 初始化对话框
-    initDialog: function(row) {
+    initDialog(row) {
       this.loading = true
       this.roleName = row.name
       this.roleId = row.id
@@ -63,10 +76,10 @@
       this.fetchResourceTree()
     },
     // 获取资源列表
-    fetchResourceTree: function() {
+    fetchResourceTree() {
       getResourceListByRole(this.roleId).then(response => {
         if (response.data) {
-          this.resourceTreeList = toTreeList(response.data)
+          this.treeList = toTreeList(response.data)
           const temp = getShowItem(response.data) // 获取展开项和选中项
           this.defaultExpanded = temp[0]
           this.defaultChecked = temp[1]
@@ -75,28 +88,51 @@
       })
     },
     // 保存数据
-    saveData: function() {
-      this.ids = this.$refs.tree.getCheckedKeys()
-      this.dialogLoading = true
-      funcAuthor(this.roleId, this.ids).then(response => {
+    saveData() {
+      const ids = this.$refs.tree.getCheckedKeys()
+      funcAuthor(this.roleId, ids).then(response => {
         if (response.code === 200) {
-          this.dialogLoading = false
           this.$message.success('权限配置成功')
           this.dialogFormVisible = false
         }
       })
+    },
+    // 展开/折叠
+    handleCheckedTreeExpand(value) {
+      this.changeTreeNodeStatus(this.$refs.tree.store.root, value)
+    },
+    /**
+     * 改变树节点展开状态，递归
+     * @param node 改变的节点
+     * @param value 展开/折叠
+     */
+    changeTreeNodeStatus(node, value) {
+      node.expanded = value // 给当前节点赋值
+      for (let i = 0; i < node.childNodes.length; i++) { // 给子节点赋值
+        node.childNodes[i].expanded = value
+        if (node.childNodes[i].childNodes.length > 0) { // 如果子节点还有子节点，递归
+          this.changeTreeNodeStatus(node.childNodes[i], value)
+        }
+      }
+    },
+    // 全选或全不选
+    handleCheckedTreeNodeAll(value) {
+      this.$refs.tree.setCheckedNodes(value ? this.treeList : [])
     }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-
+.tool-line{
+  margin-bottom: 10px;
+  margin-top: -15px;
+}
   .el-dialog{
     min-width:350px !important;
   }
   .el-tree{
-    max-height:300px;
+    height:300px;
   }
   .el-select{
     width: 100%;
diff --git a/src/views/system/user/editUser.vue b/src/views/system/user/editUser.vue
index d22cd09..c9eb42f 100644
--- a/src/views/system/user/editUser.vue
+++ b/src/views/system/user/editUser.vue
@@ -1,10 +1,10 @@
 <template>
-  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" width="700" append-to-body>
     <el-form ref="dataForm" :rules="rules" :model="userForm" label-position="right" label-width="80px">
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="账号" prop="account">
-            <el-input v-model.trim="userForm.account" :disabled="ifdisabled" type="text" placeholder="必填" />
+            <el-input v-model.trim="userForm.account" :disabled="dialogStatus=='update'" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -52,17 +52,16 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item v-if="!ifdisabled" label="角色" prop="roleid">
-            <select-tree v-model="userForm.roleid" :options="roleTreeList" :props="roleProps" />
+          <el-form-item v-if="dialogStatus=='create'" label="角色" prop="roleid">
+            <select-tree v-model="userForm.roleid" :default-expanded-keys="[userForm.roleid]" :options="roleTreeList" :props="roleProps" />
           </el-form-item>
           <el-form-item v-else label="角色">
-            <el-input v-model="roleName" :disabled="ifdisabled" type="text" placeholder="无" />
+            <el-input v-model="roleName" :disabled="dialogStatus=='update'" type="text" placeholder="无" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="组织机构" prop="deptId">
-            <dept-select v-model="userForm.deptId" :dept-show="deptShow" placeholder="请选择组织机构" />
-            <!--<select-tree v-model="userForm.deptId" :options="deptTreeList" :props="deptProps" />-->
+            <dept-select v-model="userForm.deptId" :dept-show="true" :default-expanded-keys="[userForm.roleid]" placeholder="请选择组织机构" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -94,17 +93,16 @@
 import { toTreeList } from '@/utils/structure'
 import SelectTree from '@/components/SelectTree/singleSelect'
 import DeptSelect from '@/components/DeptSelect'
-// import { getDeptTreeList } from '@/api/system/dept'
+import { regularReg } from '@/utils/validate'
 import { getRoleTreeList } from '@/api/system/role'
 import { addUser, updateUser } from '@/api/system/user'
-import { RSAencrypt } from '../../../utils/security'
+import { RSAencrypt } from '@/utils/security'
 
 export default {
   name: 'EditUser',
   components: { SelectTree, DeptSelect },
   data() {
     const validatePass = (rule, value, callback) => {
-      console.log('验证密码')
       if (value === '') {
         callback(new Error('密码不能为空'))
       } else {
@@ -115,7 +113,6 @@
       }
     }
     const validatePass2 = (rule, value, callback) => {
-      console.log('验证重复密码')
       if (value === '') {
         callback(new Error('重复密码不能为空'))
       } else if (value !== this.userForm.password) {
@@ -139,35 +136,14 @@
         rePassword: '', // 重复密码
         birthday: ''
       }, // 表单
-      deptProps: {
-        parent: 'pid',
-        value: 'id',
-        label: 'name',
-        children: 'children'
-      },
-      roleProps: {
-        parent: 'pid',
-        value: 'id',
-        label: 'name',
-        children: 'children'
-      },
-      deptTreeList: null, // 组织树列表数据
+      deptProps: { parent: 'pid', value: 'id', label: 'name', children: 'children' },
+      roleProps: { parent: 'pid', value: 'id', label: 'name', children: 'children' },
       roleTreeList: null, // 角色树列表数据
-      sexList: [
-        {
-          label: '男',
-          value: '0'
-        },
-        {
-          label: '女',
-          value: '1'
-        }
-      ],
+      sexList: this.$store.getters.sexList, // 性别选项
       textMap: {
-        update: '编辑',
-        create: '新增'
+        update: '编辑用户',
+        create: '新增用户'
       }, // 表头显示标题
-      ifdisabled: true, // 是否可修改
       rules: {
         account: [{ required: true, message: '账号不能为空', trigger: ['blur', 'change'] }],
         name: [{ required: true, message: '姓名不能为空', trigger: ['blur', 'change'] }],
@@ -175,34 +151,14 @@
         rePassword: [{ required: true, validator: validatePass2, trigger: ['blur', 'change'] }],
         deptId: [{ required: true, message: '组织机构必选', trigger: ['blur', 'change'] }],
         roleid: [{ required: true, message: '角色必选', trigger: ['blur', 'change'] }],
-        email: [{
-          required: false, // 是否必填
-          message: '请输入邮箱地址', // 错误提示信息
-          trigger: 'blur'// 检验方式（blur为鼠标点击其他地方，）
-        },
-        {
-          type: 'email', // 要检验的类型（number，email，date等）
-          message: '请输入正确的邮箱地址',
-          trigger: ['blur', 'change'] }],
-        phone: [{
-          required: false,
-          pattern: /^1[34578]\d{9}$/, // 可以写正则表达式呦呦呦
-          message: '请输入正确的手机号',
-          trigger: ['blur', 'change'] }]
+        email: [{ required: false, message: '请输入邮箱地址', trigger: 'blur' }, { type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }],
+        phone: [{ required: false, pattern: regularReg.mobile, message: '请输入正确的手机号', trigger: ['blur', 'change'] }]
       }, // 前端校验规则
-      roleName: '',
-      deptShow: true,
+      roleName: '', // 角色名，展示用
       btnLoading: false // 保存按钮的加载中状态
     }
   },
-  computed: {
-    userTree: function() {
-      const tree = toTreeList(this.userTreeList)
-      console.log(tree)
-      return tree
-    }
-  },
-  mounted: function() {
+  created() {
     this.fetchRoleTree()
   },
   methods: {
@@ -211,15 +167,12 @@
       this.dialogStatus = dialogStatus
       this.dialogFormVisible = true
       this.btnLoading = false
-      this.fetchRoleTree()
       if (dialogStatus === 'create') { // 如果是新增，清除验证
-        this.ifdisabled = false
         this.resetForm()
         this.$nextTick(() => {
           this.$refs['dataForm'].clearValidate()
         })
       } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
-        this.ifdisabled = true
         this.userForm = {
           id: row.id, // 编号
           account: row.account, // 账号
@@ -239,11 +192,9 @@
     // 加载角色树形下拉菜单
     fetchRoleTree: function() {
       getRoleTreeList(this.listQuery).then(response => {
-        console.log('fetchRoleTree:')
         console.log(response.data)
-        if (response.data.list) {
+        if (response.data.list) { // 将列表转树结构
           this.roleTreeList = toTreeList(response.data.list, '0', true)
-          console.log(this.roleTreeList)
         }
       })
     },
@@ -327,10 +278,6 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-
-  .el-dialog{
-    width:700px
-  }
   .el-select{
     width: 100%;
   }

diff --git a/src/views/system/resource/editResource.vue b/src/views/system/resource/editResource.vue
index feda38f..5f88a36 100644
--- a/src/views/system/resource/editResource.vue
+++ b/src/views/system/resource/editResource.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
-    <el-form ref="dataForm" :rules="rules" :model="resourceForm" label-position="right" label-width="80px">
+    <el-form ref="dataForm" :rules="rules" :model="resourceForm" label-position="right" label-width="100px">
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="资源名称" prop="name">
@@ -8,7 +8,13 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="资源路径" prop="url">
+          <el-form-item label="" prop="url">
+            <span slot="label">
+              资源路径
+              <el-tooltip content="资源路径必须对应后台接口名,用于功能权限判断" placement="top">
+                <i class="el-icon-warning-outline" />
+              </el-tooltip>
+            </span>
             <el-input v-model.trim="resourceForm.url" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
@@ -47,7 +53,13 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="图标" prop="icon">
+          <el-form-item label="" prop="icon">
+            <span slot="label">
+              图标
+              <el-tooltip content="对应src/icons/svg图标名称" placement="top">
+                <i class="el-icon-warning-outline" />
+              </el-tooltip>
+            </span>
             <el-input v-model.trim="resourceForm.icon" type="text" placeholder="非必填" />
           </el-form-item>
         </el-col>
diff --git a/src/views/system/role/dataPerm.vue b/src/views/system/role/dataPerm.vue
index d2a6299..8c9b0a7 100644
--- a/src/views/system/role/dataPerm.vue
+++ b/src/views/system/role/dataPerm.vue
@@ -1,17 +1,29 @@
 <template>
   <el-dialog :visible.sync="dialogFormVisible" :title="titleText" width="330px" append-to-body>
+    <!--功能-->
+    <div class="tool-line">
+      <el-checkbox v-model="treeExpand" @change="handleCheckedTreeExpand($event)">
+        展开
+      </el-checkbox>
+      <el-checkbox v-model="nodeCheckedAll" @change="handleCheckedTreeNodeAll($event)">
+        全选
+      </el-checkbox>
+      <el-checkbox v-model="treeCheckStrictly">
+        父子联动
+      </el-checkbox>
+    </div>
     <el-scrollbar>
       <el-tree
         ref="tree"
         v-loading="loading"
         :props="defaultProps"
-        :data="resourceTreeList"
+        :data="treeList"
         :default-expanded-keys="defaultExpanded"
         :default-checked-keys="defaultChecked"
+        :check-strictly="!treeCheckStrictly"
         show-checkbox
         node-key="id"
-        check-strictly
-        @check-change="handleCheckChange"
+        empty-text="加载中，请稍后"
       />
     </el-scrollbar>
     <div slot="footer" class="dialog-footer">
@@ -41,10 +53,13 @@
         label: 'name',
         children: 'children'
       },
-      resourceTreeList: null, // 资源树列表数据
+      treeList: null, // 资源树列表数据
       defaultExpanded: [], // 默认展开的项
       defaultChecked: [], // 默认选中的树
-      loading: false // 加载动态效果
+      loading: false, // 加载动态效果
+      treeExpand: false, // 展开
+      nodeCheckedAll: false, // 全选
+      treeCheckStrictly: true // 父子联动
     }
   },
   computed: {
@@ -52,12 +67,9 @@
       return this.roleName + ''
     }
   },
-  mounted: function() {
-    // this.fetchResourceData()
-  },
   methods: {
     // 初始化对话框
-    initDialog: function(row) {
+    initDialog(row) {
       this.loading = true
       this.roleId = row.id
       this.roleName = row.name
@@ -65,11 +77,11 @@
       this.fetchResourceTree()
     },
     // 获取资源列表
-    fetchResourceTree: function() {
+    fetchResourceTree() {
       console.log('fetchResourceTree')
       getDeptTreeByRole(this.roleId).then(response => {
         if (response.data) {
-          this.resourceTreeList = toTreeList(response.data)
+          this.treeList = toTreeList(response.data)
           const temp = getShowItem(response.data) // 获取展开项和选中项
           this.defaultExpanded = temp[0]
           this.defaultChecked = temp[1]
@@ -78,7 +90,7 @@
       })
     },
     // 保存数据
-    saveData: function() {
+    saveData() {
       this.ids = this.$refs.tree.getCheckedKeys()
       dataAuthor(this.roleId, this.ids).then(response => {
         if (response.code === 200) {
@@ -88,22 +100,45 @@
       })
       console.log('授权成功')
     },
-    handleCheckChange() {
-      console.log('handleCheckChange')
+    // 展开/折叠
+    handleCheckedTreeExpand(value) {
+      this.changeTreeNodeStatus(this.$refs.tree.store.root, value)
+    },
+    /**
+     * 改变树节点展开状态，递归
+     * @param node 改变的节点
+     * @param value 展开/折叠
+     */
+    changeTreeNodeStatus(node, value) {
+      node.expanded = value // 给当前节点赋值
+      for (let i = 0; i < node.childNodes.length; i++) { // 给子节点赋值
+        node.childNodes[i].expanded = value
+        if (node.childNodes[i].childNodes.length > 0) { // 如果子节点还有子节点，递归
+          this.changeTreeNodeStatus(node.childNodes[i], value)
+        }
+      }
+    },
+    // 全选或全不选
+    handleCheckedTreeNodeAll(value) {
+      this.$refs.tree.setCheckedNodes(value ? this.treeList : [])
     }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-
-  .el-dialog{
-    min-width:350px !important;
-  }
-  .el-tree{
-    max-height:300px;
-  }
-  .el-select{
-    width: 100%;
-  }
+.tool-line{
+  margin-bottom: 10px;
+  margin-top: -15px;
+}
+.el-dialog{
+  min-width:350px !important;
+}
+.el-tree{
+  min-height:100px;
+  max-height:300px;
+}
+.el-select{
+  width: 100%;
+}
 </style>
diff --git a/src/views/system/role/editRole.vue b/src/views/system/role/editRole.vue
index 69219e8..fd0fc41 100644
--- a/src/views/system/role/editRole.vue
+++ b/src/views/system/role/editRole.vue
@@ -8,7 +8,13 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="别名" prop="tips">
+          <el-form-item label="" prop="tips">
+            <span slot="label">
+              别名
+              <el-tooltip content="用于后台身份识别。administrator表示超级管理员, user表示其他用户" placement="top">
+                <i class="el-icon-warning-outline" />
+              </el-tooltip>
+            </span>
             <el-input v-model.trim="roleForm.tips" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
diff --git a/src/views/system/role/functionPerm.vue b/src/views/system/role/functionPerm.vue
index e7b5d51..cee37d6 100644
--- a/src/views/system/role/functionPerm.vue
+++ b/src/views/system/role/functionPerm.vue
@@ -1,14 +1,26 @@
 <template>
-  <el-dialog v-loading="dialogLoading" :visible.sync="dialogFormVisible" :title="titleText" width="330px" append-to-body>
+  <el-dialog :visible.sync="dialogFormVisible" :title="titleText" width="350px" append-to-body>
+    <!--功能-->
+    <div class="tool-line">
+      <el-checkbox v-model="treeExpand" @change="handleCheckedTreeExpand($event)">
+        展开
+      </el-checkbox>
+      <el-checkbox v-model="nodeCheckedAll" @change="handleCheckedTreeNodeAll($event)">
+        全选
+      </el-checkbox>
+      <el-checkbox v-model="treeCheckStrictly">
+        父子联动
+      </el-checkbox>
+    </div>
     <el-scrollbar>
       <el-tree
         ref="tree"
         v-loading="loading"
         :props="defaultProps"
-        :data="resourceTreeList"
+        :data="treeList"
         :default-expanded-keys="defaultExpanded"
         :default-checked-keys="defaultChecked"
-        check-strictly
+        :check-strictly="!treeCheckStrictly"
         show-checkbox
         node-key="id"
       />
@@ -40,22 +52,23 @@
         label: 'name',
         children: 'children'
       },
-      resourceTreeList: [], // 资源树列表数据
+      treeList: [], // 资源树列表数据
       defaultExpanded: [], // 默认展开的项
       defaultChecked: [], // 默认选中的树
-      ids: [],
       loading: false, // 加载动态效果
-      dialogLoading: false
+      treeExpand: false, // 展开
+      nodeCheckedAll: false, // 全选
+      treeCheckStrictly: true // 父子联动
     }
   },
   computed: {
-    titleText: function() {
+    titleText() {
       return this.roleName + ''
     }
   },
   methods: {
     // 初始化对话框
-    initDialog: function(row) {
+    initDialog(row) {
       this.loading = true
       this.roleName = row.name
       this.roleId = row.id
@@ -63,10 +76,10 @@
       this.fetchResourceTree()
     },
     // 获取资源列表
-    fetchResourceTree: function() {
+    fetchResourceTree() {
       getResourceListByRole(this.roleId).then(response => {
         if (response.data) {
-          this.resourceTreeList = toTreeList(response.data)
+          this.treeList = toTreeList(response.data)
           const temp = getShowItem(response.data) // 获取展开项和选中项
           this.defaultExpanded = temp[0]
           this.defaultChecked = temp[1]
@@ -75,28 +88,51 @@
       })
     },
     // 保存数据
-    saveData: function() {
-      this.ids = this.$refs.tree.getCheckedKeys()
-      this.dialogLoading = true
-      funcAuthor(this.roleId, this.ids).then(response => {
+    saveData() {
+      const ids = this.$refs.tree.getCheckedKeys()
+      funcAuthor(this.roleId, ids).then(response => {
         if (response.code === 200) {
-          this.dialogLoading = false
           this.$message.success('权限配置成功')
           this.dialogFormVisible = false
         }
       })
+    },
+    // 展开/折叠
+    handleCheckedTreeExpand(value) {
+      this.changeTreeNodeStatus(this.$refs.tree.store.root, value)
+    },
+    /**
+     * 改变树节点展开状态，递归
+     * @param node 改变的节点
+     * @param value 展开/折叠
+     */
+    changeTreeNodeStatus(node, value) {
+      node.expanded = value // 给当前节点赋值
+      for (let i = 0; i < node.childNodes.length; i++) { // 给子节点赋值
+        node.childNodes[i].expanded = value
+        if (node.childNodes[i].childNodes.length > 0) { // 如果子节点还有子节点，递归
+          this.changeTreeNodeStatus(node.childNodes[i], value)
+        }
+      }
+    },
+    // 全选或全不选
+    handleCheckedTreeNodeAll(value) {
+      this.$refs.tree.setCheckedNodes(value ? this.treeList : [])
     }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-
+.tool-line{
+  margin-bottom: 10px;
+  margin-top: -15px;
+}
   .el-dialog{
     min-width:350px !important;
   }
   .el-tree{
-    max-height:300px;
+    height:300px;
   }
   .el-select{
     width: 100%;
diff --git a/src/views/system/user/editUser.vue b/src/views/system/user/editUser.vue
index d22cd09..c9eb42f 100644
--- a/src/views/system/user/editUser.vue
+++ b/src/views/system/user/editUser.vue
@@ -1,10 +1,10 @@
 <template>
-  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" width="700" append-to-body>
     <el-form ref="dataForm" :rules="rules" :model="userForm" label-position="right" label-width="80px">
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="账号" prop="account">
-            <el-input v-model.trim="userForm.account" :disabled="ifdisabled" type="text" placeholder="必填" />
+            <el-input v-model.trim="userForm.account" :disabled="dialogStatus=='update'" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -52,17 +52,16 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item v-if="!ifdisabled" label="角色" prop="roleid">
-            <select-tree v-model="userForm.roleid" :options="roleTreeList" :props="roleProps" />
+          <el-form-item v-if="dialogStatus=='create'" label="角色" prop="roleid">
+            <select-tree v-model="userForm.roleid" :default-expanded-keys="[userForm.roleid]" :options="roleTreeList" :props="roleProps" />
           </el-form-item>
           <el-form-item v-else label="角色">
-            <el-input v-model="roleName" :disabled="ifdisabled" type="text" placeholder="无" />
+            <el-input v-model="roleName" :disabled="dialogStatus=='update'" type="text" placeholder="无" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="组织机构" prop="deptId">
-            <dept-select v-model="userForm.deptId" :dept-show="deptShow" placeholder="请选择组织机构" />
-            <!--<select-tree v-model="userForm.deptId" :options="deptTreeList" :props="deptProps" />-->
+            <dept-select v-model="userForm.deptId" :dept-show="true" :default-expanded-keys="[userForm.roleid]" placeholder="请选择组织机构" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -94,17 +93,16 @@
 import { toTreeList } from '@/utils/structure'
 import SelectTree from '@/components/SelectTree/singleSelect'
 import DeptSelect from '@/components/DeptSelect'
-// import { getDeptTreeList } from '@/api/system/dept'
+import { regularReg } from '@/utils/validate'
 import { getRoleTreeList } from '@/api/system/role'
 import { addUser, updateUser } from '@/api/system/user'
-import { RSAencrypt } from '../../../utils/security'
+import { RSAencrypt } from '@/utils/security'
 
 export default {
   name: 'EditUser',
   components: { SelectTree, DeptSelect },
   data() {
     const validatePass = (rule, value, callback) => {
-      console.log('验证密码')
       if (value === '') {
         callback(new Error('密码不能为空'))
       } else {
@@ -115,7 +113,6 @@
       }
     }
     const validatePass2 = (rule, value, callback) => {
-      console.log('验证重复密码')
       if (value === '') {
         callback(new Error('重复密码不能为空'))
       } else if (value !== this.userForm.password) {
@@ -139,35 +136,14 @@
         rePassword: '', // 重复密码
         birthday: ''
       }, // 表单
-      deptProps: {
-        parent: 'pid',
-        value: 'id',
-        label: 'name',
-        children: 'children'
-      },
-      roleProps: {
-        parent: 'pid',
-        value: 'id',
-        label: 'name',
-        children: 'children'
-      },
-      deptTreeList: null, // 组织树列表数据
+      deptProps: { parent: 'pid', value: 'id', label: 'name', children: 'children' },
+      roleProps: { parent: 'pid', value: 'id', label: 'name', children: 'children' },
       roleTreeList: null, // 角色树列表数据
-      sexList: [
-        {
-          label: '男',
-          value: '0'
-        },
-        {
-          label: '女',
-          value: '1'
-        }
-      ],
+      sexList: this.$store.getters.sexList, // 性别选项
       textMap: {
-        update: '编辑',
-        create: '新增'
+        update: '编辑用户',
+        create: '新增用户'
       }, // 表头显示标题
-      ifdisabled: true, // 是否可修改
       rules: {
         account: [{ required: true, message: '账号不能为空', trigger: ['blur', 'change'] }],
         name: [{ required: true, message: '姓名不能为空', trigger: ['blur', 'change'] }],
@@ -175,34 +151,14 @@
         rePassword: [{ required: true, validator: validatePass2, trigger: ['blur', 'change'] }],
         deptId: [{ required: true, message: '组织机构必选', trigger: ['blur', 'change'] }],
         roleid: [{ required: true, message: '角色必选', trigger: ['blur', 'change'] }],
-        email: [{
-          required: false, // 是否必填
-          message: '请输入邮箱地址', // 错误提示信息
-          trigger: 'blur'// 检验方式（blur为鼠标点击其他地方，）
-        },
-        {
-          type: 'email', // 要检验的类型（number，email，date等）
-          message: '请输入正确的邮箱地址',
-          trigger: ['blur', 'change'] }],
-        phone: [{
-          required: false,
-          pattern: /^1[34578]\d{9}$/, // 可以写正则表达式呦呦呦
-          message: '请输入正确的手机号',
-          trigger: ['blur', 'change'] }]
+        email: [{ required: false, message: '请输入邮箱地址', trigger: 'blur' }, { type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }],
+        phone: [{ required: false, pattern: regularReg.mobile, message: '请输入正确的手机号', trigger: ['blur', 'change'] }]
       }, // 前端校验规则
-      roleName: '',
-      deptShow: true,
+      roleName: '', // 角色名，展示用
       btnLoading: false // 保存按钮的加载中状态
     }
   },
-  computed: {
-    userTree: function() {
-      const tree = toTreeList(this.userTreeList)
-      console.log(tree)
-      return tree
-    }
-  },
-  mounted: function() {
+  created() {
     this.fetchRoleTree()
   },
   methods: {
@@ -211,15 +167,12 @@
       this.dialogStatus = dialogStatus
       this.dialogFormVisible = true
       this.btnLoading = false
-      this.fetchRoleTree()
       if (dialogStatus === 'create') { // 如果是新增，清除验证
-        this.ifdisabled = false
         this.resetForm()
         this.$nextTick(() => {
           this.$refs['dataForm'].clearValidate()
         })
       } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
-        this.ifdisabled = true
         this.userForm = {
           id: row.id, // 编号
           account: row.account, // 账号
@@ -239,11 +192,9 @@
     // 加载角色树形下拉菜单
     fetchRoleTree: function() {
       getRoleTreeList(this.listQuery).then(response => {
-        console.log('fetchRoleTree:')
         console.log(response.data)
-        if (response.data.list) {
+        if (response.data.list) { // 将列表转树结构
           this.roleTreeList = toTreeList(response.data.list, '0', true)
-          console.log(this.roleTreeList)
         }
       })
     },
@@ -327,10 +278,6 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-
-  .el-dialog{
-    width:700px
-  }
   .el-select{
     width: 100%;
   }
diff --git a/src/views/system/user/listUser.vue b/src/views/system/user/listUser.vue
index 0e1eb07..a3c4758 100644
--- a/src/views/system/user/listUser.vue
+++ b/src/views/system/user/listUser.vue
@@ -63,12 +63,23 @@
           </template>
         </search-area>
         <!--查询结果Table显示-->
-        <normal-table ref="normalTable" :style="{'min-height':(bodyHeight-118)+'px'}" class="table" :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading" size="small" @change="changePage">
+        <normal-table
+          ref="normalTable"
+          :style="{'min-height':(bodyHeight-118)+'px'}"
+          class="table"
+          :data="list"
+          :total="total"
+          :columns="columns"
+          :query="listQuery"
+          :list-loading="listLoading"
+          size="small"
+          @change="changePage"
+        >
           <template slot="preColumns">
             <el-table-column label="选择" width="55" header-align="center" align="center">
-              <template slot-scope="scope">
+              <template v-slot="scope">
                 <el-radio v-model="radio" :label="scope.$index" class="radio">
-                  &nbsp;
+&nbsp
                 </el-radio>
               </template>
             </el-table-column>
@@ -76,7 +87,7 @@
           <template slot="columns">
             <!--冻结状态-->
             <el-table-column label="状态" width="80" align="center">
-              <template slot-scope="scope">
+              <template v-slot="scope">
                 <el-tag :type="tagNames[scope.row.statusName]" size="medium">
                   {{ scope.row.statusName }}
                 </el-tag>
@@ -129,25 +140,16 @@
         sort: 'id'
       },
       registerTime: [], // 注册时间范围
-      tagNames: {
-        '已冻结': 'danger',
-        '启用': 'success'
-      },
-      btnNames: {
-        '已冻结': '解冻',
-        '启用': '冻结'
-      },
-      btnStatus: {
-        '已冻结': '',
-        '启用': 'primary'
-      },
+      tagNames: { '已冻结': 'danger', '启用': 'success' },
+      btnNames: { '已冻结': '解冻', '启用': '冻结' },
+      btnStatus: { '已冻结': '', '启用': 'primary' },
       columns: [
         { text: '账号', value: 'account' },
         { text: '所在组织机构', value: 'deptName', width: 150 },
         { text: '真实姓名', value: 'name' },
         { text: '角色', value: 'roleName' },
         { text: '手机号', value: 'phone' },
-        { text: '注册日期', value: 'createtime' }
+        { text: '注册时间', value: 'createtime' }
       ],
       list: [],
       total: 0,
@@ -158,7 +160,6 @@
       },
       treeLoading: false,
       listLoading: false,
-      dialogStatus: '',
       editShow: false, // 编辑组件是否显示
       roleAssignShow: false, // 角色分配组件是否显示
       expandAllNode: true,
@@ -186,17 +187,15 @@
   methods: {
     // 打开新增对话框
     add() {
-      this.dialogStatus = 'create'
       this.editShow = true
-      this.$refs.edituser.initDialog(this.dialogStatus)
+      this.$refs.edituser.initDialog('create')
     },
     // 打开修改对话框
     edit() {
       if (this.singleCheck()) {
-        this.dialogStatus = 'update'
         this.editShow = true
         const row = this.list[this.radio]
-        this.$refs.edituser.initDialog(this.dialogStatus, row)
+        this.$refs.edituser.initDialog('update', row)
       } else {
         this.$message.error('必须选中一项')
       }