#fixed

1.增加登录
2.增加权限用户列表

Author: lilJay-lin

.eslintrc.js

@@ -189,7 +189,7 @@ module.exports = {
         'keyword-spacing': 'error',
 
         // enforce consistent linebreak style
-        'linebreak-style': 'error',
+        //'linebreak-style': 'error',
 
         // require or disallow newlines around directives
         'lines-around-directive': 'error',
@@ -239,7 +239,7 @@ module.exports = {
         'no-console': 'off',
 
         // enforce consistent spacing before function definition opening parenthesis
-        'space-before-function-paren': ['error', 'never'],
+        //'space-before-function-paren': ['error', 'never'],
 
         // enforce consistent spacing inside parentheses
         'space-in-parens': 'error',
@@ -262,10 +262,10 @@ module.exports = {
          */
 
         // require braces around arrow function bodies
-        'arrow-body-style': 'error',
+        //'arrow-body-style': 'error',
 
         // require parentheses around arrow function arguments
-        'arrow-parens': ['error', 'as-needed'],
+        //'arrow-parens': ['error', 'as-needed'],
 
         // enforce consistent spacing before and after the arrow in arrow functions
         'arrow-spacing': 'error',
@@ -301,7 +301,7 @@ module.exports = {
         'prefer-numeric-literals': 'error',
 
         // require rest parameters instead of arguments
-        'prefer-rest-params': 'error',
+        //'prefer-rest-params': 'error',
 
         // require spread operators instead of .apply()
         'prefer-spread': 'error',

config/index.js

@@ -30,7 +30,13 @@ module.exports = {
         assetsSubDirectory: 'static',
         assetsPublicPath: '/',
         staticPath:'/static/',
-        proxyTable: {},
+        proxyTable: {
+            localhost: {
+              filter: '/api',
+              target: 'http://localhost/',
+              changeOrigin: true
+            }
+        },
         // CSS Sourcemaps off by default because relative paths are "buggy"
         // with this option, according to the CSS-Loader README
         // (https://github.com/webpack/css-loader#sourcemaps)

src/api/login.js

@@ -1,27 +1,27 @@
-import fetch from 'utils/fetch';
+import fetch from '../utils/fetch_new';
 
-export function loginByEmail(email, password) {
+export function loginByName(loginName, password) {
   const data = {
-    email,
+    loginName,
     password
   };
   return fetch({
-    url: '/login/loginbyemail',
+    url: '/users/login',
     method: 'post',
     data
   });
 }
 
 export function logout() {
   return fetch({
-    url: '/login/logout',
-    method: 'post'
+    url: '/users/logout',
+    method: 'get'
   });
 }
 
 export function getInfo(token) {
   return fetch({
-    url: '/user/info',
+    url: '/users/info',
     method: 'get',
     params: { token }
   });

src/api/role.js

@@ -0,0 +1,56 @@
+/**
+ * Created by linxiaojie on 2017/8/8.
+ */
+import fetch from '../utils/fetch_new'
+import { cleanArray } from '../utils'
+
+/*
+* 获取列表
+* */
+export const getAll = (query) => {
+  return fetch({
+    url: '/roles',
+    method: 'get',
+    params: query
+  })
+}
+
+/*
+* 查询详情
+* */
+export const getDetail = (id) => {
+  return fetch({
+    url: '/roles/' + id,
+    method: 'get'
+  })
+}
+
+/*
+* 更新详情
+* */
+export const updateDetail = (data = { id: '' }) => {
+  if (data.id === '') {
+    return Promise.reject('id不能为空')
+  }
+  return fetch({
+    url: 'roles/' + data.id,
+    method: 'post',
+    data
+  })
+}
+
+/*
+* 删除数据
+* */
+export const del = (ids = []) => {
+  ids = cleanArray(ids)
+  if (ids.length === 0) {
+    return Promise.reject('ids不能为空')
+  }
+  const url = 'roles/' + (ids.length > 1 ? '/batch/' + ids.join(',') : ids[0]) + id
+  return fetch({
+    url,
+    method: 'post',
+    data
+  })
+}

src/main.js

@@ -42,16 +42,21 @@ function hasPermission(roles, permissionRoles) {
 
 // register global progress.
 const whiteList = ['/login', '/authredirect', '/reset', '/sendpwd'];// 不重定向白名单
+/*
+* 登录更新路由
+* */
+let generate_routes = 1
+
 router.beforeEach((to, from, next) => {
   NProgress.start(); // 开启Progress
   if (getToken()) { // 判断是否有token
     if (to.path === '/login') {
       next({ path: '/' });
     } else {
-      if (store.getters.roles.length === 0) { // 判断当前用户是否已拉取完user_info信息
-        store.dispatch('GetInfo').then(res => { // 拉取user_info
-          const roles = res.data.role;
-          store.dispatch('GenerateRoutes', { roles }).then(() => { // 生成可访问的路由表
+      if (generate_routes) { // 更新路由
+        store.dispatch('GetInfo').then(() => {
+          store.dispatch('GenerateRoutes', { roles: store.getters.roles }).then(() => { // 生成可访问的路由表
+            generate_routes = 0
             router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
             next({ ...to }); // hack方法 确保addRoutes已完成
           })

src/router/index.js

@@ -8,6 +8,9 @@ Vue.use(Router);
 /* layout */
 import Layout from '../views/layout/Layout';
 
+/* view */
+import Login from '../views/login'
+import Role from '../views/role'
 /**
 * icon : the icon show in the sidebar
 * hidden : if `hidden:true` will not show in the sidebar
@@ -16,7 +19,7 @@ import Layout from '../views/layout/Layout';
 * meta : { role: ['admin'] }  will control the page role
 **/
 export const constantRouterMap = [
-    { path: '/login', component: _import('login/index'), hidden: true },
+    { path: '/login', component: Login, hidden: true },
     { path: '/authredirect', component: _import('login/authredirect'), hidden: true },
     { path: '/404', component: _import('error/404'), hidden: true },
     { path: '/401', component: _import('error/401'), hidden: true },
@@ -46,14 +49,15 @@ export default new Router({
 
 export const asyncRouterMap = [
   {
-    path: '/permission',
+    path: '/crp',
     component: Layout,
-    redirect: '/permission/index',
-    name: '权限测试',
+    redirect: 'noredirect',
+    name: '权限管理',
     icon: 'quanxian',
-    meta: { role: ['admin'] },
-    noDropdown: true,
-    children: [{ path: 'index', component: _import('permission/index'), name: '权限测试页', meta: { role: ['admin'] } }]
+    // meta: { role: ['admin'] },
+    children: [
+      { path: 'roles', component: Role, name: '角色管理' }
+    ]
   },
   {
     path: '/components',
@@ -76,7 +80,7 @@ export const asyncRouterMap = [
       { path: 'backtotop', component: _import('components/backToTop'), name: '返回顶部' }
     ]
   },
-  {
+  /* {
     path: '/charts',
     component: Layout,
     redirect: '/charts/index',
@@ -89,7 +93,7 @@ export const asyncRouterMap = [
       { path: 'line', component: _import('charts/line'), name: '折线图' },
       { path: 'mixchart', component: _import('charts/mixChart'), name: '混合图表' }
     ]
-  },
+  },*/
   {
     path: '/example',
     component: Layout,

src/store/getters.js

@@ -9,6 +9,7 @@ const getters = {
   roles: state => state.user.roles,
   setting: state => state.user.setting,
   permission_routers: state => state.permission.routers,
-  addRouters: state => state.permission.addRouters
+  addRouters: state => state.permission.addRouters,
+  crpRoles: state => state.role
 };
 export default getters

src/store/index.js

@@ -4,16 +4,20 @@ import app from './modules/app';
 import user from './modules/user';
 import permission from './modules/permission';
 import getters from './getters';
+import createLogger from '../../node_modules/vuex/src/plugins/logger'
+import role from './modules/role'
 
 Vue.use(Vuex);
 
 const store = new Vuex.Store({
   modules: {
     app,
     user,
-    permission
+    permission,
+    role
   },
-  getters
+  getters,
+  plugins: process.env.NODE_ENV === 'development' ? [createLogger()] : []
 });
 
 export default store

src/store/modules/role.js

@@ -0,0 +1,83 @@
+/**
+ * Created by linxiaojie on 2017/8/8.
+ */
+import { each, has } from '../../utils'
+import * as TYPES from '../types'
+import { getAll, getDetail, updateDetail, del } from '../../api/role'
+
+const role = {
+  state: {
+    records: [],
+    pageInfo: {
+      currentPage: 1,
+      totalRow: 0,
+      totalPage: 0
+    },
+    current: {
+      _id: '',
+      name: '',
+      description: '',
+      status: '',
+      permissions: []
+    }
+  },
+  mutations: {
+    [TYPES.SET_ROLES_LIST] (state, data) {
+      each(data, (val, key) => {
+        if (has(state, key)) {
+          state[key] = val
+        }
+      })
+    },
+    [TYPES.SET_ROLES_SELECTED] (state, item) {
+      each(item, (val, key) => {
+        if (state.current.has(key)) {
+          state.current[key] = val
+        }
+      })
+    },
+    [TYPES.SET_ROLES_PERMISSIONS] (state, permissions) {
+      state.current.permissions = permissions
+    }
+  },
+  actions: {
+    GetAllRoles ({ commit }, query) {
+      return new Promise((resolve, reject) => {
+        getAll(query).then(({ data }) => {
+          commit(TYPES.SET_ROLES_LIST, data);
+          resolve();
+        }).catch(error => {
+          reject(error);
+        });
+      });
+    },
+    GetRoleDetail ({ commit }, id) {
+      return new Promise((resolve, reject) => {
+        getDetail(id).then(({ data: { role } }) => {
+          commit(TYPES.SET_ROLES_SELECTED, role);
+          resolve();
+        }).catch(error => {
+          reject(error);
+        });
+      });
+    },
+    UpdateRoleDetail ({ commit, state }, id, detail) {
+      return new Promise((resolve, reject) => {
+        updateDetail(detail).then(() => resolve()).catch(error => {
+          reject(error);
+        });
+      });
+    },
+    DelRoles ({ dispatch }, ids) {
+      return new Promise((resolve, reject) => {
+        del(ids).then(() => {
+          dispatch('GetAllRoles').then(resolve, reject)
+        }).catch(error => {
+          reject(error);
+        });
+      });
+    }
+  }
+}
+
+export default role