From 0554c79f656b2f9b48ca4d8d70d89560ddb38aaf Mon Sep 17 00:00:00 2001 From: "aoli.qu" <408346101@qq.com> Date: Thu, 2 Sep 2021 11:04:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E6=80=81=E8=B7=AF=E7=94=B1=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/login.js | 7 +- src/assets/welcome.png | Bin 0 -> 17743 bytes src/config/router.config.js | 419 +-------------------------- src/main.js | 6 +- src/permission.js | 15 +- src/router/generator-routers.js | 133 ++++++++- src/store/getters.js | 1 + src/store/modules/async-router.js | 1 - src/store/modules/user.js | 5 +- src/utils/permissions.js | 14 + src/utils/request.js | 11 +- src/views/index/welcome.vue | 15 + src/views/security/user/UserList.vue | 30 +- 13 files changed, 202 insertions(+), 455 deletions(-) create mode 100644 src/assets/welcome.png create mode 100644 src/views/index/welcome.vue diff --git a/src/api/login.js b/src/api/login.js index f2cff67..d16e48a 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -14,7 +14,7 @@ export function login (parameter) { }) } -export function getLoginUser () { +export function getLoginUser (parameter) { return request({ url: userApi.getLoginUser, method: 'post', @@ -25,10 +25,7 @@ export function getLoginUser () { export function logout () { return request({ url: userApi.logout, - method: 'post', - headers: { - 'Content-Type': 'application/json;charset=UTF-8' - } + method: 'get' }) } export function getSmsCaptcha (parameter) { diff --git a/src/assets/welcome.png b/src/assets/welcome.png new file mode 100644 index 0000000000000000000000000000000000000000..94abec2409104a21fc6db682ad9f83c5d8e124d7 GIT binary patch literal 17743 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 h('router-view') -} - export const asyncRouterMap = [ { path: '/', - name: 'index', + name: 'MenuIndex.vue', component: BasicLayout, - meta: { title: 'menu.home' }, + meta: { title: '首页' }, redirect: '/dashboard/workplace', children: [ // dashboard { - path: '/dashboard', + path: 'dashboard', name: 'dashboard', redirect: '/dashboard/workplace', component: RouteView, - meta: { title: 'menu.dashboard', keepAlive: true, icon: bxAnaalyse, permission: ['dashboard'] }, + meta: { title: '仪表盘', keepAlive: true, icon: bxAnaalyse /* permission: [ 'dashboard' ] */ }, children: [ { - path: '/dashboard/workplace', + path: 'workplace', name: 'Workplace', component: () => import('@/views/dashboard/Workplace'), - meta: { title: 'menu.dashboard.workplace', keepAlive: true, permission: ['dashboard'] } - } - ] - }, - // 权限管理 - { - path: '/security', - name: 'security', - redirect: '/security/user', - component: RouteView, - meta: { title: '系统设置', keepAlive: true, icon: bxAnaalyse, permission: ['security'] }, - children: [ - { - path: '/security/user', - name: 'SecurityUser', - component: () => import('@/views/security/user/UserList'), - meta: { title: '用户管理', keepAlive: true, permission: ['security'] } - }, - { - path: '/security/role', - name: 'SecurityRole', - component: () => import('@/views/security/role/RoleList'), - meta: { title: '角色管理', keepAlive: true } - }, - { - path: '/security/menu', - name: 'SecurityMenu', - component: () => import('@/views/security/menu/MenuList'), - meta: { title: '菜单管理', keepAlive: true } - }, - { - path: '/sys/dictionary', - name: 'DictionaryList', - component: () => import('@/views/sys/dictionary/DictionaryList'), - meta: { title: '数据词典', keepAlive: true } - }, - { - path: '/sys/oss', - name: 'OssList', - component: () => import('@/views/sys/oss/OssList'), - meta: { title: '文件中心', keepAlive: true } - } - ] - }, - // 项目管理 - { - path: '/project', - redirect: '/project/list', - component: RouteView, - meta: { title: '项目管理', icon: bxAnaalyse, permission: ['from'] }, - children: [ - { - path: '/project/list', - name: 'projectList', - component: () => import('@/views/project/ProjectList'), - meta: { title: '自主项目', keepAlive: true, permission: ['form'] }, - }, - // { - // path: '/project/add', - // name: 'ProjectForm', - // component: () => import('@/views/project/ProjectForm'), - // meta: { title: '新增项目', keepAlive: true, permission: ['form'], show: false } - // }, - { - path: '/project/projectStepForm', - name: 'projectStepForm', - component: () => import('@/views/project/form/ProjectStepForm'), - meta: { title: '新增项目-分布', keepAlive: true, permission: ['form'] } - }, - // { - // path: '/project/unitSelect', - // name: 'unitSelect', - // component: () => import('@/views/project/ProjectUnitSelect'), - // meta: { title: '选择单位', keepAlive: true, permission: ['form'] } - // }, - { - path: '/form/step-form', - name: 'StepForm', - component: () => import('@/views/form/stepForm/StepForm'), - meta: { title: '系统推荐', keepAlive: true, permission: ['form'] } - }, - { - path: '/form/advanced-form', - name: 'AdvanceForm', - component: () => import('@/views/form/advancedForm/AdvancedForm'), - meta: { title: '终端培训', keepAlive: true, permission: ['form'] } - } - ] - }, - // 课程管理 - { - path: '/courseManagement', - redirect: '/courseManagement/course/courseList', - component: RouteView, - meta: { title: '课程管理', icon: bxAnaalyse, permission: ['from'] }, - children: [ - { - path: '/courseManagement/course/courseList', - name: 'courseList', - component: () => import('@/views/course/CourseList'), - meta: { title: '系统课程', keepAlive: true, permission: ['form'] } - }, - { - path: '/courseManagement/customCourseList', - name: 'customCourse', - component: () => import('@/views/course/customCourseList'), - meta: { title: '自制课程', keepAlive: true, permission: ['form'] } - }, - { - path: '/form/advanced-form', - name: 'AdvanceForm', - component: () => import('@/views/form/advancedForm/AdvancedForm'), - meta: { title: '资源库', keepAlive: true, permission: ['form'] } - } - ] - }, - // 档案管理 - { - path: "/archives", - redirect: "/archives/user", - component: RouteView, - meta: { title: '档案管理', icon: 'profile', permission: ['form'] }, - children: [ - { - path: "/archives/user", - name: "archivesUser", - component: () => import('@/views/archives/user/Index'), - meta: { title: '人员档案', keepAlive: true, permission: ['form'] } - } - ] - }, - // forms - { - path: '/form', - redirect: '/form/base-form', - component: RouteView, - meta: { title: '表单页', icon: 'form', permission: ['form'] }, - children: [ - { - path: '/form/base-form', - name: 'BaseForm', - component: () => import('@/views/form/basicForm/Index'), - meta: { title: '基础表单', keepAlive: true, permission: ['form'] } - }, - { - path: '/form/step-form', - name: 'StepForm', - component: () => import('@/views/form/stepForm/StepForm'), - meta: { title: '分步表单', keepAlive: true, permission: ['form'] } - }, - { - path: '/form/advanced-form', - name: 'AdvanceForm', - component: () => import('@/views/form/advancedForm/AdvancedForm'), - meta: { title: '高级表单', keepAlive: true, permission: ['form'] } - } - ] - }, - - // list - { - path: '/list', - name: 'list', - component: RouteView, - redirect: '/list/table-list', - meta: { title: '列表页', icon: 'table', permission: ['table'] }, - children: [ - { - path: '/list/table-list/:pageNo([1-9]\\d*)?', - name: 'TableListWrapper', - hideChildrenInMenu: true, // 强制显示 MenuItem 而不是 SubMenu - component: () => import('@/views/list/TableList'), - meta: { title: '查询表格', keepAlive: true, permission: ['table'] } - }, - { - path: '/list/basic-list', - name: 'BasicList', - component: () => import('@/views/list/BasicList'), - meta: { title: '标准列表', keepAlive: true, permission: ['table'] } - }, - { - path: '/list/card', - name: 'CardList', - component: () => import('@/views/list/CardList'), - meta: { title: '卡片列表', keepAlive: true, permission: ['table'] } - }, - { - path: '/list/search', - name: 'SearchList', - component: () => import('@/views/list/search/SearchLayout'), - redirect: '/list/search/article', - meta: { title: '搜索列表', keepAlive: true, permission: ['table'] }, - children: [ - { - path: '/list/search/article', - name: 'SearchArticles', - component: () => import('../views/list/search/Article'), - meta: { title: '搜索列表（文章）', permission: ['table'] } - }, - { - path: '/list/search/project', - name: 'SearchProjects', - component: () => import('../views/list/search/Projects'), - meta: { title: '搜索列表（项目）', permission: ['table'] } - }, - { - path: '/list/search/application', - name: 'SearchApplications', - component: () => import('../views/list/search/Applications'), - meta: { title: '搜索列表（应用）', permission: ['table'] } - } - ] - } - ] - }, - // profile - { - path: '/profile', - name: 'profile', - component: RouteView, - redirect: '/profile/basic', - meta: { title: '详情页', icon: 'profile', permission: ['profile'] }, - children: [ - { - path: '/profile/basic', - name: 'ProfileBasic', - component: () => import('@/views/profile/basic/Index'), - meta: { title: '基础详情页', permission: ['profile'] } - }, - { - path: '/profile/advanced', - name: 'ProfileAdvanced', - component: () => import('@/views/profile/advanced/Advanced'), - meta: { title: '高级详情页', permission: ['profile'] } - } - ] - }, - // result - { - path: '/result', - name: 'result', - component: RouteView, - redirect: '/result/success', - meta: { title: '结果页', icon: 'check-circle-o', permission: ['result'] }, - children: [ - { - path: '/result/success', - name: 'ResultSuccess', - component: () => import(/* webpackChunkName: "result" */ '@/views/result/Success'), - meta: { title: '成功', keepAlive: false, hiddenHeaderContent: true, permission: ['result'] } - }, - { - path: '/result/fail', - name: 'ResultFail', - component: () => import(/* webpackChunkName: "result" */ '@/views/result/Error'), - meta: { title: '失败', keepAlive: false, hiddenHeaderContent: true, permission: ['result'] } - } - ] - }, - // Exception - { - path: '/exception', - name: 'exception', - component: RouteView, - redirect: '/exception/403', - meta: { title: '异常页', icon: 'warning', permission: ['exception'] }, - children: [ - { - path: '/exception/403', - name: 'Exception403', - component: () => import(/* webpackChunkName: "fail" */ '@/views/exception/403'), - meta: { title: '403', permission: ['exception'] } - }, - { - path: '/exception/404', - name: 'Exception404', - component: () => import(/* webpackChunkName: "fail" */ '@/views/exception/404'), - meta: { title: '404', permission: ['exception'] } - }, - { - path: '/exception/500', - name: 'Exception500', - component: () => import(/* webpackChunkName: "fail" */ '@/views/exception/500'), - meta: { title: '500', permission: ['exception'] } - } - ] - }, - // account - { - path: '/account', - component: RouteView, - redirect: '/account/center', - name: 'account', - meta: { title: '个人页', icon: 'user', keepAlive: true, permission: ['user'] }, - children: [ - { - path: '/account/center', - name: 'center', - component: () => import('@/views/account/center/Index'), - meta: { title: '个人中心', keepAlive: true, permission: ['user'] } - }, - { - path: '/account/settings', - name: 'settings', - component: () => import('@/views/account/settings/Index'), - meta: { title: '个人设置', hideHeader: true, permission: ['user'] }, - redirect: '/account/settings/base', - hideChildrenInMenu: true, - children: [ - { - path: '/account/settings/base', - name: 'BaseSettings', - component: () => import('@/views/account/settings/BaseSetting'), - meta: { title: '基本设置', hidden: true, permission: ['user'] } - }, - { - path: '/account/settings/security', - name: 'SecuritySettings', - component: () => import('@/views/account/settings/Security'), - meta: { title: '安全设置', hidden: true, keepAlive: true, permission: ['user'] } - }, - { - path: '/account/settings/custom', - name: 'CustomSettings', - component: () => import('@/views/account/settings/Custom'), - meta: { title: '个性化设置', hidden: true, keepAlive: true, permission: ['user'] } - }, - { - path: '/account/settings/binding', - name: 'BindingSettings', - component: () => import('@/views/account/settings/Binding'), - meta: { title: '账户绑定', hidden: true, keepAlive: true, permission: ['user'] } - }, - { - path: '/account/settings/notification', - name: 'NotificationSettings', - component: () => import('@/views/account/settings/Notification'), - meta: { title: '新消息通知', hidden: true, keepAlive: true, permission: ['user'] } - } - ] - } - ] - }, - { - path: '/other', - name: 'otherPage', - component: RouteView, - meta: { title: '其他组件', icon: 'slack', permission: ['dashboard'] }, - redirect: '/other/icon-selector', - children: [ - { - path: '/other/icon-selector', - name: 'TestIconSelect', - component: () => import('@/views/other/IconSelectorView'), - meta: { title: 'IconSelector', icon: 'tool', keepAlive: true, permission: ['dashboard'] } - }, - { - path: '/other/list', - component: RouteView, - meta: { title: '业务布局', icon: 'layout', permission: ['support'] }, - redirect: '/other/list/tree-list', - children: [ - { - path: '/other/list/tree-list', - name: 'TreeList', - component: () => import('@/views/other/TreeList'), - meta: { title: '树目录表格', keepAlive: true } - }, - { - path: '/other/list/edit-table', - name: 'EditList', - component: () => import('@/views/other/TableInnerEditList'), - meta: { title: '内联编辑表格', keepAlive: true } - }, - { - path: '/other/list/user-list', - name: 'UserList', - component: () => import('@/views/other/UserList'), - meta: { title: '用户列表', keepAlive: true } - }, - { - path: '/other/list/role-list', - name: 'RoleList', - component: () => import('@/views/other/RoleList'), - meta: { title: '角色列表', keepAlive: true } - }, - { - path: '/other/list/system-role', - name: 'SystemRole', - component: () => import('@/views/role/RoleList'), - meta: { title: '角色列表2', keepAlive: true } - }, - { - path: '/other/list/permission-list', - name: 'PermissionList', - component: () => import('@/views/other/PermissionList'), - meta: { title: '权限列表', keepAlive: true } - } - ] + meta: { title: '工作台', keepAlive: false/*, permission: [ 'dashboard' ] */ } } ] } @@ -486,5 +83,5 @@ export const constantRouterMap = [ meta: { title: '词典项', keepAlive: true, permission: ['dictionaryItem'] } } ] - }, + } ] diff --git a/src/main.js b/src/main.js index 326b0e6..94d8fe0 100644 --- a/src/main.js +++ b/src/main.js @@ -13,13 +13,15 @@ import themePluginConfig from '../config/themePluginConfig' import bootstrap from './core/bootstrap' import './core/lazy_use' -// import './permission' // permission control +import './permission' // permission control import './utils/filter' // global filter import './global.less' import moment from 'moment' import { FormModel } from 'ant-design-vue' -// import './mock' +import { hasBtnPermission } from './utils/permissions' + Vue.use(FormModel) +Vue.prototype.hasPerm = hasBtnPermission Vue.config.productionTip = false diff --git a/src/permission.js b/src/permission.js index a274f05..a4d9d4c 100644 --- a/src/permission.js +++ b/src/permission.js @@ -15,21 +15,19 @@ const loginRoutePath = '/user/login' const defaultRoutePath = '/dashboard/workplace' router.beforeEach((to, from, next) => { - debugger NProgress.start() // start progress bar to.meta && (typeof to.meta.title !== 'undefined' && setDocumentTitle(`${i18nRender(to.meta.title)} - ${domTitle}`)) - /* has token */ + console.log(storage.get(ACCESS_TOKEN)) + debugger if (storage.get(ACCESS_TOKEN)) { if (to.path === loginRoutePath) { next({ path: defaultRoutePath }) NProgress.done() } else { if (store.getters.roles.length === 0) { - console.log('逻辑开始1 => src/permission.js') store .dispatch('GetInfo') .then(res => { - console.log('流程3-获取个人信息返回 => src/permission.js ') if (res.menus.length < 1) { Modal.error({ title: '提示：', @@ -45,14 +43,19 @@ router.beforeEach((to, from, next) => { } const antDesignMenus = res.menus // generate dynamic router - console.log('流程4-从后端获取权限开始') store.dispatch('GenerateRoutes', { antDesignMenus }).then(() => { // 根据菜单权限生成可访问的路由表 // 动态添加可访问路由表 - router.addRoutes(store.getters.addRouters) + const routes = store.getters.addRouters + for(let i =0,length =routes.length;i import('@/views/dashboard/Workplace'), + // account + 'AccountCenter': () => import('@/views/account/center/Index'), + 'AccountSettings': () => import('@/views/account/settings/Index'), + 'BaseSettings': () => import('@/views/account/settings/BaseSetting'), + 'SecuritySettings': () => import('@/views/account/settings/Security'), + 'CustomSettings': () => import('@/views/account/settings/Custom'), + 'BindingSettings': () => import('@/views/account/settings/Binding'), + 'NotificationSettings': () => import('@/views/account/settings/Notification'), + + // 默认首页 + 'Console': () => import('@/views/index/welcome') } // 前端未找到页面路由（固定不用改） @@ -22,11 +33,120 @@ const notFoundRouter = { path: '*', redirect: '/404', hidden: true } +// 个人中心页面 +const userAccount = [ + // account + { + 'name': 'account', + 'pid': 0, + 'id': 10028, + 'meta': { + 'title': '个人页', + 'icon': 'user', + 'show': false + }, + 'redirect': '/account/center', + 'component': 'RouteView' + }, + { + 'name': 'center', + 'pid': 10028, + 'id': 10029, + 'meta': { + 'title': '个人中心', + 'show': false + }, + 'component': 'AccountCenter' + }, + // 特殊三级菜单 + { + 'name': 'settings', + 'pid': '10028', + 'id': '10030', + 'meta': { + 'title': '个人设置', + 'hideHeader': true, + 'hideChildren': true, + 'show': false + }, + 'redirect': '/account/settings/base', + 'component': 'AccountSettings' + }, + { + 'name': 'BaseSettings', + 'path': '/account/settings/base', + 'pid': 10030, + 'id': 10031, + 'meta': { + 'title': '基本设置', + 'show': false + }, + 'component': 'BaseSettings' + }, + { + 'name': 'SecuritySettings', + 'path': '/account/settings/security', + 'pid': 10030, + 'id': 10032, + 'meta': { + 'title': '安全设置', + 'show': false + }, + 'component': 'SecuritySettings' + }, + { + 'name': 'CustomSettings', + 'path': '/account/settings/custom', + 'pid': 10030, + 'id': 10033, + 'meta': { + 'title': '个性化设置', + 'show': false + }, + 'component': 'CustomSettings' + }, + { + 'name': 'BindingSettings', + 'path': '/account/settings/binding', + 'pid': 10030, + 'id': 10034, + 'meta': { + 'title': '账户绑定', + 'show': false + }, + 'component': 'BindingSettings' + }, + { + 'name': 'NotificationSettings', + 'path': '/account/settings/notification', + 'pid': 10030, + 'id': 10034, + 'meta': { + 'title': '新消息通知', + 'show': false + }, + 'component': 'NotificationSettings' + }, + { + 'name': 'Console', + 'path': '/welcome', + 'pid': 0, + 'id': 183183, + 'meta': { + 'title': '首页', + 'show': false + }, + 'component': 'Console' + } + +] + // 根级菜单 const rootRouter = { path: '/', name: 'index', component: 'BasicLayout', + redirect: '/welcome', meta: { title: '首页' }, children: [] } @@ -38,17 +158,14 @@ const rootRouter = { */ export const generatorDynamicRouter = (data) => { return new Promise((resolve, reject) => { - console.log('流程5-后端返回的权限菜单：generatorDynamicRouter') - console.log(data) const resNav = data.antDesignMenus const menuNav = [] const childrenNav = [] - // 后端数据, 根级树数组, 根级 PID + // 后端数据, 根级树数组, 根级 PID listToTree(resNav, childrenNav, 0) + // 增加静态网页 + listToTree(userAccount, childrenNav, 0) rootRouter.children = childrenNav - if (childrenNav.length > 0) { - rootRouter.redirect = childrenNav[0].path - } menuNav.push(rootRouter) const routers = generator(menuNav) routers.push(notFoundRouter) @@ -85,7 +202,7 @@ export const generator = (routerMap, parent) => { icon: icon || undefined, hiddenHeaderContent: hiddenHeaderContent, target: target, - permission: item.name + // permission: item.name } } // 是否设置了隐藏菜单 @@ -120,7 +237,7 @@ export const generator = (routerMap, parent) => { const listToTree = (list, tree, parentId) => { list.forEach(item => { // 判断是否为父级菜单 - if (item.parentId === parentId) { + if (item.pid === parentId) { const child = { ...item, key: item.key || item.name, diff --git a/src/store/getters.js b/src/store/getters.js index 5a5ad70..b83c4f4 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -8,6 +8,7 @@ const getters = { nickname: state => state.user.name, welcome: state => state.user.welcome, roles: state => state.user.roles, + buttons: state => state.user.buttons, userInfo: state => state.user.info, addRouters: state => state.permission.addRouters, multiTab: state => state.app.multiTab diff --git a/src/store/modules/async-router.js b/src/store/modules/async-router.js index e20348d..4491e06 100644 --- a/src/store/modules/async-router.js +++ b/src/store/modules/async-router.js @@ -18,7 +18,6 @@ const permission = { actions: { GenerateRoutes ({ commit }, data) { return new Promise(resolve => { - console.log('动态生成路由:GenerateRoutes async-router 111') generatorDynamicRouter(data).then(routers => { commit('SET_ROUTERS', routers) resolve() diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 8b65db8..19f6dcf 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -56,8 +56,6 @@ const user = { getLoginUser().then(response => { if (response.code === 200) { const data = response.data - console.log('流程2-获取到个人信息 => user.js') - console.log(data) commit('SET_ROLES', 1) commit('SET_BUTTONS', data.permissions) commit('SET_INFO', data) @@ -79,7 +77,7 @@ const user = { // 登出 Logout ({ commit, state }) { return new Promise((resolve) => { - logout(state.token).then(() => { + logout().then(() => { resolve() }).catch(() => { resolve() @@ -87,6 +85,7 @@ const user = { commit('SET_TOKEN', '') commit('SET_ROLES', []) commit('SET_BUTTONS', []) + storage.remove(ACCESS_TOKEN) }) }) } diff --git a/src/utils/permissions.js b/src/utils/permissions.js index f8668bb..768f921 100644 --- a/src/utils/permissions.js +++ b/src/utils/permissions.js @@ -1,3 +1,5 @@ +import store from '@/store' + export function actionToObject (json) { try { return JSON.parse(json) @@ -6,3 +8,15 @@ export function actionToObject (json) { } return [] } + +/** + * 控制按钮是否显示 + */ +export function hasBtnPermission (permission) { + const myBtns = store.getters.buttons + const nickname = store.getters.nickname + if (nickname == '超级管理员') { + return true + } + return myBtns.indexOf(permission) > -1 +} \ No newline at end of file diff --git a/src/utils/request.js b/src/utils/request.js index f50c7ef..c3bea4e 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -4,9 +4,10 @@ import storage from 'store' import notification from 'ant-design-vue/es/notification' import { VueAxios } from './axios' import { ACCESS_TOKEN } from '@/store/mutation-types' +import router from '../router' const SUCCESS_CODE = 200 -const INVALID_TOKEN_CODE = '0000' +const INVALID_TOKEN_CODE = 401 const toast = (msg, description) => { notification.error({ @@ -29,7 +30,7 @@ const errorHandler = (error) => { // 从 localstorage 获取 token const token = storage.get(ACCESS_TOKEN) if (error.response.status === 403) { - toast('Forbidden:', data.message) + toast('Forbidden:', data.msg) } if (error.response.status === 401 && !(data.result && data.result.isLogin)) { toast('Unauthorized:', 'Authorization verification failed') @@ -47,9 +48,9 @@ const errorHandler = (error) => { // request interceptor request.interceptors.request.use(config => { - // const token = storage.get(ACCESS_TOKEN) + const token = storage.get(ACCESS_TOKEN) // 由于登录接口待联调，token使用默认值 - const token = 'eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjBkYjU0YzQ0LWQ5MDktNDQ0ZC05YTYwLTE4ZGU1YjgyMzg5YyJ9.l37UO6WC9tPTuoJnbWKpTusHdtmon95Islq-jRNo9zmCKJ4GWwnY9_szBpgOii2Y7OVvc4sWibmFBdTwmAg8sg' + // const token = 'eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjY0MjM0YmY0LTkxOWEtNDFkMS05MzZlLTMwZDU3NDhkYmVjZCJ9.J15_FhVqcm_GsNIS2BCEYf26sWQQ4pMSTedV5eKauZT8-f6480Mx1s5ZdqWdEOlORnkKSc5pUioCngbCopr9cQ' // 如果 token 存在,让每个请求携带自定义 token 请根据实际情况自行修改 if (token) { config.headers[ACCESS_TOKEN] = token @@ -69,7 +70,7 @@ request.interceptors.response.use((response) => { } else if (response.data && response.data.code === INVALID_TOKEN_CODE) { toast(response.data.msg) store.dispatch('Logout').then(() => { - this.$router.push({ name: 'login' }) + router.push({ name: 'login' }) }) return Promise.reject(response) } else { diff --git a/src/views/index/welcome.vue b/src/views/index/welcome.vue new file mode 100644 index 0000000..a5c7575 --- /dev/null +++ b/src/views/index/welcome.vue @@ -0,0 +1,15 @@ + + + + + diff --git a/src/views/security/user/UserList.vue b/src/views/security/user/UserList.vue index 7f86219..5c4f779 100644 --- a/src/views/security/user/UserList.vue +++ b/src/views/security/user/UserList.vue @@ -28,8 +28,8 @@
- 新增用户 - + 新增用户 + 批量删除
@@ -46,22 +46,22 @@ {{ record.sex | sexFilter }} - 编辑 - - + 编辑 + + 更多 - + 重置密码 - + 授权角色 - + 删除 @@ -112,12 +112,6 @@ export default { }, { title: '手机', dataIndex: 'phoneNumber' - }, - { - title: '操作', - width: '150px', - dataIndex: 'action', - scopedSlots: { customRender: 'action' } } ], // 加载数据方法 必须为 Promise 对象 @@ -144,6 +138,14 @@ export default { }, created () { // 动态加载权限 + if (this.hasPerm('sys:user:edit') || this.hasPerm('sys:user:resetPwd') || this.hasPerm('sys:user:grantRole') || this.hasPerm('sys:user:delete')) { + this.columns.push({ + title: '操作', + width: '150px', + dataIndex: 'action', + scopedSlots: { customRender: 'action' } + }) + } }, methods: { // 重置密码