diff --git a/src/api/common.js b/src/api/common.js
new file mode 100644
index 0000000..d4ab267
--- /dev/null
+++ b/src/api/common.js
@@ -0,0 +1,31 @@
+import request from '@/utils/request'
+
+
+
+
+
+export function listCommondepartment(params) {
+  return request({
+    url: '/api/admin/other/admin-department-list',
+    method: 'get',
+    params:params
+  })
+}
+
+
+export function listCommonuser(params) {
+  return request({
+    url: '/api/admin/other/admin-user-list',
+    method: 'get',
+    params:params
+  })
+}
+
+
+export function remoteStatistic(params) {
+  return request({
+    url: '/api/admin/other/remot-statistic',
+    method: 'get',
+    params:params
+  })
+}
diff --git a/src/api/system/role.js b/src/api/system/role.js
index bfa6f41..06da4c9 100644
--- a/src/api/system/role.js
+++ b/src/api/system/role.js
@@ -13,7 +13,8 @@ export function list() {
     url: '/api/admin/role',
     method: 'get'
   })
-}
+}
+
 export function del(data) {
   return request({
     url: '/api/admin/role/delete',
@@ -21,3 +22,12 @@ export function del(data) {
     data
   })
 }
+
+
+export function set(data) {
+  return request({
+    url: '/api/admin/admin/set-roles-many',
+    method: 'post',
+    data
+  })
+}
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index e9ea249..93b3ccd 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -1,133 +1,140 @@
-<template>
-  <div class="navbar">
-    <hamburger :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
-
-    <breadcrumb class="breadcrumb-container" />
-
-    <div class="right-menu">
-      <el-dropdown class="avatar-container" trigger="click">
-        <div class="avatar-wrapper">
-          <img src="../../assets/face.jpg" class="user-avatar">
-          <i class="el-icon-caret-bottom" />
-        </div>
-        <el-dropdown-menu slot="dropdown" class="user-dropdown">
-          <router-link to="/">
-            <el-dropdown-item>
-              系统首页
-            </el-dropdown-item>
-          </router-link>
-          <el-dropdown-item divided @click.native="logout">
-            <span style="display:block;">退出</span>
-          </el-dropdown-item>
-        </el-dropdown-menu>
-      </el-dropdown>
-    </div>
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-import Breadcrumb from '@/components/Breadcrumb'
-import Hamburger from '@/components/Hamburger'
-
-export default {
-  components: {
-    Breadcrumb,
-    Hamburger
-  },
-  computed: {
-    ...mapGetters([
-      'sidebar',
-      'avatar'
-    ])
-  },
-  methods: {
-    toggleSideBar() {
-      this.$store.dispatch('app/toggleSideBar')
-    },
-    async logout() {
-      await this.$store.dispatch('user/logout')
-      this.$router.push(`/login?redirect=${this.$route.fullPath}`)
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.navbar {
-  height: 50px;
-  overflow: hidden;
-  position: relative;
-  background: #fff;
-  box-shadow: 0 1px 4px rgba(0,21,41,.08);
-
-  .hamburger-container {
-    line-height: 46px;
-    height: 100%;
-    float: left;
-    cursor: pointer;
-    transition: background .3s;
-    -webkit-tap-highlight-color:transparent;
-
-    &:hover {
-      background: rgba(0, 0, 0, .025)
-    }
-  }
-
-  .breadcrumb-container {
-    float: left;
-  }
-
-  .right-menu {
-    float: right;
-    height: 100%;
-    line-height: 50px;
-
-    &:focus {
-      outline: none;
-    }
-
-    .right-menu-item {
-      display: inline-block;
-      padding: 0 8px;
-      height: 100%;
-      font-size: 18px;
-      color: #5a5e66;
-      vertical-align: text-bottom;
-
-      &.hover-effect {
-        cursor: pointer;
-        transition: background .3s;
-
-        &:hover {
-          background: rgba(0, 0, 0, .025)
-        }
-      }
-    }
-
-    .avatar-container {
-      margin-right: 30px;
-
-      .avatar-wrapper {
-        margin-top: 5px;
-        position: relative;
-
-        .user-avatar {
-          cursor: pointer;
-          width: 40px;
-          height: 40px;
-          border-radius: 10px;
-        }
-
-        .el-icon-caret-bottom {
-          cursor: pointer;
-          position: absolute;
-          right: -20px;
-          top: 25px;
-          font-size: 12px;
-        }
-      }
-    }
-  }
-}
+<template>
+  <div class="navbar">
+    <hamburger :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
+
+    <breadcrumb class="breadcrumb-container" />
+
+    <div class="right-menu">
+      <el-dropdown class="avatar-container" trigger="click">
+        <div class="avatar-wrapper">
+          <img src="../../assets/face.jpg" class="user-avatar">
+          <i class="el-icon-caret-bottom" />
+        </div>
+        <el-dropdown-menu slot="dropdown" class="user-dropdown">
+          <router-link to="/">
+            <el-dropdown-item>
+              系统首页
+            </el-dropdown-item>
+          </router-link>
+          <router-link to="/info/password">
+            <el-dropdown-item>
+              个人信息
+            </el-dropdown-item>
+          </router-link>
+          <el-dropdown-item divided @click.native="logout">
+            <span style="display:block;">退出</span>
+          </el-dropdown-item>
+        </el-dropdown-menu>
+      </el-dropdown>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {
+    mapGetters
+  } from 'vuex'
+  import Breadcrumb from '@/components/Breadcrumb'
+  import Hamburger from '@/components/Hamburger'
+
+  export default {
+    components: {
+      Breadcrumb,
+      Hamburger
+    },
+    computed: {
+      ...mapGetters([
+        'sidebar',
+        'avatar'
+      ])
+    },
+    methods: {
+      toggleSideBar() {
+        this.$store.dispatch('app/toggleSideBar')
+      },
+      async logout() {
+        await this.$store.dispatch('user/logout')
+        this.$router.push(`/login?redirect=${this.$route.fullPath}`)
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .navbar {
+    height: 50px;
+    overflow: hidden;
+    position: relative;
+    background: #fff;
+    box-shadow: 0 1px 4px rgba(0, 21, 41, .08);
+
+    .hamburger-container {
+      line-height: 46px;
+      height: 100%;
+      float: left;
+      cursor: pointer;
+      transition: background .3s;
+      -webkit-tap-highlight-color: transparent;
+
+      &:hover {
+        background: rgba(0, 0, 0, .025)
+      }
+    }
+
+    .breadcrumb-container {
+      float: left;
+    }
+
+    .right-menu {
+      float: right;
+      height: 100%;
+      line-height: 50px;
+
+      &:focus {
+        outline: none;
+      }
+
+      .right-menu-item {
+        display: inline-block;
+        padding: 0 8px;
+        height: 100%;
+        font-size: 18px;
+        color: #5a5e66;
+        vertical-align: text-bottom;
+
+        &.hover-effect {
+          cursor: pointer;
+          transition: background .3s;
+
+          &:hover {
+            background: rgba(0, 0, 0, .025)
+          }
+        }
+      }
+
+      .avatar-container {
+        margin-right: 30px;
+
+        .avatar-wrapper {
+          margin-top: 5px;
+          position: relative;
+
+          .user-avatar {
+            cursor: pointer;
+            width: 40px;
+            height: 40px;
+            border-radius: 10px;
+          }
+
+          .el-icon-caret-bottom {
+            cursor: pointer;
+            position: absolute;
+            right: -20px;
+            top: 25px;
+            font-size: 12px;
+          }
+        }
+      }
+    }
+  }
 </style>
diff --git a/src/router/index.js b/src/router/index.js
index 7c5491a..3bf369d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,92 +1,106 @@
-import Vue from 'vue'
-import Router from 'vue-router'
-
-Vue.use(Router)
-
-/* Layout */
-import Layout from '@/layout'
-
-/**
- * Note: sub-menu only appear when route children.length >= 1
- * Detail see: https://panjiachen.github.io/vue-element-admin-site/guide/essentials/router-and-nav.html
- *
- * hidden: true                   if set true, item will not show in the sidebar(default is false)
- * alwaysShow: true               if set true, will always show the root menu
- *                                if not set alwaysShow, when item has more than one children route,
- *                                it will becomes nested mode, otherwise not show the root menu
- * redirect: noRedirect           if set noRedirect will no redirect in the breadcrumb
- * name:'router-name'             the name is used by <keep-alive> (must set!!!)
- * meta : {
-    roles: ['admin','editor']    control the page roles (you can set multiple roles)
-    title: 'title'               the name show in sidebar and breadcrumb (recommend set)
-    icon: 'svg-name'/'el-icon-x' the icon show in the sidebar
-    breadcrumb: false            if set false, the item will hidden in breadcrumb(default is true)
-    activeMenu: '/example/list'  if set path, the sidebar will highlight the path you set
-  }
- */
-
-/**
- * constantRoutes
- * a base page that does not have permission requirements
- * all roles can be accessed
- */
-export const constantRoutes = [{
-  path: '/login',
-  component: () => import('@/views/login/index'),
-  hidden: true
-},
-
-  {
-    path: '/404',
-    component: () => import('@/views/404'),
-    hidden: true
-  },
-  {
-    path: '/',
-    component: Layout,
-    redirect: '/dashboard',
-    children: [{
-      path: 'dashboard',
-      name: '系统首页',
-      component: () => import('@/views/dashboard/index'),
-      meta: {
-        title: '系统首页',
-        icon: 'dashboard'
-      }
-    },
-    ]
-  }
-]
-
-/**
- * asyncRoutes
- * the routes that need to be dynamically loaded based on user roles
- */
-export const asyncRoutes = [
-
-
-  // 404 page must be placed at the end !!!
-  {
-    path: '*',
-    redirect: '/404',
-    hidden: true
-  }
-]
-
-const createRouter = () => new Router({
-  // mode: 'history', // require service support
-  scrollBehavior: () => ({
-    y: 0
-  }),
-  routes: constantRoutes
-})
-
-const router = createRouter()
-
-// Detail see: https://github.com/vuejs/vue-router/issues/1234#issuecomment-357941465
-export function resetRouter() {
-  const newRouter = createRouter()
-  router.matcher = newRouter.matcher // reset router
-}
-
+import Vue from 'vue'
+import Router from 'vue-router'
+
+Vue.use(Router)
+
+/* Layout */
+import Layout from '@/layout'
+
+/**
+ * Note: sub-menu only appear when route children.length >= 1
+ * Detail see: https://panjiachen.github.io/vue-element-admin-site/guide/essentials/router-and-nav.html
+ *
+ * hidden: true                   if set true, item will not show in the sidebar(default is false)
+ * alwaysShow: true               if set true, will always show the root menu
+ *                                if not set alwaysShow, when item has more than one children route,
+ *                                it will becomes nested mode, otherwise not show the root menu
+ * redirect: noRedirect           if set noRedirect will no redirect in the breadcrumb
+ * name:'router-name'             the name is used by <keep-alive> (must set!!!)
+ * meta : {
+    roles: ['admin','editor']    control the page roles (you can set multiple roles)
+    title: 'title'               the name show in sidebar and breadcrumb (recommend set)
+    icon: 'svg-name'/'el-icon-x' the icon show in the sidebar
+    breadcrumb: false            if set false, the item will hidden in breadcrumb(default is true)
+    activeMenu: '/example/list'  if set path, the sidebar will highlight the path you set
+  }
+ */
+
+/**
+ * constantRoutes
+ * a base page that does not have permission requirements
+ * all roles can be accessed
+ */
+export const constantRoutes = [{
+    path: '/login',
+    component: () => import('@/views/login/index'),
+    hidden: true
+  },
+
+  {
+    path: '/404',
+    component: () => import('@/views/404'),
+    hidden: true
+  },
+
+  {
+    path: '/info',
+    component: Layout,
+    children: [{
+      path: 'password',
+      component: () => import('@/views/system/password'),
+      name: '密码修改',
+      meta: {
+        title: '密码修改'
+      }
+    }],
+    hidden: true
+  },
+
+  {
+    path: '/',
+    component: Layout,
+    redirect: '/dashboard',
+    children: [{
+      path: 'dashboard',
+      name: '系统首页',
+      component: () => import('@/views/dashboard/index'),
+      meta: {
+        title: '系统首页',
+        icon: 'dashboard'
+      }
+    }, ]
+  }
+]
+
+/**
+ * asyncRoutes
+ * the routes that need to be dynamically loaded based on user roles
+ */
+export const asyncRoutes = [
+
+
+  // 404 page must be placed at the end !!!
+  {
+    path: '*',
+    redirect: '/404',
+    hidden: true
+  }
+]
+
+const createRouter = () => new Router({
+  // mode: 'history', // require service support
+  scrollBehavior: () => ({
+    y: 0
+  }),
+  routes: constantRoutes
+})
+
+const router = createRouter()
+
+// Detail see: https://github.com/vuejs/vue-router/issues/1234#issuecomment-357941465
+export function resetRouter() {
+  const newRouter = createRouter()
+  router.matcher = newRouter.matcher // reset router
+}
+
 export default router
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 36db0b6..06fd367 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -76,40 +76,70 @@ const componentHandler = (path) => {
   }
   return loadView(path)
 }
-
-export function generaMenu(routes, data) {
-  data.forEach(item => {
-    if (item.url === "/") {
-
-    } else {
-      const menu = {
-        path: pathHandler(item.url,item.id),
-        //(item.path === '#'||item.path == '' ? item.id + '_key' : item.path),
-        component: componentHandler(item.url),
-        //(item.path === '#'||item.path == ''  ? Layout : loadView(item.path)),
-        // hidden: true,
-        // hidden: true,
-        children: [],
-        name: 'menu_' + item.id,
-        meta: {
-          title: item.name,
-          id: item.id,
-          roles: ['admin'],
-
-          icon: item.icon
-        }
-      }
-      if (item.children) {
-        generaMenu(menu.children, item.children)
-      }
-      routes.push(menu)
-    }
-  })
-  routes.push({
-    path: '*',
-    redirect: '/404',
-    hidden: true
-  })
+
+/**
+ * 后台查询的菜单数据拼装成路由格式的数据
+ * @param routes
+ */
+export function generaMenu(routes, data) {
+  data.forEach(item => {
+    if (item.url === "/") {
+      routes.push({
+        path: '/',
+        component: Layout,
+        redirect: '/dashboard',
+        children: [{
+          path: 'dashboard',
+          name: '系统首页',
+          component: () => import('@/views/dashboard/index'),
+          meta: {
+            title: '系统首页',
+            icon: 'dashboard'
+          }
+        }]
+      })
+    } else if (item.url === "##") {
+       routes.push({
+         path: item.path,
+         component: Layout,
+         children: [{
+           path: item.path,
+           name: item.name,
+          component:  item.url === '#' ? Layout : loadView(item.path),
+           meta: {
+             title: item.name,
+             id: item.id,
+             roles: ['admin'],
+             icon: item.icon
+           }
+         }]
+       })
+    } else {
+      var path = item.url;
+      if (item.path != "null" && item.path != null && item.path != "") {
+        path = item.path
+      }
+      const menu = {
+        path: (path === '#' ? item.id + '_key' : path),
+        redirect: (item.children.length > 0 ? "noRedirect" : ""),
+        component: item.url === '#' ? Layout : loadView(item.url),
+        // hidden: true,
+        children: [],
+        name: 'menu_' + item.id,
+        meta: {
+          title: item.name,
+          id: item.id,
+          roles: ['admin'],
+
+          icon: item.icon
+        }
+      }
+      if (item.children) {
+        generaMenu(menu.children, item.children)
+      }
+      routes.push(menu)
+    }
+  })
 }
 
 const mutations = {
diff --git a/src/views/system/components/Account.vue b/src/views/system/components/Account.vue
new file mode 100644
index 0000000..cb0d2f6
--- /dev/null
+++ b/src/views/system/components/Account.vue
@@ -0,0 +1,72 @@
+<template>
+  <el-form :model="form" ref="form" :rules="rules">
+    <el-form-item label="姓名" label-position="right" prop="name">
+      <el-input v-model.trim="form.name" />
+    </el-form-item>
+    <el-form-item label="密码" label-position="right" prop="password">
+      <el-input v-model.trim="form.password" type="password" />
+    </el-form-item>
+    <el-form-item>
+      <el-button type="primary" @click="submit">保存</el-button>
+    </el-form-item>
+  </el-form>
+</template>
+
+<script>
+  import {
+    save
+  } from '../../../api/system/user.js'
+  import {
+    getInfo
+  } from '../../../api/user.js'
+
+  export default {
+    data() {
+      return {
+        form: {
+          id: "",
+          name: "",
+          username: "",
+          password: ""
+        },
+        rules: {
+          name: [{
+            required: true,
+            message: '请输入姓名',
+            trigger: 'blur'
+          }],
+          password: [{
+            required: true,
+            message: '请输入密码',
+            trigger: 'blur',
+          }]
+        },
+      }
+    },
+    created() {
+      getInfo().then(res => {
+        this.form.id = res.id;
+        this.form.name = res.name
+        this.form.username = res.username
+      })
+    },
+    methods: {
+      submit() {
+        let that = this;
+        this.$refs["form"].validate((valid) => {
+          if (valid) {
+            save(that.form).then(response => {
+              this.$Message.success('操作成功');
+            }).catch(error => {
+              //reject(error)
+            })
+          } else {
+            this.$Message.error('数据校验失败');
+            console.log('error submit!!');
+            return false;
+          }
+        });
+      }
+    }
+  }
+</script>
diff --git a/src/views/system/components/Timeline.vue b/src/views/system/components/Timeline.vue
new file mode 100644
index 0000000..aad2ba2
--- /dev/null
+++ b/src/views/system/components/Timeline.vue
@@ -0,0 +1,54 @@
+<template>
+  <div class="block">
+    <el-timeline>
+      <el-timeline-item v-for="(item,index) of timeline" :key="index" :timestamp="item.timestamp" placement="top">
+        <el-card>
+          <h4>{{ item.created_at }}</h4>
+          <p>{{ item.name }}</p>
+        </el-card>
+      </el-timeline-item>
+    </el-timeline>
+  </div>
+</template>
+
+<script>
+  import {
+    listlog
+  } from "../../../api/system/log.js";
+  export default {
+    data() {
+      return {
+        timeline: [],
+        paginations: {
+          page: 1,
+          page_size: 15,
+          total: 0
+        },
+        tableHeight: 0,
+        //查询条件字段
+        searchFields: {
+          keyword: ""
+        }
+      }
+    },
+    created() {
+      this.load();
+    },
+    methods: {
+      load() {
+        var that = this;
+        listlog({
+          page: that.paginations.page,
+          ...this.searchFields
+        }).then(response => {
+          var data = response.data;
+          this.paginations.total = response.total;
+          that.timeline = data;
+        }).catch(error => {
+          console.log(error)
+          //reject(error)
+        })
+      }
+    }
+  }
+</script>
diff --git a/src/views/system/components/UserCard.vue b/src/views/system/components/UserCard.vue
new file mode 100644
index 0000000..3a38589
--- /dev/null
+++ b/src/views/system/components/UserCard.vue
@@ -0,0 +1,118 @@
+<template>
+  <el-card style="margin-bottom:20px;">
+    <div slot="header" class="clearfix">
+      <span>个人信息</span>
+    </div>
+
+    <div class="user-profile">
+      <div class="box-center">
+        <pan-thumb :image="user.avatar" :height="'100px'" :width="'100px'" :hoverable="false">
+          <div>Hello</div>
+          {{ user.role }}
+        </pan-thumb>
+      </div>
+      <div class="box-center">
+        <div class="user-name text-center">{{ user.name }}</div>
+        <div class="user-role text-center text-muted">{{ user.role | uppercaseFirst }}</div>
+      </div>
+    </div>
+
+    <div class="user-bio">
+      <div class="user-education user-bio-section">
+        <div class="user-bio-section-header">
+          <svg-icon icon-class="education" /><span>部门信息</span>
+        </div>
+        <div class="user-bio-section-body">
+          <div class="text-muted">
+            {{user.department||"暂无"}}
+          </div>
+        </div>
+      </div>
+
+    </div>
+  </el-card>
+</template>
+
+<script>
+  import PanThumb from '@/components/PanThumb'
+
+  export default {
+    components: {
+      PanThumb
+    },
+    props: {
+      user: {
+        type: Object,
+        default: () => {
+          return {
+            name: '',
+            username: '',
+            avatar: '',
+            role: '',
+            department: ''
+          }
+        }
+      }
+    },
+  }
+</script>
+
+<style lang="scss" scoped>
+  .box-center {
+    margin: 0 auto;
+    display: table;
+  }
+
+  .text-muted {
+    color: #777;
+  }
+
+  .user-profile {
+    .user-name {
+      font-weight: bold;
+    }
+
+    .box-center {
+      padding-top: 10px;
+    }
+
+    .user-role {
+      padding-top: 10px;
+      font-weight: 400;
+      font-size: 14px;
+    }
+
+    .box-social {
+      padding-top: 30px;
+
+      .el-table {
+        border-top: 1px solid #dfe6ec;
+      }
+    }
+
+    .user-follow {
+      padding-top: 20px;
+    }
+  }
+
+  .user-bio {
+    margin-top: 20px;
+    color: #606266;
+
+    span {
+      padding-left: 4px;
+    }
+
+    .user-bio-section {
+      font-size: 14px;
+      padding: 15px 0;
+
+      .user-bio-section-header {
+        border-bottom: 1px solid #dfe6ec;
+        padding-bottom: 10px;
+        margin-bottom: 10px;
+        font-weight: bold;
+      }
+    }
+  }
+</style>
diff --git a/src/views/system/menu.vue b/src/views/system/menu.vue
index d708866..a9b68f1 100644
--- a/src/views/system/menu.vue
+++ b/src/views/system/menu.vue
@@ -23,6 +23,8 @@
           </el-table-column>
           <el-table-column prop="url" label="菜单路径" sortable>
           </el-table-column>
+          <el-table-column prop="path" label="路由" sortable>
+          </el-table-column>
           <el-table-column prop="icon" label="图标" sortable>
           </el-table-column>
           <el-table-column prop="api_prefix" label="API前缀" sortable>
@@ -65,6 +67,13 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="18">
+            <el-form-item label="路由" prop="path">
+              <el-input v-model="form.path" autocomplete="off"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
         <el-row>
           <el-col :span="12">
@@ -178,7 +187,8 @@
           pname: "根菜单",
           api_prefix: "",
           auth_node_tagsArr: [],
-          auth_node_tags: ""
+          auth_node_tags: "",
+          path: ""
         },
         actionRules: {
           tag: [{
diff --git a/src/views/system/password.vue b/src/views/system/password.vue
new file mode 100644
index 0000000..3b1e7b6
--- /dev/null
+++ b/src/views/system/password.vue
@@ -0,0 +1,78 @@
+<template>
+  <div class="" style="margin-top: 20px;">
+    <div v-if="user">
+      <el-row :gutter="20">
+
+        <el-col :span="6" :xs="24">
+          <user-card :user="user" />
+        </el-col>
+
+        <el-col :span="18" :xs="24">
+          <el-card>
+            <el-tabs v-model="activeTab">
+              <el-tab-pane label="操作日志" name="timeline">
+                <timeline />
+              </el-tab-pane>
+              <el-tab-pane label="信息修改" name="account">
+                <account />
+              </el-tab-pane>
+            </el-tabs>
+          </el-card>
+        </el-col>
+
+      </el-row>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {
+    mapGetters
+  } from 'vuex'
+  import UserCard from './components/UserCard'
+  import Timeline from './components/Timeline'
+  import Account from './components/Account'
+
+  import {
+    getInfo
+  } from '../../api/user.js'
+
+  export default {
+    name: 'Profile',
+    components: {
+      UserCard,
+      Timeline,
+      Account
+    },
+    data() {
+      return {
+        user: {},
+        activeTab: 'timeline'
+      }
+    },
+    computed: {
+      ...mapGetters([
+        'name',
+        'avatar',
+        'roles'
+      ])
+    },
+    created() {
+      this.getUser()
+    },
+    methods: {
+      getUser() {
+
+        getInfo().then(res => {
+          this.user = {
+            name:res.name,
+            username:res.username,
+            role: this.roles.join(' | '),
+            avatar: this.avatar
+          }
+        })
+
+      }
+    }
+  }
+</script>
diff --git a/src/views/system/role.vue b/src/views/system/role.vue
index 0032094..cc44457 100644
--- a/src/views/system/role.vue
+++ b/src/views/system/role.vue
@@ -1,159 +1,237 @@
-<template>
-  <div class="container">
-    <!-- 查询配置 -->
-    <div>
-      <div ref="lxHeader">
-        <LxHeader icon="md-apps" text="角色权限" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
-          <div slot="content"></div>
-          <slot>
-            <div>
-              <Input style="width: 200px; margin-right: 10px" v-model.number="searchFields.Name" placeholder="关键字搜索" />
-              <Button type="primary" @click="load" style="margin-left: 10px">查询</Button>
-              <Button type="primary" @click="edit()" style="margin-left: 10px">新增角色</Button>
-            </div>
-          </slot>
-        </LxHeader>
-      </div>
-
-      <div class="table-tree">
-        <el-table :data="tableData" class="v-table" border style="width: 100%">
-          <el-table-column type="index" align="center">
-          </el-table-column>
-          <el-table-column prop="name" label="角色名称" width="180">
-          </el-table-column>
-          <el-table-column prop="address" label="说明">
-          </el-table-column>
-          <el-table-column fixed="right" label="操作" width="300">
-            <template slot-scope="scope">
-              <Button ghost size="small" @click="edit(scope.row)" type="primary">编辑</Button>
-              <Button @click="del(scope.row)" type="error" ghost size="small" style="margin-left: 10px;">删除</Button>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-      <el-dialog title="角色编辑" :visible.sync="dialogFormVisible" width="30%">
-        <el-form :model="form" ref="form" :rules="rules" label-position="right" :label-width="formLabelWidth">
-
-          <el-form-item label="角色名称" prop="name">
-            <el-input v-model="form.name" autocomplete="off"></el-input>
-          </el-form-item>
-
-          <el-form-item label="排序">
-            <el-input v-model="form.sortnumber" autocomplete="off"></el-input>
-          </el-form-item>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button @click="resetForm('form')">取 消</el-button>
-          <el-button type="primary" @click="submitForm('form')">确 定</el-button>
-        </div>
-      </el-dialog>
-    </div>
-  </div>
-</template>
-
-<script>
-  import LxHeader from "@/components/LxHeader/index.vue";
-  import {
-    save,
-    list,
-    del
-  } from "../../api/system/role.js";
-  export default {
-    components: {
-      LxHeader
-    },
-    created() {
-      this.load();
-    },
-    mounted() {},
-    data() {
-      return {
-        dialogFormVisible: false,
-        formLabelWidth: "120px",
-        form: {
-          name: "",
-          id: "",
-          sortnumber: "0"
-        },
-        rules: {
-          name: [{
-            required: true,
-            message: '请输入角色名称',
-            trigger: 'blur'
-          }],
-        },
-        tableHeight: 0,
-        //查询条件字段
-        searchFields: {
-          KeyWord: ""
-        },
-        tableData: []
-      }
-    },
-    methods: {
-      load() {
-        var that = this;
-        list().then(response => {
-          that.tableData = response;
-        }).catch(error => {
-          //reject(error)
-        })
-      },
-      edit(obj) {
-        if (obj) {
-          this.form.id = obj.id;
-          this.form.name = obj.name;
-        }
-        this.dialogFormVisible = true;
-      },
-      del(obj) {
-        var that = this;
-        if (obj) {
-          this.$Modal.confirm({
-            title: '确认要删除数据？',
-            onOk: () => {
-              del({
-                id: obj.id
-              }).then(response => {
-                this.$Message.success('操作成功');
-                that.load();
-              }).catch(error => {
-                console.log(error)
-                reject(error)
-              })
-            },
-            onCancel: () => {
-              //this.$Message.info('Clicked cancel');
-            }
-          });
-        }
-      },
-      submitForm(formName) {
-        var that = this;
-        this.$refs[formName].validate((valid) => {
-          if (valid) {
-            save(that.form).then(response => {
-              console.log(response)
-              this.$Message.success('操作成功');
-              that.load();
-              that.dialogFormVisible = false;
-            }).catch(error => {
-              reject(error)
-            })
-          } else {
-            this.$Message.error('数据校验失败');
-            return false;
-          }
-        });
-      },
-      resetForm(formName) {
-        var that = this;
-        this.$refs[formName].resetFields();
-        that.dialogFormVisible = false;
-      }
-    }
-  };
-</script>
-
-<style>
+<template>
+  <div class="container">
+    <!-- 查询配置 -->
+    <div style="padding: 0px 20px">
+      <div ref="lxHeader">
+        <LxHeader icon="md-apps" text="角色权限" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
+          <div slot="content"></div>
+          <slot>
+            <div>
+              <Input style="width: 200px; margin-right: 10px" v-model.number="searchFields.Name" placeholder="关键字搜索" />
+              <Button type="primary" @click="load" style="margin-left: 10px">查询</Button>
+              <Button type="primary" @click="edit()" style="margin-left: 10px">新增角色</Button>
+            </div>
+          </slot>
+        </LxHeader>
+      </div>
+
+      <div class="table-tree">
+        <el-table :data="tableData" class="v-table" border style="width: 100%">
+          <el-table-column type="index" align="center">
+          </el-table-column>
+          <el-table-column prop="name" label="角色名称" width="180">
+          </el-table-column>
+          <el-table-column prop="address" label="说明">
+          </el-table-column>
+          <el-table-column fixed="right" label="操作" width="300">
+            <template slot-scope="scope">
+              <Button ghost size="small" @click="edit(scope.row)" type="primary">编辑</Button>
+              <Button ghost size="small" style="margin-left: 10px;" @click="set(scope.row)" type="primary">设置权限</Button>
+              <Button @click="del(scope.row)" type="error" ghost size="small" style="margin-left: 10px;">删除</Button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <el-dialog title="角色编辑" :visible.sync="dialogFormVisible" width="30%">
+        <el-form :model="form" ref="form" :rules="rules" label-position="right" :label-width="formLabelWidth">
+
+          <el-form-item label="角色名称" prop="name">
+            <el-input v-model="form.name" autocomplete="off"></el-input>
+          </el-form-item>
+
+          <el-form-item label="排序">
+            <el-input v-model="form.sortnumber" autocomplete="off"></el-input>
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button @click="resetForm('form')">取 消</el-button>
+          <el-button type="primary" @click="submitForm('form')">确 定</el-button>
+        </div>
+      </el-dialog>
+
+      <el-dialog title="权限设置" :visible.sync="dialogSetVisible" width="60%">
+        <el-form label-position="right" :label-width="formLabelWidth">
+
+          <el-form-item label="角色名称" prop="name">
+            {{setForm.name}}
+          </el-form-item>
+          <el-form-item label="角色人员">
+            <el-transfer filterable :titles="['待选择', '已选择']" :props="{key: 'id',label: 'name'}"
+              :filter-method="filterMethod" :format="{ noChecked: '${total}',hasChecked: '${checked}/${total}' }"
+              filter-placeholder="请选择人员" v-model="setForm.ids" :data="userdata">
+            </el-transfer>
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button @click="dialogSetVisible=false">取 消</el-button>
+          <el-button type="primary" @click="submitSet()">确 定</el-button>
+        </div>
+      </el-dialog>
+
+    </div>
+  </div>
+</template>
+
+<script>
+  import LxHeader from "@/components/LxHeader/index.vue";
+  import {
+    save,
+    list,
+    del,
+    set
+  } from "../../api/system/role.js";
+
+  import {
+    listCommondepartment,
+    listCommonuser
+  } from "../../api/common.js"
+
+  export default {
+    components: {
+      LxHeader
+    },
+    created() {
+      this.load();
+
+    },
+    mounted() {},
+    data() {
+      return {
+        dialogSetVisible: false,
+        dialogFormVisible: false,
+        formLabelWidth: "120px",
+        form: {
+          name: "",
+          id: "",
+          sortnumber: "0"
+        },
+        userdata: [],
+        filterMethod(query, item) {
+          return item.name.indexOf(query) > -1;
+        },
+        rules: {
+          name: [{
+            required: true,
+            message: '请输入角色名称',
+            trigger: 'blur'
+          }],
+        },
+        tableHeight: 0,
+        //查询条件字段
+        searchFields: {
+          KeyWord: ""
+        },
+        tableData: [],
+        setForm: {
+          name: "",
+          ids: [],
+          role_id:""
+        }
+      }
+    },
+    methods: {
+      load() {
+        var that = this;
+        list().then(response => {
+          that.tableData = response;
+        }).catch(error => {
+          //reject(error)
+        })
+      },
+      loadUser() {
+        listCommonuser({
+          page_size: 999
+        }).
+        then((res) => {
+          this.userdata = res.data;
+        }).catch(error => {
+          console.log(error)
+        })
+      },
+      edit(obj) {
+        if (obj) {
+          this.form.id = obj.id;
+          this.form.name = obj.name;
+        }
+        this.dialogFormVisible = true;
+      },
+      set(obj) {
+        var that = this;
+        this.setForm.role_id = "";
+        this.setForm.ids = [];
+        this.setForm.name = obj.name;
+        this.setForm.role_id=obj.id;
+        if (obj.admin) {
+          for (var m of obj.admin) {
+            this.setForm.ids.push(m.id);
+          }
+        }
+        this.dialogSetVisible = true;
+        this.loadUser();
+      },
+      submitSet() {
+        let that = this;
+        if (that.setForm.ids.length == 0) {
+          this.$Message.error("请选择人员");
+          return false;
+        }
+
+        set(that.setForm).then(response => {
+          this.$Message.success('操作成功');
+          that.load();
+          that.dialogSetVisible = false;
+        }).catch(error => {
+          this.$Message.error(error);
+        })
+      },
+      del(obj) {
+        var that = this;
+        if (obj) {
+          this.$Modal.confirm({
+            title: '确认要删除数据？',
+            onOk: () => {
+              del({
+                id: obj.id
+              }).then(response => {
+                this.$Message.success('操作成功');
+                that.load();
+              }).catch(error => {
+                console.log(error)
+                reject(error)
+              })
+            },
+            onCancel: () => {
+              //this.$Message.info('Clicked cancel');
+            }
+          });
+        }
+      },
+      submitForm(formName) {
+        var that = this;
+        this.$refs[formName].validate((valid) => {
+          if (valid) {
+            save(that.form).then(response => {
+              console.log(response)
+              this.$Message.success('操作成功');
+              that.load();
+              that.dialogFormVisible = false;
+            }).catch(error => {
+              reject(error)
+            })
+          } else {
+            this.$Message.error('数据校验失败');
+            return false;
+          }
+        });
+      },
+      resetForm(formName) {
+        var that = this;
+        this.$refs[formName].resetFields();
+        that.dialogFormVisible = false;
+      }
+    }
+  };
+</script>
+
+<style>
 </style>