增加了用户的详情,日志,设置
This commit is contained in:
parent
e47b06abf8
commit
7be1689232
5
.env
5
.env
|
|
@ -15,6 +15,7 @@ VUE_APP_TBAS_TITLES_KEY=admin.tabs.titles
|
||||||
VUE_APP_LAYOUT_KEY=admin.layout
|
VUE_APP_LAYOUT_KEY=admin.layout
|
||||||
VUE_APP_THEME_MODE_KEY=admin.theme.mode
|
VUE_APP_THEME_MODE_KEY=admin.theme.mode
|
||||||
VUE_APP_THEME_COLOR_KEY=admin.theme.color
|
VUE_APP_THEME_COLOR_KEY=admin.theme.color
|
||||||
VUE_APP_API_BASE_URL=http://192.168.52.166:30000
|
VUE_APP_API_BASE_URL=http://zxx4.f3322.net:16680
|
||||||
VUE_APP_USER_MODEL=AdminUser
|
VUE_APP_USER_MODEL=AdminUser
|
||||||
|
VUE_APP_BEID=1
|
||||||
|
VUE_APP_PTYID=0
|
||||||
|
|
@ -1,2 +1,2 @@
|
||||||
|
|
||||||
VUE_APP_API_BASE_URL=http://192.168.52.166:30000
|
VUE_APP_API_BASE_URL=http://zxx4.f3322.net:16680
|
||||||
|
|
@ -18,7 +18,7 @@ const AdminUserRouterMap = {
|
||||||
invisible:true, // 不在菜单中显示
|
invisible:true, // 不在菜单中显示
|
||||||
},
|
},
|
||||||
authority: {
|
authority: {
|
||||||
permission:[''],
|
permission:['AdminUser-All'],
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
AdminUserList:{
|
AdminUserList:{
|
||||||
|
|
@ -27,7 +27,7 @@ const AdminUserRouterMap = {
|
||||||
path: '/AdminUser/AdminUserList',
|
path: '/AdminUser/AdminUserList',
|
||||||
component: () => import('@/pages/Middle/Admin/AdminUser/UserList'),
|
component: () => import('@/pages/Middle/Admin/AdminUser/UserList'),
|
||||||
authority: {
|
authority: {
|
||||||
permission:[''],
|
permission:['AdminUser-All','AdminUser-List'],
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
AdminUserAdd:{
|
AdminUserAdd:{
|
||||||
|
|
@ -39,7 +39,19 @@ const AdminUserRouterMap = {
|
||||||
invisible:true, // 不在菜单中显示
|
invisible:true, // 不在菜单中显示
|
||||||
},
|
},
|
||||||
authority: {
|
authority: {
|
||||||
permission:[''],
|
permission:['AdminUser-All','AdminUser-Add'],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
AdminUserDetail:{
|
||||||
|
name: '用户详情',
|
||||||
|
icon: 'idcard',
|
||||||
|
path: '/AdminUser/AdminUserDetail',
|
||||||
|
component: () => import('@/pages/Middle/Admin/AdminUser/UserDetail'),
|
||||||
|
meta: {
|
||||||
|
invisible:true, // 不在菜单中显示
|
||||||
|
},
|
||||||
|
authority: {
|
||||||
|
permission:['AdminUser-All','AdminUser-List'],
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
AdminUserUpdate:{
|
AdminUserUpdate:{
|
||||||
|
|
@ -51,7 +63,28 @@ const AdminUserRouterMap = {
|
||||||
invisible:true, // 不在菜单中显示
|
invisible:true, // 不在菜单中显示
|
||||||
},
|
},
|
||||||
authority: {
|
authority: {
|
||||||
permission:[''],
|
permission:['AdminUser-All','AdminUser-Update'],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
AdminUserSettings:{
|
||||||
|
name: '用户设置',
|
||||||
|
icon: 'idcard',
|
||||||
|
path: '/AdminUser/AdminUserSettings',
|
||||||
|
component: () => import('@/pages/Middle/Admin/AdminUser/UserSettings'),
|
||||||
|
meta: {
|
||||||
|
invisible:true, // 不在菜单中显示
|
||||||
|
},
|
||||||
|
authority: {
|
||||||
|
permission:['AdminUser-All','AdminUser-Settings'],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
AdminUserLog:{
|
||||||
|
name: '用户日志',
|
||||||
|
icon: 'idcard',
|
||||||
|
path: '/AdminUser/AdminUserLog',
|
||||||
|
component: () => import('@/pages/Middle/Admin/AdminUser/UserLog'),
|
||||||
|
authority: {
|
||||||
|
permission:['AdminUser-All','AdminUser-Log'],
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -3,8 +3,10 @@ import Cookie from 'js-cookie'
|
||||||
|
|
||||||
// 认证 token 名称
|
// 认证 token 名称
|
||||||
const xsrfHeaderName = 'Authorization'
|
const xsrfHeaderName = 'Authorization'
|
||||||
|
const beid = process.env.VUE_APP_BEID
|
||||||
|
const ptyid = process.env.VUE_APP_PTYID
|
||||||
|
beid
|
||||||
|
ptyid
|
||||||
axios.defaults.timeout = 5000 // 请求超时时间
|
axios.defaults.timeout = 5000 // 请求超时时间
|
||||||
axios.defaults.withCredentials= false // 允许携带 cookies
|
axios.defaults.withCredentials= false // 允许携带 cookies
|
||||||
axios.defaults.xsrfHeaderName= xsrfHeaderName // 设置认证信息的名称
|
axios.defaults.xsrfHeaderName= xsrfHeaderName // 设置认证信息的名称
|
||||||
|
|
|
||||||
|
|
@ -88,7 +88,7 @@ function getLocalSetting(loadTheme) {
|
||||||
try {
|
try {
|
||||||
const localSettingCookieStr = Cookie.get(process.env.VUE_APP_THEME_SETTING_KEY)
|
const localSettingCookieStr = Cookie.get(process.env.VUE_APP_THEME_SETTING_KEY)
|
||||||
const localSettingStr = localStorage.getItem(process.env.VUE_APP_THEME_SETTING_KEY)
|
const localSettingStr = localStorage.getItem(process.env.VUE_APP_THEME_SETTING_KEY)
|
||||||
if (!localSettingStr){
|
if (!localSettingStr && localSettingCookieStr){
|
||||||
localSetting = JSON.parse(localSettingCookieStr)
|
localSetting = JSON.parse(localSettingCookieStr)
|
||||||
}else{
|
}else{
|
||||||
localSetting = JSON.parse(localSettingStr)
|
localSetting = JSON.parse(localSettingStr)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue