Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qa-platform-ui
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
QA
qa-platform-ui
Commits
836be565
Commit
836be565
authored
Jun 28, 2022
by
王晓铜
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改登录页面不选择环境
parent
6464f0fe
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
24 additions
and
12 deletions
+24
-12
dev.env.js
config/dev.env.js
+2
-2
EnvDetail.vue
src/views/docker/EnvDetail.vue
+1
-0
Aside.vue
src/views/layout/leftAside/Aside.vue
+3
-0
Login.vue
src/views/login/Login.vue
+6
-5
role.vue
src/views/user/role.vue
+12
-5
No files found.
config/dev.env.js
View file @
836be565
...
@@ -8,6 +8,6 @@ module.exports = merge(prodEnv, {
...
@@ -8,6 +8,6 @@ module.exports = merge(prodEnv, {
// QA_PLATFORM: '"//localhost:8082"',
// QA_PLATFORM: '"//localhost:8082"',
TESTDATA_API
:
'
"//testdata.liangkebang.com"
'
,
TESTDATA_API
:
'
"//testdata.liangkebang.com"
'
,
// HOLMES: '"//localhost:8084"',
// HOLMES: '"//localhost:8084"',
QA_PLATFORM
:
'
"//qa-platform
-fe
.liangkebang.net/"
'
,
QA_PLATFORM
:
'
"//qa-platform.liangkebang.net/"
'
,
HOLMES
:
'
"//holmes
-fe
.liangkebang.net/"
'
,
HOLMES
:
'
"//holmes.liangkebang.net/"
'
,
})
})
src/views/docker/EnvDetail.vue
View file @
836be565
...
@@ -801,6 +801,7 @@ export default {
...
@@ -801,6 +801,7 @@ export default {
)
)
},
},
openConsole
(
data
)
{
openConsole
(
data
)
{
console
.
log
(
'
9090
'
,
data
)
let
port
let
port
if
(
data
.
serviceName
===
'
rabbitmq
'
)
{
if
(
data
.
serviceName
===
'
rabbitmq
'
)
{
port
=
data
.
portMappings
.
filter
((
item
)
=>
item
.
port
===
15672
)[
0
]
port
=
data
.
portMappings
.
filter
((
item
)
=>
item
.
port
===
15672
)[
0
]
...
...
src/views/layout/leftAside/Aside.vue
View file @
836be565
...
@@ -74,6 +74,7 @@ export default {
...
@@ -74,6 +74,7 @@ export default {
// 判断子菜单是否为空,为空不添加
// 判断子菜单是否为空,为空不添加
if
(
temp
.
child
.
length
>
0
)
{
if
(
temp
.
child
.
length
>
0
)
{
this
.
nav
.
push
(
temp
)
this
.
nav
.
push
(
temp
)
console
.
log
(
'
0000
'
,
this
.
nav
)
}
}
})
})
this
.
$store
.
dispatch
(
'
header/setNavs
'
,
{
this
.
$store
.
dispatch
(
'
header/setNavs
'
,
{
...
@@ -90,6 +91,7 @@ export default {
...
@@ -90,6 +91,7 @@ export default {
},
},
// 保存链接的激活状态
// 保存链接的激活状态
saveNavState
(
activePath
)
{
saveNavState
(
activePath
)
{
console
.
log
(
'
8989
'
,
activePath
)
this
.
activePath
=
activePath
this
.
activePath
=
activePath
window
.
sessionStorage
.
setItem
(
'
activePath
'
,
activePath
)
window
.
sessionStorage
.
setItem
(
'
activePath
'
,
activePath
)
},
},
...
@@ -122,6 +124,7 @@ export default {
...
@@ -122,6 +124,7 @@ export default {
// 获取namespace列表,该列表决定用户是否展示新增、更新等按钮
// 获取namespace列表,该列表决定用户是否展示新增、更新等按钮
getUserNsList
()
{
getUserNsList
()
{
getNsByRoleId
().
then
((
resp
)
=>
{
getNsByRoleId
().
then
((
resp
)
=>
{
console
.
log
(
'
90909
'
,
resp
)
window
.
localStorage
.
setItem
(
'
nsList
'
,
resp
.
data
.
data
)
window
.
localStorage
.
setItem
(
'
nsList
'
,
resp
.
data
.
data
)
})
})
}
}
...
...
src/views/login/Login.vue
View file @
836be565
...
@@ -8,10 +8,12 @@
...
@@ -8,10 +8,12 @@
<el-input
v-model=
"loginForm.username"
placeholder=
"请输入用户名"
prefix-icon=
"el-icon-user-solid"
></el-input>
<el-input
v-model=
"loginForm.username"
placeholder=
"请输入用户名"
prefix-icon=
"el-icon-user-solid"
></el-input>
</el-form-item>
</el-form-item>
<el-form-item
prop=
"password"
class=
"input-style"
>
<el-form-item
prop=
"password"
class=
"input-style"
>
<el-input
type=
"password"
@
keyup.enter.native=
"login"
v-model=
"loginForm.password"
placeholder=
"请输入密码"
prefix-icon=
"el-icon-unlock"
show-password
></el-input>
<el-input
type=
"password"
@
keyup.enter.native=
"login"
v-model=
"loginForm.password"
placeholder=
"请输入密码"
prefix-icon=
"el-icon-unlock"
show-password
></el-input>
</el-form-item>
</el-form-item>
<el-form-item
class=
"input-style"
prop=
"namespace"
>
<el-form-item
class=
"input-style"
>
<el-select
v-model=
"loginForm.namespace"
filterable
placeholder=
"请选择环境"
@
change=
"handleSelectChange"
style=
"width: 100%;"
>
<el-select
v-model=
"loginForm.namespace"
filterable
placeholder=
"请选择环境"
@
change=
"handleSelectChange"
style=
"width: 100%;"
>
<el-option
v-for=
"item in nsOptions"
:key=
"item.name"
:label=
"item.name"
:value=
"item.name"
></el-option>
<el-option
v-for=
"item in nsOptions"
:key=
"item.name"
:label=
"item.name"
:value=
"item.name"
></el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
...
@@ -41,8 +43,7 @@ export default {
...
@@ -41,8 +43,7 @@ export default {
username
:
[
username
:
[
{
required
:
true
,
trigger
:
'
blur
'
,
message
:
'
请输入用户名
'
}
{
required
:
true
,
trigger
:
'
blur
'
,
message
:
'
请输入用户名
'
}
],
],
password
:
[{
required
:
true
,
trigger
:
'
blur
'
,
message
:
'
请输入密码
'
}],
password
:
[{
required
:
true
,
trigger
:
'
blur
'
,
message
:
'
请输入密码
'
}]
namespace
:
[{
required
:
true
,
trigger
:
'
blur
'
,
message
:
'
请选择环境
'
}]
},
},
token
:
''
token
:
''
}
}
...
...
src/views/user/role.vue
View file @
836be565
...
@@ -2,7 +2,8 @@
...
@@ -2,7 +2,8 @@
<div>
<div>
<el-card>
<el-card>
<div
class=
"filter"
>
<div
class=
"filter"
>
<el-button
type=
"primary"
icon=
"el-icon-circle-plus"
@
click=
"showCreate"
v-permission=
"('user:role:add')"
>
新增
</el-button>
<el-button
type=
"primary"
icon=
"el-icon-circle-plus"
@
click=
"showCreate"
v-permission=
"('user:role:add')"
>
新增
</el-button>
</div>
</div>
<el-table
:data=
"roleList"
border
style=
"width: 100%;margin-top:20px"
>
<el-table
:data=
"roleList"
border
style=
"width: 100%;margin-top:20px"
>
<el-table-column
type=
'index'
width=
"50px"
>
<el-table-column
type=
'index'
width=
"50px"
>
...
@@ -29,12 +30,16 @@
...
@@ -29,12 +30,16 @@
<el-table-column
prop=
"createTime"
label=
"创建时间"
width=
"200px"
></el-table-column>
<el-table-column
prop=
"createTime"
label=
"创建时间"
width=
"200px"
></el-table-column>
<el-table-column
label=
"操作"
>
<el-table-column
label=
"操作"
>
<slot
slot-scope=
"scope"
>
<slot
slot-scope=
"scope"
>
<el-button
type=
"warning"
icon=
"el-icon-edit"
@
click=
"editRoleDialog(scope.$index)"
v-permission=
"('user:role:edit')"
>
编辑
</el-button>
<el-button
type=
"warning"
icon=
"el-icon-edit"
@
click=
"editRoleDialog(scope.$index)"
<el-button
type=
"danger"
icon=
"el-icon-delete"
@
click=
"delRoleFrom(scope.row)"
v-permission=
"('user:role:del')"
>
删除
</el-button>
v-permission=
"('user:role:edit')"
>
编辑
</el-button>
<el-button
type=
"danger"
icon=
"el-icon-delete"
@
click=
"delRoleFrom(scope.row)"
v-permission=
"('user:role:del')"
>
删除
</el-button>
</slot>
</slot>
</el-table-column>
</el-table-column>
</el-table>
</el-table>
<el-pagination
background
@
size-change=
"handleSizeChange"
@
current-change=
"handleCurrentChange"
:current-page.sync=
"queryModuleInfo.pageNum"
:page-size=
"queryModuleInfo.pageSize"
layout=
"total, prev, pager, next"
:total=
"totalNum"
>
<el-pagination
background
@
size-change=
"handleSizeChange"
@
current-change=
"handleCurrentChange"
:current-page.sync=
"queryModuleInfo.pageNum"
:page-size=
"queryModuleInfo.pageSize"
layout=
"total, prev, pager, next"
:total=
"totalNum"
>
</el-pagination>
</el-pagination>
</el-card>
</el-card>
<!-- 添加角色 -->
<!-- 添加角色 -->
...
@@ -46,7 +51,8 @@
...
@@ -46,7 +51,8 @@
<el-form-item
label=
"菜单&权限"
prop=
"roleCode"
style=
"width:700px"
>
<el-form-item
label=
"菜单&权限"
prop=
"roleCode"
style=
"width:700px"
>
<div
v-for=
" (menu,_index) in allPermissionList"
:key=
"menu.menuName"
>
<div
v-for=
" (menu,_index) in allPermissionList"
:key=
"menu.menuName"
>
<span
style=
"width:100px;display: inline-block;"
>
<span
style=
"width:100px;display: inline-block;"
>
<el-button
:type=
"isMenuNone(_index)?'':(isMenuAll(_index)?'success':'primary')"
size=
"mini"
style=
"width:100px;"
@
click=
"checkAll(_index)"
>
{{menu.menuName}}
</el-button>
<el-button
:type=
"isMenuNone(_index)?'':(isMenuAll(_index)?'success':'primary')"
size=
"mini"
style=
"width:100px;"
@
click=
"checkAll(_index)"
>
{{menu.menuName}}
</el-button>
</span>
</span>
<div
style=
"display:inline-block;margin-left:30px;"
>
<div
style=
"display:inline-block;margin-left:30px;"
>
<el-checkbox-group
v-model=
"addRoleForm.permissionIdList"
>
<el-checkbox-group
v-model=
"addRoleForm.permissionIdList"
>
...
@@ -180,6 +186,7 @@ export default {
...
@@ -180,6 +186,7 @@ export default {
}
else
{
}
else
{
addRolePermission
(
this
.
addRoleForm
)
addRolePermission
(
this
.
addRoleForm
)
.
then
((
resp
)
=>
{
.
then
((
resp
)
=>
{
console
.
log
(
'
角色ID
'
,
this
.
addRoleForm
)
if
(
resp
.
data
.
data
===
true
)
{
if
(
resp
.
data
.
data
===
true
)
{
this
.
$message
.
success
(
'
添加成功!
'
)
this
.
$message
.
success
(
'
添加成功!
'
)
this
.
dialogFormVisible
=
false
this
.
dialogFormVisible
=
false
...
...
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