diff --git a/mock/system/role.js b/mock/system/role.js
index 9aab42f..1648010 100644
--- a/mock/system/role.js
+++ b/mock/system/role.js
@@ -1,10 +1,3 @@
-const tree = [
-  {
-    'id': 1,
-    'pid': '0',
-    'name': '超级管理员'
-  }
-]
 const list = [
   {
     'deptName': '顶级',
@@ -30,34 +23,8 @@
   }
 ]
 module.exports = [
-  // mock get all routes form server
   {
-    url: '/sys/role/list',
-    type: 'get',
-    response: _ => {
-      return {
-        code: 200,
-        data: list
-      }
-    }
-  },
-
-  // mock get all roles form server
-  {
-    url: '/sys/role/tree',
-    type: 'get',
-    response: _ => {
-      return {
-        'code': 200,
-        'message': 'success',
-        'data': {
-          'list': tree
-        }
-      }
-    }
-  },
-  {
-    url: '/sys/dict/code/dataScopeType',
+    url: 'sys/dict/code/dataScopeType',
     type: 'get',
     response: _ => {
       return {
@@ -89,28 +56,7 @@
     }
   },
   {
-    url: '/sys/role/treeByUserId',
-    type: 'get',
-    response: _ => {
-      return {
-        code: 200,
-        message: 'success',
-        data: {
-          'list': [
-            {
-              'id': 1,
-              'pid': '0',
-              'name': '超级管理员',
-              'open': true,
-              'checked': false
-            }
-          ]
-        }
-      }
-    }
-  },
-  {
-    url: '/sys/role/treeByRoleId',
+    url: 'sys/role/treeByRoleId',
     type: 'get',
     response: _ => {
       return {
@@ -142,7 +88,18 @@
     }
   },
   {
-    url: '/sys/role/add',
+    url: 'sys/role/treeByUserId',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        message: 'success',
+        data: [{ 'id': 1, 'pid': '0', 'name': '超级管理员', 'open': true, 'checked': false }]
+      }
+    }
+  },
+  {
+    url: 'sys/role/add',
     type: 'post',
     response: _ => {
       return {
@@ -153,7 +110,7 @@
     }
   },
   {
-    url: '/sys/role/update',
+    url: 'sys/role/update',
     type: 'post',
     response: _ => {
       return {
@@ -197,6 +154,31 @@
     }
   },
   {
+    url: 'sys/role/tree',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        message: 'ok',
+        data: {
+          list: [
+            { 'id': 1, 'pid': '0', 'name': '超级管理员' }
+          ]
+        }
+      }
+    }
+  },
+  {
+    url: '/sys/role/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: list
+      }
+    }
+  },
+  {
     url: '/sys/dict/code/dataScopeType',
     type: 'get',
     response: _ => {

diff --git a/mock/system/role.js b/mock/system/role.js
index 9aab42f..1648010 100644
--- a/mock/system/role.js
+++ b/mock/system/role.js
@@ -1,10 +1,3 @@
-const tree = [
-  {
-    'id': 1,
-    'pid': '0',
-    'name': '超级管理员'
-  }
-]
 const list = [
   {
     'deptName': '顶级',
@@ -30,34 +23,8 @@
   }
 ]
 module.exports = [
-  // mock get all routes form server
   {
-    url: '/sys/role/list',
-    type: 'get',
-    response: _ => {
-      return {
-        code: 200,
-        data: list
-      }
-    }
-  },
-
-  // mock get all roles form server
-  {
-    url: '/sys/role/tree',
-    type: 'get',
-    response: _ => {
-      return {
-        'code': 200,
-        'message': 'success',
-        'data': {
-          'list': tree
-        }
-      }
-    }
-  },
-  {
-    url: '/sys/dict/code/dataScopeType',
+    url: 'sys/dict/code/dataScopeType',
     type: 'get',
     response: _ => {
       return {
@@ -89,28 +56,7 @@
     }
   },
   {
-    url: '/sys/role/treeByUserId',
-    type: 'get',
-    response: _ => {
-      return {
-        code: 200,
-        message: 'success',
-        data: {
-          'list': [
-            {
-              'id': 1,
-              'pid': '0',
-              'name': '超级管理员',
-              'open': true,
-              'checked': false
-            }
-          ]
-        }
-      }
-    }
-  },
-  {
-    url: '/sys/role/treeByRoleId',
+    url: 'sys/role/treeByRoleId',
     type: 'get',
     response: _ => {
       return {
@@ -142,7 +88,18 @@
     }
   },
   {
-    url: '/sys/role/add',
+    url: 'sys/role/treeByUserId',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        message: 'success',
+        data: [{ 'id': 1, 'pid': '0', 'name': '超级管理员', 'open': true, 'checked': false }]
+      }
+    }
+  },
+  {
+    url: 'sys/role/add',
     type: 'post',
     response: _ => {
       return {
@@ -153,7 +110,7 @@
     }
   },
   {
-    url: '/sys/role/update',
+    url: 'sys/role/update',
     type: 'post',
     response: _ => {
       return {
@@ -197,6 +154,31 @@
     }
   },
   {
+    url: 'sys/role/tree',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        message: 'ok',
+        data: {
+          list: [
+            { 'id': 1, 'pid': '0', 'name': '超级管理员' }
+          ]
+        }
+      }
+    }
+  },
+  {
+    url: '/sys/role/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: list
+      }
+    }
+  },
+  {
     url: '/sys/dict/code/dataScopeType',
     type: 'get',
     response: _ => {
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/mock/system/role.js b/mock/system/role.js
index 9aab42f..1648010 100644
--- a/mock/system/role.js
+++ b/mock/system/role.js
@@ -1,10 +1,3 @@
-const tree = [
-  {
-    'id': 1,
-    'pid': '0',
-    'name': '超级管理员'
-  }
-]
 const list = [
   {
     'deptName': '顶级',
@@ -30,34 +23,8 @@
   }
 ]
 module.exports = [
-  // mock get all routes form server
   {
-    url: '/sys/role/list',
-    type: 'get',
-    response: _ => {
-      return {
-        code: 200,
-        data: list
-      }
-    }
-  },
-
-  // mock get all roles form server
-  {
-    url: '/sys/role/tree',
-    type: 'get',
-    response: _ => {
-      return {
-        'code': 200,
-        'message': 'success',
-        'data': {
-          'list': tree
-        }
-      }
-    }
-  },
-  {
-    url: '/sys/dict/code/dataScopeType',
+    url: 'sys/dict/code/dataScopeType',
     type: 'get',
     response: _ => {
       return {
@@ -89,28 +56,7 @@
     }
   },
   {
-    url: '/sys/role/treeByUserId',
-    type: 'get',
-    response: _ => {
-      return {
-        code: 200,
-        message: 'success',
-        data: {
-          'list': [
-            {
-              'id': 1,
-              'pid': '0',
-              'name': '超级管理员',
-              'open': true,
-              'checked': false
-            }
-          ]
-        }
-      }
-    }
-  },
-  {
-    url: '/sys/role/treeByRoleId',
+    url: 'sys/role/treeByRoleId',
     type: 'get',
     response: _ => {
       return {
@@ -142,7 +88,18 @@
     }
   },
   {
-    url: '/sys/role/add',
+    url: 'sys/role/treeByUserId',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        message: 'success',
+        data: [{ 'id': 1, 'pid': '0', 'name': '超级管理员', 'open': true, 'checked': false }]
+      }
+    }
+  },
+  {
+    url: 'sys/role/add',
     type: 'post',
     response: _ => {
       return {
@@ -153,7 +110,7 @@
     }
   },
   {
-    url: '/sys/role/update',
+    url: 'sys/role/update',
     type: 'post',
     response: _ => {
       return {
@@ -197,6 +154,31 @@
     }
   },
   {
+    url: 'sys/role/tree',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        message: 'ok',
+        data: {
+          list: [
+            { 'id': 1, 'pid': '0', 'name': '超级管理员' }
+          ]
+        }
+      }
+    }
+  },
+  {
+    url: '/sys/role/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: list
+      }
+    }
+  },
+  {
     url: '/sys/dict/code/dataScopeType',
     type: 'get',
     response: _ => {
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/mock/system/role.js b/mock/system/role.js
index 9aab42f..1648010 100644
--- a/mock/system/role.js
+++ b/mock/system/role.js
@@ -1,10 +1,3 @@
-const tree = [
-  {
-    'id': 1,
-    'pid': '0',
-    'name': '超级管理员'
-  }
-]
 const list = [
   {
     'deptName': '顶级',
@@ -30,34 +23,8 @@
   }
 ]
 module.exports = [
-  // mock get all routes form server
   {
-    url: '/sys/role/list',
-    type: 'get',
-    response: _ => {
-      return {
-        code: 200,
-        data: list
-      }
-    }
-  },
-
-  // mock get all roles form server
-  {
-    url: '/sys/role/tree',
-    type: 'get',
-    response: _ => {
-      return {
-        'code': 200,
-        'message': 'success',
-        'data': {
-          'list': tree
-        }
-      }
-    }
-  },
-  {
-    url: '/sys/dict/code/dataScopeType',
+    url: 'sys/dict/code/dataScopeType',
     type: 'get',
     response: _ => {
       return {
@@ -89,28 +56,7 @@
     }
   },
   {
-    url: '/sys/role/treeByUserId',
-    type: 'get',
-    response: _ => {
-      return {
-        code: 200,
-        message: 'success',
-        data: {
-          'list': [
-            {
-              'id': 1,
-              'pid': '0',
-              'name': '超级管理员',
-              'open': true,
-              'checked': false
-            }
-          ]
-        }
-      }
-    }
-  },
-  {
-    url: '/sys/role/treeByRoleId',
+    url: 'sys/role/treeByRoleId',
     type: 'get',
     response: _ => {
       return {
@@ -142,7 +88,18 @@
     }
   },
   {
-    url: '/sys/role/add',
+    url: 'sys/role/treeByUserId',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        message: 'success',
+        data: [{ 'id': 1, 'pid': '0', 'name': '超级管理员', 'open': true, 'checked': false }]
+      }
+    }
+  },
+  {
+    url: 'sys/role/add',
     type: 'post',
     response: _ => {
       return {
@@ -153,7 +110,7 @@
     }
   },
   {
-    url: '/sys/role/update',
+    url: 'sys/role/update',
     type: 'post',
     response: _ => {
       return {
@@ -197,6 +154,31 @@
     }
   },
   {
+    url: 'sys/role/tree',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        message: 'ok',
+        data: {
+          list: [
+            { 'id': 1, 'pid': '0', 'name': '超级管理员' }
+          ]
+        }
+      }
+    }
+  },
+  {
+    url: '/sys/role/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: list
+      }
+    }
+  },
+  {
     url: '/sys/dict/code/dataScopeType',
     type: 'get',
     response: _ => {
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/mock/system/role.js b/mock/system/role.js
index 9aab42f..1648010 100644
--- a/mock/system/role.js
+++ b/mock/system/role.js
@@ -1,10 +1,3 @@
-const tree = [
-  {
-    'id': 1,
-    'pid': '0',
-    'name': '超级管理员'
-  }
-]
 const list = [
   {
     'deptName': '顶级',
@@ -30,34 +23,8 @@
   }
 ]
 module.exports = [
-  // mock get all routes form server
   {
-    url: '/sys/role/list',
-    type: 'get',
-    response: _ => {
-      return {
-        code: 200,
-        data: list
-      }
-    }
-  },
-
-  // mock get all roles form server
-  {
-    url: '/sys/role/tree',
-    type: 'get',
-    response: _ => {
-      return {
-        'code': 200,
-        'message': 'success',
-        'data': {
-          'list': tree
-        }
-      }
-    }
-  },
-  {
-    url: '/sys/dict/code/dataScopeType',
+    url: 'sys/dict/code/dataScopeType',
     type: 'get',
     response: _ => {
       return {
@@ -89,28 +56,7 @@
     }
   },
   {
-    url: '/sys/role/treeByUserId',
-    type: 'get',
-    response: _ => {
-      return {
-        code: 200,
-        message: 'success',
-        data: {
-          'list': [
-            {
-              'id': 1,
-              'pid': '0',
-              'name': '超级管理员',
-              'open': true,
-              'checked': false
-            }
-          ]
-        }
-      }
-    }
-  },
-  {
-    url: '/sys/role/treeByRoleId',
+    url: 'sys/role/treeByRoleId',
     type: 'get',
     response: _ => {
       return {
@@ -142,7 +88,18 @@
     }
   },
   {
-    url: '/sys/role/add',
+    url: 'sys/role/treeByUserId',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        message: 'success',
+        data: [{ 'id': 1, 'pid': '0', 'name': '超级管理员', 'open': true, 'checked': false }]
+      }
+    }
+  },
+  {
+    url: 'sys/role/add',
     type: 'post',
     response: _ => {
       return {
@@ -153,7 +110,7 @@
     }
   },
   {
-    url: '/sys/role/update',
+    url: 'sys/role/update',
     type: 'post',
     response: _ => {
       return {
@@ -197,6 +154,31 @@
     }
   },
   {
+    url: 'sys/role/tree',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        message: 'ok',
+        data: {
+          list: [
+            { 'id': 1, 'pid': '0', 'name': '超级管理员' }
+          ]
+        }
+      }
+    }
+  },
+  {
+    url: '/sys/role/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: list
+      }
+    }
+  },
+  {
     url: '/sys/dict/code/dataScopeType',
     type: 'get',
     response: _ => {
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%;