Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Z
zh-baseversion-project
Project
Project
Details
Activity
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
王浩
zh-baseversion-project
Commits
45da1dbe
Commit
45da1dbe
authored
Jul 29, 2024
by
wanghao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1 添加 bigWindowOld 静态菜单,去掉 如果是 admin 则进入 大屏界面
parent
db0f097d
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
16 deletions
+17
-16
index.js
zh-baseversion-web/src/router/index.js
+7
-7
permission.js
zh-baseversion-web/src/store/modules/permission.js
+1
-2
login.vue
zh-baseversion-web/src/views/login.vue
+4
-3
onelogin.vue
zh-baseversion-web/src/views/onelogin.vue
+5
-4
No files found.
zh-baseversion-web/src/router/index.js
View file @
45da1dbe
...
...
@@ -53,19 +53,19 @@ export const constantRoutes = [
component
:
(
resolve
)
=>
require
([
'@/views/error/401'
],
resolve
),
hidden
:
true
},
//大屏展示
//大屏展示
Old
{
path
:
'/bigWindow'
,
component
:
(
resolve
)
=>
require
([
'@/views/bigWindow'
],
resolve
),
hidden
:
true
},
// 20240727 wh 调整
//
大屏展示
//
{
// path: '/bigWindow
',
//
component: (resolve) => require(['@/views/bigWindowOld'], resolve),
//
hidden: true
//
},
//
大屏展示 Old
{
path
:
'/bigWindowOld
'
,
component
:
(
resolve
)
=>
require
([
'@/views/bigWindowOld'
],
resolve
),
hidden
:
true
},
{
path
:
'/outindex'
,
component
:
(
resolve
)
=>
require
([
'@/views/onelogin'
],
resolve
),
...
...
zh-baseversion-web/src/store/modules/permission.js
View file @
45da1dbe
...
...
@@ -40,7 +40,6 @@ const permission = {
const
sdata
=
JSON
.
parse
(
JSON
.
stringify
(
res
.
data
))
const
rdata
=
JSON
.
parse
(
JSON
.
stringify
(
res
.
data
))
const
sidebarRoutes
=
filterAsyncRouter
(
sdata
)
const
rewriteRoutes
=
filterAsyncRouter
(
rdata
,
false
,
true
)
rewriteRoutes
.
push
({
path
:
'*'
,
redirect
:
'/404'
,
hidden
:
true
})
...
...
zh-baseversion-web/src/views/login.vue
View file @
45da1dbe
...
...
@@ -170,9 +170,10 @@ export default {
const
roles
=
res
.
user
.
deptId
;
let
path
=
"/"
;
// 如果是最高权限,就进入大屏
if
(
roles
==
-
2
)
{
path
=
"/bigWindow"
;
}
// 20240729 wh 调整
// if (roles == -2) {
// path = "/bigWindow";
// }
this
.
$router
.
push
({
path
}).
catch
(()
=>
{});
})
.
catch
(()
=>
{
...
...
zh-baseversion-web/src/views/onelogin.vue
View file @
45da1dbe
...
...
@@ -201,7 +201,7 @@ export default {
let
path
=
"/"
;
// 如果是最高权限,就进入大屏
if
(
roles
==
-
2
)
{
path
=
"
/bigWindow
"
;
path
=
"
1
"
;
}
this
.
$router
.
push
({
path
}).
catch
(()
=>
{});
})
...
...
@@ -252,9 +252,10 @@ export default {
const
roles
=
res
.
user
.
deptId
;
let
path
=
"/"
;
// 如果是最高权限,就进入大屏
if
(
roles
==
-
2
)
{
path
=
"/bigWindow"
;
}
// 20240729 wh 调整
// if (roles == -2) {
// path = "/bigWindow";
// }
this
.
$router
.
push
({
path
}).
catch
(()
=>
{});
})
.
catch
(()
=>
{
...
...
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