Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
R
rongtong-pc
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
融通安全管理系统
rongtong-pc
Commits
6ae5acef
Commit
6ae5acef
authored
Oct 19, 2023
by
kaitly205422@163.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改导航,报错提示
parent
c8f277df
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
99 additions
and
82 deletions
+99
-82
src/layout/components/Navbar.vue
src/layout/components/Navbar.vue
+65
-55
src/router/index.js
src/router/index.js
+31
-25
src/views/risk/plan/ledgerdata.vue
src/views/risk/plan/ledgerdata.vue
+3
-2
No files found.
src/layout/components/Navbar.vue
View file @
6ae5acef
<
template
>
<
template
>
<div
class=
"navbar"
>
<div
class=
"navbar"
>
<hamburger
id=
"hamburger-container"
:is-active=
"sidebar.opened"
class=
"hamburger-container"
@
toggleClick=
"toggleSideBar"
/>
<hamburger
id=
"hamburger-container"
<breadcrumb
id=
"breadcrumb-container"
class=
"breadcrumb-container"
v-if=
"!topNav"
/>
:is-active=
"sidebar.opened"
<top-nav
id=
"topmenu-container"
class=
"topmenu-container"
v-if=
"topNav"
/>
class=
"hamburger-container"
@
toggleClick=
"toggleSideBar"
/>
<breadcrumb
id=
"breadcrumb-container"
class=
"breadcrumb-container"
v-if=
"!topNav"
/>
<top-nav
id=
"topmenu-container"
class=
"topmenu-container"
v-if=
"topNav"
/>
<div
class=
"right-menu"
>
<div
class=
"right-menu"
>
<template
v-if=
"device
!==
'mobile'"
>
<template
v-if=
"device
!==
'mobile'"
>
<search
id=
"header-search"
class=
"right-menu-item"
/>
<
!--
<
search
id=
"header-search"
class=
"right-menu-item"
/>
<el-tooltip
content=
"源码地址"
effect=
"dark"
placement=
"bottom"
>
<el-tooltip
content=
"源码地址"
effect=
"dark"
placement=
"bottom"
>
<ruo-yi-git
id=
"ruoyi-git"
class=
"right-menu-item hover-effect"
/>
<ruo-yi-git
id=
"ruoyi-git"
class=
"right-menu-item hover-effect"
/>
...
@@ -15,19 +24,21 @@
...
@@ -15,19 +24,21 @@
<el-tooltip
content=
"文档地址"
effect=
"dark"
placement=
"bottom"
>
<el-tooltip
content=
"文档地址"
effect=
"dark"
placement=
"bottom"
>
<ruo-yi-doc
id=
"ruoyi-doc"
class=
"right-menu-item hover-effect"
/>
<ruo-yi-doc
id=
"ruoyi-doc"
class=
"right-menu-item hover-effect"
/>
</el-tooltip>
</el-tooltip>
-->
<screenfull
id=
"screenfull"
class=
"right-menu-item hover-effect"
/>
<screenfull
id=
"screenfull"
class=
"right-menu-item hover-effect"
/>
<el-tooltip
content=
"布局大小"
effect=
"dark"
placement=
"bottom"
>
<
!--
<
el-tooltip
content=
"布局大小"
effect=
"dark"
placement=
"bottom"
>
<size-select
id=
"size-select"
class=
"right-menu-item hover-effect"
/>
<size-select
id=
"size-select"
class=
"right-menu-item hover-effect"
/>
</el-tooltip>
</el-tooltip>
-->
</
template
>
</
template
>
<el-dropdown
class=
"avatar-container right-menu-item hover-effect"
trigger=
"click"
>
<el-dropdown
class=
"avatar-container right-menu-item hover-effect"
trigger=
"click"
>
<div
class=
"avatar-wrapper"
>
<div
class=
"avatar-wrapper"
>
<img
:src=
"avatar"
class=
"user-avatar"
>
<img
:src=
"avatar"
class=
"user-avatar"
/
>
<i
class=
"el-icon-caret-bottom"
/>
<i
class=
"el-icon-caret-bottom"
/>
</div>
</div>
<el-dropdown-menu
slot=
"dropdown"
>
<el-dropdown-menu
slot=
"dropdown"
>
...
@@ -47,15 +58,15 @@
...
@@ -47,15 +58,15 @@
</template>
</template>
<
script
>
<
script
>
import
{
mapGetters
}
from
'
vuex
'
import
{
mapGetters
}
from
"
vuex
"
;
import
Breadcrumb
from
'
@/components/Breadcrumb
'
import
Breadcrumb
from
"
@/components/Breadcrumb
"
;
import
TopNav
from
'
@/components/TopNav
'
import
TopNav
from
"
@/components/TopNav
"
;
import
Hamburger
from
'
@/components/Hamburger
'
import
Hamburger
from
"
@/components/Hamburger
"
;
import
Screenfull
from
'
@/components/Screenfull
'
import
Screenfull
from
"
@/components/Screenfull
"
;
import
SizeSelect
from
'
@/components/SizeSelect
'
import
SizeSelect
from
"
@/components/SizeSelect
"
;
import
Search
from
'
@/components/HeaderSearch
'
import
Search
from
"
@/components/HeaderSearch
"
;
import
RuoYiGit
from
'
@/components/RuoYi/Git
'
import
RuoYiGit
from
"
@/components/RuoYi/Git
"
;
import
RuoYiDoc
from
'
@/components/RuoYi/Doc
'
import
RuoYiDoc
from
"
@/components/RuoYi/Doc
"
;
export
default
{
export
default
{
components
:
{
components
:
{
...
@@ -66,48 +77,46 @@ export default {
...
@@ -66,48 +77,46 @@ export default {
SizeSelect
,
SizeSelect
,
Search
,
Search
,
RuoYiGit
,
RuoYiGit
,
RuoYiDoc
RuoYiDoc
,
},
},
computed
:
{
computed
:
{
...
mapGetters
([
...
mapGetters
([
"
sidebar
"
,
"
avatar
"
,
"
device
"
]),
'
sidebar
'
,
'
avatar
'
,
'
device
'
]),
setting
:
{
setting
:
{
get
()
{
get
()
{
return
this
.
$store
.
state
.
settings
.
showSettings
return
this
.
$store
.
state
.
settings
.
showSettings
;
},
},
set
(
val
)
{
set
(
val
)
{
this
.
$store
.
dispatch
(
'
settings/changeSetting
'
,
{
this
.
$store
.
dispatch
(
"
settings/changeSetting
"
,
{
key
:
'
showSettings
'
,
key
:
"
showSettings
"
,
value
:
val
value
:
val
,
})
})
;
}
}
,
},
},
topNav
:
{
topNav
:
{
get
()
{
get
()
{
return
this
.
$store
.
state
.
settings
.
topNav
return
this
.
$store
.
state
.
settings
.
topNav
;
}
}
,
}
}
,
},
},
methods
:
{
methods
:
{
toggleSideBar
()
{
toggleSideBar
()
{
this
.
$store
.
dispatch
(
'
app/toggleSideBar
'
)
this
.
$store
.
dispatch
(
"
app/toggleSideBar
"
);
},
},
async
logout
()
{
async
logout
()
{
this
.
$confirm
(
'
确定注销并退出系统吗?
'
,
'
提示
'
,
{
this
.
$confirm
(
"
确定注销并退出系统吗?
"
,
"
提示
"
,
{
confirmButtonText
:
'
确定
'
,
confirmButtonText
:
"
确定
"
,
cancelButtonText
:
'
取消
'
,
cancelButtonText
:
"
取消
"
,
type
:
'
warning
'
type
:
"
warning
"
,
}).
then
(()
=>
{
this
.
$store
.
dispatch
(
'
LogOut
'
).
then
(()
=>
{
location
.
href
=
'
/index
'
;
})
})
}).
catch
(()
=>
{});
.
then
(()
=>
{
}
this
.
$store
.
dispatch
(
"
LogOut
"
).
then
(()
=>
{
}
location
.
href
=
"
/index
"
;
}
});
})
.
catch
(()
=>
{});
},
},
};
</
script
>
</
script
>
<
style
lang=
"scss"
scoped
>
<
style
lang=
"scss"
scoped
>
...
@@ -116,23 +125,24 @@ export default {
...
@@ -116,23 +125,24 @@ export default {
overflow
:
hidden
;
overflow
:
hidden
;
position
:
relative
;
position
:
relative
;
background
:
#fff
;
background
:
#fff
;
box-shadow
:
0
1px
4px
rgba
(
0
,
21
,
41
,
.
08
);
box-shadow
:
0
1px
4px
rgba
(
0
,
21
,
41
,
0
.08
);
.hamburger-container
{
.hamburger-container
{
line-height
:
46px
;
line-height
:
46px
;
height
:
100%
;
height
:
100%
;
float
:
left
;
float
:
left
;
cursor
:
pointer
;
cursor
:
pointer
;
transition
:
background
.3s
;
transition
:
background
0
.3s
;
-webkit-tap-highlight-color
:transparent
;
-webkit-tap-highlight-color
:
transparent
;
&
:hover
{
&
:hover
{
background
:
rgba
(
0
,
0
,
0
,
.025
)
background
:
rgba
(
0
,
0
,
0
,
0
.025
);
}
}
}
}
.breadcrumb-container
{
.breadcrumb-container
{
float
:
left
;
float
:
left
;
line-height
:
50px
;
}
}
.topmenu-container
{
.topmenu-container
{
...
@@ -164,10 +174,10 @@ export default {
...
@@ -164,10 +174,10 @@ export default {
&
.hover-effect
{
&
.hover-effect
{
cursor
:
pointer
;
cursor
:
pointer
;
transition
:
background
.3s
;
transition
:
background
0
.3s
;
&
:hover
{
&
:hover
{
background
:
rgba
(
0
,
0
,
0
,
.025
)
background
:
rgba
(
0
,
0
,
0
,
0
.025
);
}
}
}
}
}
}
...
...
src/router/index.js
View file @
6ae5acef
...
@@ -53,40 +53,25 @@ export const constantRoutes = [
...
@@ -53,40 +53,25 @@ export const constantRoutes = [
},
},
],
],
},
},
{
{
path
:
"
/login
"
,
path
:
"
/
"
,
component
:
()
=>
import
(
"
@/views/login
"
),
hidden
:
true
,
},
{
path
:
"
/register
"
,
component
:
()
=>
import
(
"
@/views/register
"
),
hidden
:
true
,
},
{
path
:
"
/404
"
,
component
:
()
=>
import
(
"
@/views/error/404
"
),
hidden
:
true
,
},
{
path
:
"
/401
"
,
component
:
()
=>
import
(
"
@/views/error/401
"
),
hidden
:
true
,
},
{
path
:
""
,
component
:
Layout
,
component
:
Layout
,
redirect
:
"
index
"
,
redirect
:
"
index
"
,
children
:
[
children
:
[
{
{
path
:
"
index
"
,
path
:
"
index
"
,
component
:
()
=>
import
(
"
@/views/
home
"
),
component
:
()
=>
import
(
"
@/views/
risk/plan/ledger
"
),
name
:
"
Index
"
,
name
:
"
taskPlan
"
,
meta
:
{
title
:
"
风险态势分析图
"
,
icon
:
"
dashboard
"
,
affix
:
true
},
meta
:
{
title
:
"
任务台账
"
,
icon
:
"
star
"
},
},
},
],
],
},
},
{
path
:
window
.
location
.
origin
+
"
/map
"
,
name
:
"
Index
"
,
meta
:
{
title
:
"
风险态势分析图
"
,
icon
:
"
dashboard
"
,
affix
:
true
},
},
{
{
path
:
"
/user
"
,
path
:
"
/user
"
,
component
:
Layout
,
component
:
Layout
,
...
@@ -99,8 +84,29 @@ export const constantRoutes = [
...
@@ -99,8 +84,29 @@ export const constantRoutes = [
name
:
"
Profile
"
,
name
:
"
Profile
"
,
meta
:
{
title
:
"
个人中心
"
,
icon
:
"
user
"
},
meta
:
{
title
:
"
个人中心
"
,
icon
:
"
user
"
},
},
},
],
],
},
},
{
path
:
"
/login
"
,
component
:
()
=>
import
(
"
@/views/login
"
),
hidden
:
true
,
},
{
path
:
"
/register
"
,
component
:
()
=>
import
(
"
@/views/register
"
),
hidden
:
true
,
},
{
path
:
"
/404
"
,
component
:
()
=>
import
(
"
@/views/error/404
"
),
hidden
:
true
,
},
{
path
:
"
/401
"
,
component
:
()
=>
import
(
"
@/views/error/401
"
),
hidden
:
true
,
},
];
];
// 动态路由,基于用户权限动态去加载
// 动态路由,基于用户权限动态去加载
...
...
src/views/risk/plan/ledgerdata.vue
View file @
6ae5acef
...
@@ -344,12 +344,13 @@ export default {
...
@@ -344,12 +344,13 @@ export default {
downList
(
planId
)
{
downList
(
planId
)
{
this
.
download
(
"
/system/risk/plan/exportExcel/InherentList/
"
+
planId
,
{});
this
.
download
(
"
/system/risk/plan/exportExcel/InherentList/
"
+
planId
,
{});
},
},
showDrawCanvas
(
floorId
)
{
showDrawCanvas
(
floorId
,
buildingId
)
{
this
.
$router
.
push
({
this
.
$router
.
push
({
name
:
"
drawCanvas
"
,
name
:
"
drawCanvas
"
,
params
:
{
params
:
{
floorId
:
floorId
,
floorId
,
isViews
:
true
,
isViews
:
true
,
buildingId
,
},
},
});
});
},
},
...
...
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