Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
finance-manage
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
finance-oa
finance-manage
Commits
6a5c8654
Commit
6a5c8654
authored
Jul 27, 2021
by
RuoYi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
跳转路由高亮相对应的菜单栏
parent
3803ac78
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
20 additions
and
19 deletions
+20
-19
ruoyi-ui/src/router/index.js
ruoyi-ui/src/router/index.js
+14
-13
ruoyi-ui/src/views/monitor/job/index.vue
ruoyi-ui/src/views/monitor/job/index.vue
+1
-1
ruoyi-ui/src/views/system/dict/index.vue
ruoyi-ui/src/views/system/dict/index.vue
+1
-1
ruoyi-ui/src/views/system/role/index.vue
ruoyi-ui/src/views/system/role/index.vue
+2
-2
ruoyi-ui/src/views/system/user/index.vue
ruoyi-ui/src/views/system/user/index.vue
+1
-1
ruoyi-ui/src/views/tool/gen/index.vue
ruoyi-ui/src/views/tool/gen/index.vue
+1
-1
No files found.
ruoyi-ui/src/router/index.js
View file @
6a5c8654
...
@@ -21,6 +21,7 @@ import Layout from '@/layout'
...
@@ -21,6 +21,7 @@ import Layout from '@/layout'
title: 'title' // 设置该路由在侧边栏和面包屑中展示的名字
title: 'title' // 设置该路由在侧边栏和面包屑中展示的名字
icon: 'svg-name' // 设置该路由的图标,对应路径src/assets/icons/svg
icon: 'svg-name' // 设置该路由的图标,对应路径src/assets/icons/svg
breadcrumb: false // 如果设置为false,则不会在breadcrumb面包屑中显示
breadcrumb: false // 如果设置为false,则不会在breadcrumb面包屑中显示
activeMenu: '/system/user' // 当路由设置了该属性,则会高亮相对应的侧边栏。
}
}
*/
*/
...
@@ -80,7 +81,7 @@ export const constantRoutes = [
...
@@ -80,7 +81,7 @@ export const constantRoutes = [
]
]
},
},
{
{
path
:
'
/auth
'
,
path
:
'
/
system/user-
auth
'
,
component
:
Layout
,
component
:
Layout
,
hidden
:
true
,
hidden
:
true
,
children
:
[
children
:
[
...
@@ -88,12 +89,12 @@ export const constantRoutes = [
...
@@ -88,12 +89,12 @@ export const constantRoutes = [
path
:
'
role/:userId(
\\
d+)
'
,
path
:
'
role/:userId(
\\
d+)
'
,
component
:
(
resolve
)
=>
require
([
'
@/views/system/user/authRole
'
],
resolve
),
component
:
(
resolve
)
=>
require
([
'
@/views/system/user/authRole
'
],
resolve
),
name
:
'
AuthRole
'
,
name
:
'
AuthRole
'
,
meta
:
{
title
:
'
分配角色
'
}
meta
:
{
title
:
'
分配角色
'
,
activeMenu
:
'
/system/user
'
}
}
}
]
]
},
},
{
{
path
:
'
/auth
'
,
path
:
'
/
system/role-
auth
'
,
component
:
Layout
,
component
:
Layout
,
hidden
:
true
,
hidden
:
true
,
children
:
[
children
:
[
...
@@ -101,46 +102,46 @@ export const constantRoutes = [
...
@@ -101,46 +102,46 @@ export const constantRoutes = [
path
:
'
user/:roleId(
\\
d+)
'
,
path
:
'
user/:roleId(
\\
d+)
'
,
component
:
(
resolve
)
=>
require
([
'
@/views/system/role/authUser
'
],
resolve
),
component
:
(
resolve
)
=>
require
([
'
@/views/system/role/authUser
'
],
resolve
),
name
:
'
AuthUser
'
,
name
:
'
AuthUser
'
,
meta
:
{
title
:
'
分配用户
'
}
meta
:
{
title
:
'
分配用户
'
,
activeMenu
:
'
/system/role
'
}
}
}
]
]
},
},
{
{
path
:
'
/
dict
'
,
path
:
'
/
system/dict-data
'
,
component
:
Layout
,
component
:
Layout
,
hidden
:
true
,
hidden
:
true
,
children
:
[
children
:
[
{
{
path
:
'
type/data
/:dictId(
\\
d+)
'
,
path
:
'
index
/:dictId(
\\
d+)
'
,
component
:
(
resolve
)
=>
require
([
'
@/views/system/dict/data
'
],
resolve
),
component
:
(
resolve
)
=>
require
([
'
@/views/system/dict/data
'
],
resolve
),
name
:
'
Data
'
,
name
:
'
Data
'
,
meta
:
{
title
:
'
字典数据
'
,
icon
:
''
}
meta
:
{
title
:
'
字典数据
'
,
activeMenu
:
'
/system/dict
'
}
}
}
]
]
},
},
{
{
path
:
'
/
job
'
,
path
:
'
/
monitor/job-log
'
,
component
:
Layout
,
component
:
Layout
,
hidden
:
true
,
hidden
:
true
,
children
:
[
children
:
[
{
{
path
:
'
log
'
,
path
:
'
index
'
,
component
:
(
resolve
)
=>
require
([
'
@/views/monitor/job/log
'
],
resolve
),
component
:
(
resolve
)
=>
require
([
'
@/views/monitor/job/log
'
],
resolve
),
name
:
'
JobLog
'
,
name
:
'
JobLog
'
,
meta
:
{
title
:
'
调度日志
'
}
meta
:
{
title
:
'
调度日志
'
,
activeMenu
:
'
/monitor/job
'
}
}
}
]
]
},
},
{
{
path
:
'
/
gen
'
,
path
:
'
/
tool/gen-edit
'
,
component
:
Layout
,
component
:
Layout
,
hidden
:
true
,
hidden
:
true
,
children
:
[
children
:
[
{
{
path
:
'
edit
/:tableId(
\\
d+)
'
,
path
:
'
index
/:tableId(
\\
d+)
'
,
component
:
(
resolve
)
=>
require
([
'
@/views/tool/gen/editTable
'
],
resolve
),
component
:
(
resolve
)
=>
require
([
'
@/views/tool/gen/editTable
'
],
resolve
),
name
:
'
GenEdit
'
,
name
:
'
GenEdit
'
,
meta
:
{
title
:
'
修改生成配置
'
}
meta
:
{
title
:
'
修改生成配置
'
,
activeMenu
:
'
/tool/gen
'
}
}
}
]
]
}
}
...
...
ruoyi-ui/src/views/monitor/job/index.vue
View file @
6a5c8654
...
@@ -451,7 +451,7 @@ export default {
...
@@ -451,7 +451,7 @@ export default {
/** 任务日志列表查询 */
/** 任务日志列表查询 */
handleJobLog
(
row
)
{
handleJobLog
(
row
)
{
const
jobId
=
row
.
jobId
||
0
;
const
jobId
=
row
.
jobId
||
0
;
this
.
$router
.
push
({
path
:
'
/
job/log
'
,
query
:
{
jobId
:
jobId
}
})
this
.
$router
.
push
({
path
:
'
/
monitor/job-log/index
'
,
query
:
{
jobId
:
jobId
}
})
},
},
/** 新增按钮操作 */
/** 新增按钮操作 */
handleAdd
()
{
handleAdd
()
{
...
...
ruoyi-ui/src/views/system/dict/index.vue
View file @
6a5c8654
...
@@ -118,7 +118,7 @@
...
@@ -118,7 +118,7 @@
<el-table-column
label=
"字典名称"
align=
"center"
prop=
"dictName"
:show-overflow-tooltip=
"true"
/>
<el-table-column
label=
"字典名称"
align=
"center"
prop=
"dictName"
:show-overflow-tooltip=
"true"
/>
<el-table-column
label=
"字典类型"
align=
"center"
:show-overflow-tooltip=
"true"
>
<el-table-column
label=
"字典类型"
align=
"center"
:show-overflow-tooltip=
"true"
>
<template
slot-scope=
"scope"
>
<template
slot-scope=
"scope"
>
<router-link
:to=
"'/
dict/type/data
/' + scope.row.dictId"
class=
"link-type"
>
<router-link
:to=
"'/
system/dict-data/index
/' + scope.row.dictId"
class=
"link-type"
>
<span>
{{
scope
.
row
.
dictType
}}
</span>
<span>
{{
scope
.
row
.
dictType
}}
</span>
</router-link>
</router-link>
</
template
>
</
template
>
...
...
ruoyi-ui/src/views/system/role/index.vue
View file @
6a5c8654
...
@@ -168,7 +168,7 @@
...
@@ -168,7 +168,7 @@
<el-form-item
label=
"角色名称"
prop=
"roleName"
>
<el-form-item
label=
"角色名称"
prop=
"roleName"
>
<el-input
v-model=
"form.roleName"
placeholder=
"请输入角色名称"
/>
<el-input
v-model=
"form.roleName"
placeholder=
"请输入角色名称"
/>
</el-form-item>
</el-form-item>
<el-form-item
label=
"权限字符"
prop=
"roleKey"
>
<el-form-item
prop=
"roleKey"
>
<span
slot=
"label"
>
<span
slot=
"label"
>
<el-tooltip
content=
"控制器中定义的权限字符,如:@PreAuthorize(`@ss.hasRole('admin')`)"
placement=
"top"
>
<el-tooltip
content=
"控制器中定义的权限字符,如:@PreAuthorize(`@ss.hasRole('admin')`)"
placement=
"top"
>
<i
class=
"el-icon-question"
></i>
<i
class=
"el-icon-question"
></i>
...
@@ -574,7 +574,7 @@ export default {
...
@@ -574,7 +574,7 @@ export default {
/** 分配用户操作 */
/** 分配用户操作 */
handleAuthUser
:
function
(
row
)
{
handleAuthUser
:
function
(
row
)
{
const
roleId
=
row
.
roleId
;
const
roleId
=
row
.
roleId
;
this
.
$router
.
push
(
"
/auth/user/
"
+
roleId
);
this
.
$router
.
push
(
"
/
system/role-
auth/user/
"
+
roleId
);
},
},
/** 提交按钮 */
/** 提交按钮 */
submitForm
:
function
()
{
submitForm
:
function
()
{
...
...
ruoyi-ui/src/views/system/user/index.vue
View file @
6a5c8654
...
@@ -621,7 +621,7 @@ export default {
...
@@ -621,7 +621,7 @@ export default {
/** 分配角色操作 */
/** 分配角色操作 */
handleAuthRole
:
function
(
row
)
{
handleAuthRole
:
function
(
row
)
{
const
userId
=
row
.
userId
;
const
userId
=
row
.
userId
;
this
.
$router
.
push
(
"
/auth/role/
"
+
userId
);
this
.
$router
.
push
(
"
/
system/user-
auth/role/
"
+
userId
);
},
},
/** 提交按钮 */
/** 提交按钮 */
submitForm
:
function
()
{
submitForm
:
function
()
{
...
...
ruoyi-ui/src/views/tool/gen/index.vue
View file @
6a5c8654
...
@@ -319,7 +319,7 @@ export default {
...
@@ -319,7 +319,7 @@ export default {
/** 修改按钮操作 */
/** 修改按钮操作 */
handleEditTable
(
row
)
{
handleEditTable
(
row
)
{
const
tableId
=
row
.
tableId
||
this
.
ids
[
0
];
const
tableId
=
row
.
tableId
||
this
.
ids
[
0
];
this
.
$router
.
push
(
"
/
gen/edit
/
"
+
tableId
);
this
.
$router
.
push
(
"
/
tool/gen-edit/index
/
"
+
tableId
);
},
},
/** 删除按钮操作 */
/** 删除按钮操作 */
handleDelete
(
row
)
{
handleDelete
(
row
)
{
...
...
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