Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
so-manage-ui
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
smart-operation
so-manage-ui
Commits
764e3956
Commit
764e3956
authored
Nov 01, 2022
by
张俊
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
菜单调整
parent
c68a4871
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
43 additions
and
40 deletions
+43
-40
src/components/bg-menu.vue
src/components/bg-menu.vue
+5
-2
src/page/main/config/dict/index.vue
src/page/main/config/dict/index.vue
+13
-13
src/page/main/develop/menu/index.vue
src/page/main/develop/menu/index.vue
+8
-8
src/page/main/develop/menu/menu-form.vue
src/page/main/develop/menu/menu-form.vue
+1
-1
src/page/main/system/role/add/role_form.vue
src/page/main/system/role/add/role_form.vue
+6
-6
src/page/main/system/role/index.vue
src/page/main/system/role/index.vue
+9
-9
src/router/function.js
src/router/function.js
+1
-1
No files found.
src/components/bg-menu.vue
View file @
764e3956
...
@@ -8,9 +8,9 @@
...
@@ -8,9 +8,9 @@
>
>
<!-- LOGO -->
<!-- LOGO -->
<
router-link
to=
"/
"
class=
"bg-logo"
>
<
div
@
click=
"gotoPage
"
class=
"bg-logo"
>
<img
style=
"width:140px;height:22px;"
src=
"../assets/imgs/img_logo.png"
/>
<img
style=
"width:140px;height:22px;"
src=
"../assets/imgs/img_logo.png"
/>
</
router-link
>
</
div
>
<!-- 菜单 -->
<!-- 菜单 -->
<div
class=
"main-menu"
v-if=
"userInfo&& userInfo.system_id"
>
<div
class=
"main-menu"
v-if=
"userInfo&& userInfo.system_id"
>
...
@@ -172,6 +172,9 @@ export default {
...
@@ -172,6 +172,9 @@ export default {
navAction
(
path
)
{
navAction
(
path
)
{
this
.
$router
.
push
(
path
);
this
.
$router
.
push
(
path
);
},
},
gotoPage
(){
window
.
open
(
'
/apaas/portal/ui/#/
'
,
'
_blank
'
)
},
changezz
(
item
){
changezz
(
item
){
this
.
$trace
.
setOptionValue
(
'
appID
'
,
item
.
value
)
this
.
$trace
.
setOptionValue
(
'
appID
'
,
item
.
value
)
},
},
...
...
src/page/main/config/dict/index.vue
View file @
764e3956
...
@@ -278,7 +278,7 @@ const getTypeList = () => {
...
@@ -278,7 +278,7 @@ const getTypeList = () => {
getTableRows
()
getTableRows
()
}
}
}
else
{
}
else
{
ElMessage
.
error
(
res
.
data
.
data
)
ElMessage
.
error
(
res
.
data
.
msg
)
}
}
}).
catch
((
err
)
=>
{
}).
catch
((
err
)
=>
{
console
.
log
(
err
)
console
.
log
(
err
)
...
@@ -352,7 +352,7 @@ const getTableRows = () => {
...
@@ -352,7 +352,7 @@ const getTableRows = () => {
state
.
tableRows
[
state
.
tableRows
.
length
-
1
].
canMoveDown
=
false
state
.
tableRows
[
state
.
tableRows
.
length
-
1
].
canMoveDown
=
false
}
}
}
else
{
}
else
{
ElMessage
.
error
(
res
.
data
.
data
)
ElMessage
.
error
(
res
.
data
.
msg
)
}
}
})
})
}
// 获取表格数据
}
// 获取表格数据
...
@@ -362,10 +362,10 @@ const changeUseRow = (row) => {
...
@@ -362,10 +362,10 @@ const changeUseRow = (row) => {
.
put
(
`/apaas/system/v5/dictionary/state?id=
${
row
.
id
}
&state=
${
row
.
state
}
`
)
.
put
(
`/apaas/system/v5/dictionary/state?id=
${
row
.
id
}
&state=
${
row
.
state
}
`
)
.
then
((
res
)
=>
{
.
then
((
res
)
=>
{
if
(
res
.
data
.
code
==
200
)
{
if
(
res
.
data
.
code
==
200
)
{
ElMessage
.
success
(
res
.
data
.
data
)
ElMessage
.
success
(
res
.
data
.
msg
)
changePage
(
1
)
changePage
(
1
)
}
else
{
}
else
{
ElMessage
.
error
(
res
.
data
.
data
)
ElMessage
.
error
(
res
.
data
.
msg
)
}
}
})
})
}
// 启用禁用
}
// 启用禁用
...
@@ -411,7 +411,7 @@ const edit_row = (row) => {
...
@@ -411,7 +411,7 @@ const edit_row = (row) => {
state
:
state
.
actionRow
.
state
state
:
state
.
actionRow
.
state
}
}
}
else
{
}
else
{
ElMessage
.
error
(
res
.
data
.
data
)
ElMessage
.
error
(
res
.
data
.
msg
)
}
}
}).
catch
((
err
)
=>
{
}).
catch
((
err
)
=>
{
console
.
log
(
err
)
console
.
log
(
err
)
...
@@ -441,11 +441,11 @@ const addConfirm = () => {
...
@@ -441,11 +441,11 @@ const addConfirm = () => {
.
post
(
`/apaas/system/v5/dictionary/add`
,
params
)
.
post
(
`/apaas/system/v5/dictionary/add`
,
params
)
.
then
((
res
)
=>
{
.
then
((
res
)
=>
{
if
(
res
.
data
.
code
==
200
)
{
if
(
res
.
data
.
code
==
200
)
{
ElMessage
.
success
(
res
.
data
.
data
)
ElMessage
.
success
(
res
.
data
.
msg
)
state
.
addDialog
=
false
state
.
addDialog
=
false
changePage
(
1
)
changePage
(
1
)
}
else
{
}
else
{
ElMessage
.
error
(
res
.
data
.
data
)
ElMessage
.
error
(
res
.
data
.
msg
)
}
}
})
})
}
else
{
// 编辑
}
else
{
// 编辑
...
@@ -457,11 +457,11 @@ const addConfirm = () => {
...
@@ -457,11 +457,11 @@ const addConfirm = () => {
.
put
(
`/apaas/system/v5/dictionary/update`
,
params
)
.
put
(
`/apaas/system/v5/dictionary/update`
,
params
)
.
then
((
res
)
=>
{
.
then
((
res
)
=>
{
if
(
res
.
data
.
code
==
200
)
{
if
(
res
.
data
.
code
==
200
)
{
ElMessage
.
success
(
res
.
data
.
data
)
ElMessage
.
success
(
res
.
data
.
msg
)
state
.
addDialog
=
false
state
.
addDialog
=
false
changePage
(
1
)
changePage
(
1
)
}
else
{
}
else
{
ElMessage
.
error
(
res
.
data
.
data
)
ElMessage
.
error
(
res
.
data
.
msg
)
}
}
})
})
}
}
...
@@ -481,11 +481,11 @@ const deleteData = () => {
...
@@ -481,11 +481,11 @@ const deleteData = () => {
)
)
.
then
((
res
)
=>
{
.
then
((
res
)
=>
{
if
(
res
.
data
.
code
==
200
)
{
if
(
res
.
data
.
code
==
200
)
{
ElMessage
.
success
(
res
.
data
.
data
)
ElMessage
.
success
(
res
.
data
.
msg
)
state
.
dialogDelete
=
false
state
.
dialogDelete
=
false
changePage
(
1
)
changePage
(
1
)
}
else
{
}
else
{
ElMessage
.
error
(
res
.
data
.
data
)
ElMessage
.
error
(
res
.
data
.
msg
)
}
}
})
})
}
// 确定删除
}
// 确定删除
...
@@ -517,10 +517,10 @@ const moveRow = (row,type) => {
...
@@ -517,10 +517,10 @@ const moveRow = (row,type) => {
.
put
(
`/apaas/system/v5/dictionary/sort`
,[...
params
])
.
put
(
`/apaas/system/v5/dictionary/sort`
,[...
params
])
.
then
((
res
)
=>
{
.
then
((
res
)
=>
{
if
(
res
.
data
.
code
==
200
)
{
if
(
res
.
data
.
code
==
200
)
{
ElMessage
.
success
(
res
.
data
.
data
)
ElMessage
.
success
(
res
.
data
.
msg
)
changePage
(
1
)
changePage
(
1
)
}
else
{
}
else
{
ElMessage
.
error
(
res
.
data
.
data
)
ElMessage
.
error
(
res
.
data
.
msg
)
}
}
})
})
.
catch
((
err
)
=>
{
.
catch
((
err
)
=>
{
...
...
src/page/main/develop/menu/index.vue
View file @
764e3956
...
@@ -177,7 +177,7 @@ const getMenuTree = (type) => {
...
@@ -177,7 +177,7 @@ const getMenuTree = (type) => {
})
})
}
else
{
}
else
{
ElMessage
.
error
(
res
.
data
.
data
)
ElMessage
.
error
(
res
.
data
.
msg
)
}
}
})
})
}
// 获取菜单树
}
// 获取菜单树
...
@@ -302,12 +302,12 @@ const fileAction = (val,data,parent,disabled=false) => {
...
@@ -302,12 +302,12 @@ const fileAction = (val,data,parent,disabled=false) => {
.
delete
(
`/apaas/system/v5/menu/
${
data
.
id
}
`
)
.
delete
(
`/apaas/system/v5/menu/
${
data
.
id
}
`
)
.
then
((
res
)
=>
{
.
then
((
res
)
=>
{
if
(
res
.
data
.
code
==
200
)
{
if
(
res
.
data
.
code
==
200
)
{
ElMessage
.
success
(
res
.
data
.
data
)
ElMessage
.
success
(
res
.
data
.
msg
)
state
.
selectData
=
null
state
.
selectData
=
null
let
type
=
parent
?
1
:
2
// 1--有父级 2--无父级
let
type
=
parent
?
1
:
2
// 1--有父级 2--无父级
getMenuTree
(
type
)
getMenuTree
(
type
)
}
else
{
}
else
{
ElMessage
.
error
(
res
.
data
.
data
)
ElMessage
.
error
(
res
.
data
.
msg
)
}
}
})
})
}
else
if
(
val
==
4
)
{
// 菜单上移
}
else
if
(
val
==
4
)
{
// 菜单上移
...
@@ -375,10 +375,10 @@ const changeSort = (data,nextObj) => {
...
@@ -375,10 +375,10 @@ const changeSort = (data,nextObj) => {
.
put
(
`/apaas/system/v5/menu/sort`
,
params
)
.
put
(
`/apaas/system/v5/menu/sort`
,
params
)
.
then
((
res
)
=>
{
.
then
((
res
)
=>
{
if
(
res
.
data
.
code
==
200
)
{
if
(
res
.
data
.
code
==
200
)
{
ElMessage
.
success
(
res
.
data
.
data
)
ElMessage
.
success
(
res
.
data
.
msg
)
getMenuTree
()
getMenuTree
()
}
else
{
}
else
{
ElMessage
.
error
(
res
.
data
.
data
)
ElMessage
.
error
(
res
.
data
.
msg
)
}
}
})
})
}
// 菜单上下移
}
// 菜单上下移
...
@@ -406,7 +406,7 @@ const saveMenu = (el,type) => {
...
@@ -406,7 +406,7 @@ const saveMenu = (el,type) => {
ElMessage
.
success
(
res
.
data
.
msg
)
ElMessage
.
success
(
res
.
data
.
msg
)
getMenuTree
()
getMenuTree
()
}
else
{
}
else
{
ElMessage
.
error
(
res
.
data
.
data
)
ElMessage
.
error
(
res
.
data
.
msg
)
}
}
})
})
}
else
{
// 新增
}
else
{
// 新增
...
@@ -425,11 +425,11 @@ const saveMenu = (el,type) => {
...
@@ -425,11 +425,11 @@ const saveMenu = (el,type) => {
.
post
(
`/apaas/system/v5/menu/add`
,
params
)
.
post
(
`/apaas/system/v5/menu/add`
,
params
)
.
then
((
res
)
=>
{
.
then
((
res
)
=>
{
if
(
res
.
data
.
code
==
200
)
{
if
(
res
.
data
.
code
==
200
)
{
ElMessage
.
success
(
res
.
data
.
data
)
ElMessage
.
success
(
res
.
data
.
msg
)
state
.
selectData
=
null
state
.
selectData
=
null
getMenuTree
()
getMenuTree
()
}
else
{
}
else
{
ElMessage
.
error
(
res
.
data
.
data
)
ElMessage
.
error
(
res
.
data
.
msg
)
}
}
})
})
}
}
...
...
src/page/main/develop/menu/menu-form.vue
View file @
764e3956
...
@@ -151,7 +151,7 @@ const getGroupList = () => {
...
@@ -151,7 +151,7 @@ const getGroupList = () => {
if
(
res
.
data
.
code
==
200
)
{
if
(
res
.
data
.
code
==
200
)
{
state
.
groupList
=
res
.
data
.
data
||
[]
state
.
groupList
=
res
.
data
.
data
||
[]
}
else
{
}
else
{
ElMessage
.
error
(
res
.
data
.
data
)
ElMessage
.
error
(
res
.
data
.
msg
)
}
}
}).
catch
((
err
)
=>
{
}).
catch
((
err
)
=>
{
console
.
log
(
err
)
console
.
log
(
err
)
...
...
src/page/main/system/role/add/role_form.vue
View file @
764e3956
...
@@ -127,7 +127,7 @@ const getMenuTree = () => {
...
@@ -127,7 +127,7 @@ const getMenuTree = () => {
if
(
res
.
data
.
code
==
200
)
{
if
(
res
.
data
.
code
==
200
)
{
roleState
.
permissionData
=
res
.
data
.
data
||
[]
roleState
.
permissionData
=
res
.
data
.
data
||
[]
}
else
{
}
else
{
ElMessage
.
error
(
res
.
data
.
data
)
ElMessage
.
error
(
res
.
data
.
msg
)
}
}
})
})
}
// 获取菜单数据
}
// 获取菜单数据
...
@@ -157,7 +157,7 @@ const getRoleDetail = () => {
...
@@ -157,7 +157,7 @@ const getRoleDetail = () => {
}
}
console
.
log
(
roleState
.
formData
.
permission_arr
)
console
.
log
(
roleState
.
formData
.
permission_arr
)
}
else
{
}
else
{
ElMessage
.
error
(
res
.
data
.
data
)
ElMessage
.
error
(
res
.
data
.
msg
)
}
}
})
})
}
// 获取角色详情
}
// 获取角色详情
...
@@ -177,10 +177,10 @@ const saveRole = () => {
...
@@ -177,10 +177,10 @@ const saveRole = () => {
.
put
(
`/apaas/system/v5/role/create`
,
params
)
.
put
(
`/apaas/system/v5/role/create`
,
params
)
.
then
((
res
)
=>
{
.
then
((
res
)
=>
{
if
(
res
.
data
.
code
==
200
)
{
if
(
res
.
data
.
code
==
200
)
{
ElMessage
.
success
(
res
.
data
.
data
)
ElMessage
.
success
(
res
.
data
.
msg
)
router
.
push
(
'
/system/role
'
)
router
.
push
(
'
/system/role
'
)
}
else
{
}
else
{
ElMessage
.
error
(
res
.
data
.
data
)
ElMessage
.
error
(
res
.
data
.
msg
)
}
}
})
})
}
else
{
// 编辑
}
else
{
// 编辑
...
@@ -189,10 +189,10 @@ const saveRole = () => {
...
@@ -189,10 +189,10 @@ const saveRole = () => {
.
post
(
`/apaas/system/v5/role/update`
,
params
)
.
post
(
`/apaas/system/v5/role/update`
,
params
)
.
then
((
res
)
=>
{
.
then
((
res
)
=>
{
if
(
res
.
data
.
code
==
200
)
{
if
(
res
.
data
.
code
==
200
)
{
ElMessage
.
success
(
res
.
data
.
data
)
ElMessage
.
success
(
res
.
data
.
msg
)
router
.
push
(
'
/system/role
'
)
router
.
push
(
'
/system/role
'
)
}
else
{
}
else
{
ElMessage
.
error
(
res
.
data
.
data
)
ElMessage
.
error
(
res
.
data
.
msg
)
}
}
})
})
}
}
...
...
src/page/main/system/role/index.vue
View file @
764e3956
...
@@ -306,7 +306,7 @@ const getRoleRows = () => {
...
@@ -306,7 +306,7 @@ const getRoleRows = () => {
state
.
tableRows
=
res
.
data
.
data
||
[]
state
.
tableRows
=
res
.
data
.
data
||
[]
state
.
tableTotal
=
res
.
data
.
total
state
.
tableTotal
=
res
.
data
.
total
}
else
{
}
else
{
ElMessage
.
error
(
re
.
data
.
data
)
ElMessage
.
error
(
re
.
data
.
msg
)
}
}
})
})
}
// 获取角色列表
}
// 获取角色列表
...
@@ -319,7 +319,7 @@ const getOrgList = () => {
...
@@ -319,7 +319,7 @@ const getOrgList = () => {
console
.
log
(
res
.
data
.
data
)
console
.
log
(
res
.
data
.
data
)
userState
.
orgList
=
res
.
data
.
data
||
[]
userState
.
orgList
=
res
.
data
.
data
||
[]
}
else
{
}
else
{
ElMessage
.
error
(
res
.
data
.
data
)
ElMessage
.
error
(
res
.
data
.
msg
)
}
}
})
})
}
// 获取组织列表
}
// 获取组织列表
...
@@ -343,10 +343,10 @@ const changeUseRow = (row) => {
...
@@ -343,10 +343,10 @@ const changeUseRow = (row) => {
.
post
(
`/apaas/system/v5/role/state/
${
row
.
id
}
/
${
row
.
state
}
`
)
.
post
(
`/apaas/system/v5/role/state/
${
row
.
id
}
/
${
row
.
state
}
`
)
.
then
((
res
)
=>
{
.
then
((
res
)
=>
{
if
(
res
.
data
.
code
==
200
)
{
if
(
res
.
data
.
code
==
200
)
{
ElMessage
.
success
(
res
.
data
.
data
)
ElMessage
.
success
(
res
.
data
.
msg
)
changePage
(
1
)
changePage
(
1
)
}
else
{
}
else
{
ElMessage
.
error
(
res
.
data
.
data
)
ElMessage
.
error
(
res
.
data
.
msg
)
}
}
})
})
}
// 更改启用禁用状态
}
// 更改启用禁用状态
...
@@ -408,7 +408,7 @@ const getUserList = () => {
...
@@ -408,7 +408,7 @@ const getUserList = () => {
})
})
})
})
}
else
{
}
else
{
ElMessage
.
error
(
res
.
data
.
data
)
ElMessage
.
error
(
res
.
data
.
msg
)
}
}
})
})
}
}
...
@@ -461,11 +461,11 @@ const distribute = () => {
...
@@ -461,11 +461,11 @@ const distribute = () => {
.
post
(
`/apaas/system/v5/role/allotment/user`
,
params
)
.
post
(
`/apaas/system/v5/role/allotment/user`
,
params
)
.
then
((
res
)
=>
{
.
then
((
res
)
=>
{
if
(
res
.
data
.
code
==
200
)
{
if
(
res
.
data
.
code
==
200
)
{
ElMessage
.
success
(
res
.
data
.
data
)
ElMessage
.
success
(
res
.
data
.
msg
)
userState
.
distributeDialog
=
false
userState
.
distributeDialog
=
false
changePage
(
1
)
changePage
(
1
)
}
else
{
}
else
{
ElMessage
.
error
(
res
.
data
.
data
)
ElMessage
.
error
(
res
.
data
.
msg
)
}
}
})
})
...
@@ -502,11 +502,11 @@ const deleteData = () => {
...
@@ -502,11 +502,11 @@ const deleteData = () => {
.
delete
(
`/apaas/system/v5/role/delete`
,{
data
:
{
ids
:[...
ids
]}})
.
delete
(
`/apaas/system/v5/role/delete`
,{
data
:
{
ids
:[...
ids
]}})
.
then
((
res
)
=>
{
.
then
((
res
)
=>
{
if
(
res
.
data
.
code
==
200
)
{
if
(
res
.
data
.
code
==
200
)
{
ElMessage
.
success
(
res
.
data
.
data
)
ElMessage
.
success
(
res
.
data
.
msg
)
state
.
delDialog
=
false
state
.
delDialog
=
false
changePage
(
1
)
changePage
(
1
)
}
else
{
}
else
{
ElMessage
.
error
(
res
.
data
.
data
)
ElMessage
.
error
(
res
.
data
.
msg
)
}
}
})
})
}
}
...
...
src/router/function.js
View file @
764e3956
...
@@ -35,7 +35,7 @@ var adminMenu = [
...
@@ -35,7 +35,7 @@ var adminMenu = [
menuType
:
2
,
menuType
:
2
,
},
},
{
{
menuName
:
"
服务注册
说明
"
,
menuName
:
"
服务注册
预览
"
,
path
:
"
/ability-register/preview
"
,
path
:
"
/ability-register/preview
"
,
dict_group_id
:
"
64c156e0-bfff-4bfc-a63a-56effe130a25
"
,
dict_group_id
:
"
64c156e0-bfff-4bfc-a63a-56effe130a25
"
,
menuType
:
2
,
menuType
:
2
,
...
...
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