1.7版本发布,详情查看版本说明

This commit is contained in:
zhengjie
2019-04-11 11:15:30 +08:00
parent 0642c46288
commit 94585f26f0
86 changed files with 2287 additions and 537 deletions

View File

@@ -2,19 +2,18 @@ const getters = {
sidebar: state => state.app.sidebar,
device: state => state.app.device,
token: state => state.user.token,
avatar: state => state.user.avatar,
visitedViews: state => state.tagsView.visitedViews,
cachedViews: state => state.tagsView.cachedViews,
name: state => state.user.name,
createTime: state => state.user.createTime,
email: state => state.user.email,
roles: state => state.user.roles,
user: state => state.user.user,
loadMenus: state => state.user.loadMenus,
permission_routers: state => state.permission.routers,
addRouters: state => state.permission.addRouters,
socketApi: state => state.api.socketApi,
imagesUploadApi: state => state.api.imagesUploadApi,
updateAvatarApi: state => state.api.updateAvatarApi,
qiNiuUploadApi: state => state.api.qiNiuUploadApi
qiNiuUploadApi: state => state.api.qiNiuUploadApi,
sqlApi: state => state.api.sqlApi,
swaggerApi: state => state.api.swaggerApi
}
export default getters

View File

@@ -8,7 +8,11 @@ const api = {
// 修改头像
updateAvatarApi: baseUrl + '/api/users/updateAvatar',
// 上传文件到七牛云
qiNiuUploadApi: baseUrl + '/api/qiNiuContent'
qiNiuUploadApi: baseUrl + '/api/qiNiuContent',
// Sql 监控
sqlApi: baseUrl + '/druid',
// swagger
swaggerApi: baseUrl + '/swagger-ui.html'
}
}

View File

@@ -1,14 +1,10 @@
import { login, getInfo } from '@/api/login'
import { getToken, setToken, removeToken } from '@/utils/auth'
import { parseTime } from '@/utils/index'
const user = {
state: {
token: getToken(),
name: '',
email: '',
avatar: '',
createTime: '',
user: {},
roles: [],
// 第一次加载菜单时用到
loadMenus: false
@@ -18,21 +14,12 @@ const user = {
SET_TOKEN: (state, token) => {
state.token = token
},
SET_NAME: (state, name) => {
state.name = name
},
SET_AVATAR: (state, avatar) => {
state.avatar = avatar
SET_USER: (state, user) => {
state.user = user
},
SET_ROLES: (state, roles) => {
state.roles = roles
},
SET_CREATE_TIME: (state, createTime) => {
state.createTime = createTime
},
SET_EMAIL: (state, email) => {
state.email = email
},
SET_LOAD_MENUS: (state, loadMenus) => {
state.loadMenus = loadMenus
}
@@ -95,10 +82,7 @@ export const setUserInfo = (res, commit) => {
} else {
commit('SET_ROLES', res.roles)
}
commit('SET_NAME', res.username)
commit('SET_AVATAR', res.avatar)
commit('SET_EMAIL', res.email)
commit('SET_CREATE_TIME', parseTime(res.createTime))
commit('SET_USER', res)
}
export default user