Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qahome-diamond
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
qahome-diamond
Commits
3b6534e0
Commit
3b6534e0
authored
Apr 30, 2019
by
智勇
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
loading
parent
f76c0cb4
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
8 deletions
+17
-8
createEnv.vue
src/views/docker/createEnv.vue
+5
-2
envDetail.vue
src/views/docker/envDetail.vue
+8
-4
envTemplate.vue
src/views/docker/envTemplate.vue
+4
-2
No files found.
src/views/docker/createEnv.vue
View file @
3b6534e0
...
@@ -23,6 +23,7 @@
...
@@ -23,6 +23,7 @@
<el-form-item
v-for=
"(ns, index) in repoNamespaces"
:label=
"ns.type | upper"
:key=
"index"
>
<el-form-item
v-for=
"(ns, index) in repoNamespaces"
:label=
"ns.type | upper"
:key=
"index"
>
<el-card>
<el-card>
<el-button
<el-button
v-loading=
"listLoading"
v-for=
"item in ns.repos"
v-for=
"item in ns.repos"
:key=
"item.domain"
:key=
"item.domain"
:type=
"dependant[ns.type] && dependant[ns.type].find(sys => sys.appname === item.appname) ? 'success' : ''"
:type=
"dependant[ns.type] && dependant[ns.type].find(sys => sys.appname === item.appname) ? 'success' : ''"
...
@@ -33,7 +34,7 @@
...
@@ -33,7 +34,7 @@
</el-card>
</el-card>
</el-form-item>
</el-form-item>
</el-form>
</el-form>
<el-button
v-permission=
"['admin']"
style=
"margin-right:40px;margin-bottom:40px;float:right"
type=
"primary"
@
click=
"createData()"
>
{{
$t
(
'
table.confirm
'
)
}}
</el-button>
<el-button
v-permission=
"['admin']"
:disabled=
"loading"
style=
"margin-right:40px;margin-bottom:40px;float:right"
type=
"primary"
@
click=
"createData()"
>
{{
$t
(
'
table.confirm
'
)
}}
</el-button>
</div>
</div>
</
template
>
</
template
>
...
@@ -57,7 +58,8 @@ export default {
...
@@ -57,7 +58,8 @@ export default {
dependant
:
{},
dependant
:
{},
repoNamespaces
:
[],
repoNamespaces
:
[],
currentTemplate
:
''
,
currentTemplate
:
''
,
templates
:
{}
templates
:
{},
loading
:
true
}
}
},
},
...
@@ -70,6 +72,7 @@ export default {
...
@@ -70,6 +72,7 @@ export default {
getAllRepos
()
{
getAllRepos
()
{
getBaseRepos
().
then
(
res
=>
{
getBaseRepos
().
then
(
res
=>
{
this
.
repoNamespaces
=
res
.
data
.
filter
(
item
=>
item
.
type
===
'
base
'
)
this
.
repoNamespaces
=
res
.
data
.
filter
(
item
=>
item
.
type
===
'
base
'
)
this
.
loading
=
false
})
})
},
},
...
...
src/views/docker/envDetail.vue
View file @
3b6534e0
...
@@ -20,6 +20,7 @@
...
@@ -20,6 +20,7 @@
</div>
</div>
</div>
</div>
<el-table
<el-table
v-loading=
"listLoading"
:data=
"FormatTabledata.base"
:data=
"FormatTabledata.base"
:header-cell-style=
"
{background:'#F3F4F7',color:'#555'}"
:header-cell-style=
"
{background:'#F3F4F7',color:'#555'}"
size="medium"
size="medium"
...
@@ -87,6 +88,7 @@
...
@@ -87,6 +88,7 @@
</div>
</div>
</div>
</div>
<el-table
<el-table
v-loading=
"listLoading"
:data=
"FormatTabledata[item._id]"
:data=
"FormatTabledata[item._id]"
:header-cell-style=
"{background:'#F3F4F7',color:'#555'}"
:header-cell-style=
"{background:'#F3F4F7',color:'#555'}"
size=
"medium"
size=
"medium"
...
@@ -346,13 +348,15 @@ export default {
...
@@ -346,13 +348,15 @@ export default {
fetchK8sdetail
({
'
namespace
'
:
this
.
namespace
}).
then
(
res
=>
{
fetchK8sdetail
({
'
namespace
'
:
this
.
namespace
}).
then
(
res
=>
{
const
servicelist
=
res
.
data
.
services
const
servicelist
=
res
.
data
.
services
this
.
array2Object
(
servicelist
)
this
.
array2Object
(
servicelist
)
this
.
$message
({
// this.$message({
message
:
'
服务状态已拉取
'
,
// message: '服务状态已拉取',
type
:
'
success
'
// type: 'success'
})
// })
this
.
listLoading
=
false
})
})
},
},
refresh
()
{
refresh
()
{
this
.
listLoading
=
true
this
.
getServicelist
()
this
.
getServicelist
()
},
},
getRepository
(
label
)
{
getRepository
(
label
)
{
...
...
src/views/docker/envTemplate.vue
View file @
3b6534e0
...
@@ -22,7 +22,7 @@
...
@@ -22,7 +22,7 @@
</el-card>
</el-card>
</el-form-item>
</el-form-item>
</el-form>
</el-form>
<el-button
v-permission=
"['admin']"
style=
"margin-right:40px;margin-bottom:40px;float:right"
type=
"primary"
@
click=
"createData()"
>
{{
$t
(
'
table.confirm
'
)
}}
</el-button>
<el-button
v-permission=
"['admin']"
:disabled=
"loading"
style=
"margin-right:40px;margin-bottom:40px;float:right"
type=
"primary"
@
click=
"createData()"
>
{{
$t
(
'
table.confirm
'
)
}}
</el-button>
</div>
</div>
</
template
>
</
template
>
...
@@ -47,7 +47,8 @@ export default {
...
@@ -47,7 +47,8 @@ export default {
dependant
:
{},
dependant
:
{},
repoNamespaces
:
[],
repoNamespaces
:
[],
currentTemplate
:
''
,
currentTemplate
:
''
,
templates
:
{}
templates
:
{},
loading
:
true
}
}
},
},
...
@@ -60,6 +61,7 @@ export default {
...
@@ -60,6 +61,7 @@ export default {
getAllRepos
()
{
getAllRepos
()
{
getAllRepos
().
then
(
res
=>
{
getAllRepos
().
then
(
res
=>
{
this
.
repoNamespaces
=
res
.
data
this
.
repoNamespaces
=
res
.
data
this
.
loading
=
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