Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
9
91isoft_vue_manage
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
杨硕
91isoft_vue_manage
Commits
39248e01
Commit
39248e01
authored
Jul 27, 2021
by
刘洪铨
👽
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
js修改
parent
75e8394b
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
13 deletions
+11
-13
login.js
src/api/login.js
+1
-1
permission.js
src/permission.js
+2
-2
permission.js
src/store/modules/permission.js
+3
-3
user.js
src/store/modules/user.js
+4
-6
vue.config.js
vue.config.js
+1
-1
No files found.
src/api/login.js
View file @
39248e01
...
@@ -28,7 +28,7 @@ export function refreshToken(params) {
...
@@ -28,7 +28,7 @@ export function refreshToken(params) {
// 获取用户详细信息
// 获取用户详细信息
export
function
getInfo
()
{
export
function
getInfo
()
{
return
request
({
return
request
({
url
:
'/
system/user
/getInfo'
,
url
:
'/
auth
/getInfo'
,
method
:
'get'
method
:
'get'
})
})
}
}
...
...
src/permission.js
View file @
39248e01
...
@@ -24,9 +24,9 @@ router.beforeEach((to, from, next) => {
...
@@ -24,9 +24,9 @@ router.beforeEach((to, from, next) => {
store
.
dispatch
(
'GetInfo'
).
then
(
res
=>
{
store
.
dispatch
(
'GetInfo'
).
then
(
res
=>
{
// 判断用户是否有权限 有角色
// 判断用户是否有权限 有角色
if
(
res
.
data
.
roles
&&
res
.
data
.
roles
.
length
>
0
&&
res
.
data
.
permissions
&&
res
.
data
.
permissions
.
length
>
0
)
{
if
(
res
.
roles
&&
res
.
roles
.
length
>
0
&&
res
.
permissions
&&
res
.
permissions
.
length
>
0
)
{
// 拉取user_info
// 拉取user_info
const
roles
=
res
.
data
.
roles
const
roles
=
res
.
roles
store
.
dispatch
(
'GenerateRoutes'
,
{
roles
}).
then
((
routers
)
=>
{
store
.
dispatch
(
'GenerateRoutes'
,
{
roles
}).
then
((
routers
)
=>
{
// 判断用户是否有路由
// 判断用户是否有路由
if
(
routers
.
accessedRoutes
&&
routers
.
accessedRoutes
.
length
>
0
&&
routers
.
getRouters
&&
routers
.
getRouters
.
length
>
0
)
{
if
(
routers
.
accessedRoutes
&&
routers
.
accessedRoutes
.
length
>
0
&&
routers
.
getRouters
&&
routers
.
getRouters
.
length
>
0
)
{
...
...
src/store/modules/permission.js
View file @
39248e01
...
@@ -19,8 +19,8 @@ const permission = {
...
@@ -19,8 +19,8 @@ const permission = {
GenerateRoutes
({
commit
})
{
GenerateRoutes
({
commit
})
{
return
new
Promise
(
resolve
=>
{
return
new
Promise
(
resolve
=>
{
// 向后端请求路由数据
// 向后端请求路由数据
get
Info
().
then
(
res
=>
{
get
Routers
().
then
(
res
=>
{
const
accessedRoutes
=
filterAsyncRouter
(
res
.
data
.
menus
)
const
accessedRoutes
=
filterAsyncRouter
(
res
.
data
)
console
.
log
(
accessedRoutes
)
console
.
log
(
accessedRoutes
)
if
(
accessedRoutes
[
0
])
{
if
(
accessedRoutes
[
0
])
{
const
firstChild
=
getFirstChild
(
accessedRoutes
[
0
])
const
firstChild
=
getFirstChild
(
accessedRoutes
[
0
])
...
@@ -28,7 +28,7 @@ const permission = {
...
@@ -28,7 +28,7 @@ const permission = {
accessedRoutes
.
push
({
path
:
'/'
,
redirect
:
firstChild
,
hidden
:
true
})
accessedRoutes
.
push
({
path
:
'/'
,
redirect
:
firstChild
,
hidden
:
true
})
commit
(
'SET_ROUTES'
,
accessedRoutes
)
commit
(
'SET_ROUTES'
,
accessedRoutes
)
}
}
const
routers
=
{
accessedRoutes
:
accessedRoutes
,
getRouters
:
res
.
data
.
menus
}
const
routers
=
{
accessedRoutes
:
accessedRoutes
,
getRouters
:
res
.
data
}
resolve
(
routers
)
resolve
(
routers
)
})
})
})
})
...
...
src/store/modules/user.js
View file @
39248e01
import
{
login
,
logout
,
getInfo
}
from
'@/api/login'
import
{
login
,
logout
,
getInfo
}
from
'@/api/login'
import
{
getToken
,
setToken
,
removeToken
}
from
'@/utils/auth'
import
{
getToken
,
setToken
,
removeToken
}
from
'@/utils/auth'
import
Layout
from
'@/layout'
import
{
loadView
}
from
'@/store/modules/permission'
const
user
=
{
const
user
=
{
state
:
{
state
:
{
...
@@ -57,11 +55,11 @@ const user = {
...
@@ -57,11 +55,11 @@ const user = {
GetInfo
({
commit
,
state
})
{
GetInfo
({
commit
,
state
})
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
getInfo
(
state
.
token
).
then
(
res
=>
{
getInfo
(
state
.
token
).
then
(
res
=>
{
const
user
=
res
.
data
.
user
const
user
=
res
.
user
const
avatar
=
user
.
avatar
===
null
?
require
(
'@/assets/image/profile.jpg'
)
:
user
.
avatar
const
avatar
=
user
.
avatar
===
null
?
require
(
'@/assets/image/profile.jpg'
)
:
user
.
avatar
if
(
res
.
data
.
roles
&&
res
.
data
.
roles
.
length
>
0
)
{
// 验证返回的roles是否是一个非空数组
if
(
res
.
roles
&&
res
.
roles
.
length
>
0
)
{
// 验证返回的roles是否是一个非空数组
commit
(
'SET_ROLES'
,
res
.
data
.
roles
)
commit
(
'SET_ROLES'
,
res
.
roles
)
commit
(
'SET_PERMISSIONS'
,
res
.
data
.
permissions
)
commit
(
'SET_PERMISSIONS'
,
res
.
permissions
)
}
else
{
}
else
{
commit
(
'SET_ROLES'
,
[
'ROLE_DEFAULT'
])
commit
(
'SET_ROLES'
,
[
'ROLE_DEFAULT'
])
}
}
...
...
vue.config.js
View file @
39248e01
...
@@ -81,7 +81,7 @@ module.exports = {
...
@@ -81,7 +81,7 @@ module.exports = {
[
process
.
env
.
VUE_APP_BASE_API
]:
{
[
process
.
env
.
VUE_APP_BASE_API
]:
{
// target: `http://192.168.1.17:10010/internal`,
// target: `http://192.168.1.17:10010/internal`,
// target: `http://10.5.87.231:10010/internal`,
// target: `http://10.5.87.231:10010/internal`,
target
:
`http://127.0.0.1:808
2
/`
,
target
:
`http://127.0.0.1:808
8
/`
,
changeOrigin
:
true
,
changeOrigin
:
true
,
pathRewrite
:
{
pathRewrite
:
{
[
'^'
+
process
.
env
.
VUE_APP_BASE_API
]:
''
[
'^'
+
process
.
env
.
VUE_APP_BASE_API
]:
''
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment