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
258641b1
Commit
258641b1
authored
Apr 16, 2019
by
智勇
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
异常在http服务统一处理
parent
79ebb1ea
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
30 deletions
+19
-30
index.js
src/filters/index.js
+2
-1
createEnv.vue
src/views/docker/createEnv.vue
+8
-12
envDetail.vue
src/views/docker/envDetail.vue
+4
-4
envTemplate.vue
src/views/docker/envTemplate.vue
+5
-13
No files found.
src/filters/index.js
View file @
258641b1
...
@@ -55,6 +55,8 @@ export function formatStatus(tsatus) {
...
@@ -55,6 +55,8 @@ export function formatStatus(tsatus) {
return
'
服务更新中
'
return
'
服务更新中
'
case
'
RollingBack
'
:
case
'
RollingBack
'
:
return
'
服务回滚中
'
return
'
服务回滚中
'
case
'
Terminating
'
:
return
'
删除中
'
default
:
default
:
return
'
未知状态
'
return
'
未知状态
'
}
}
...
@@ -67,4 +69,3 @@ export function filterTag(image) {
...
@@ -67,4 +69,3 @@ export function filterTag(image) {
const
arr
=
image
.
split
(
'
:
'
)
const
arr
=
image
.
split
(
'
:
'
)
return
(
arr
&&
arr
[
1
])
||
''
return
(
arr
&&
arr
[
1
])
||
''
}
}
src/views/docker/createEnv.vue
View file @
258641b1
...
@@ -102,18 +102,14 @@ export default {
...
@@ -102,18 +102,14 @@ export default {
}
}
createEnv
(
param
).
then
(
res
=>
{
createEnv
(
param
).
then
(
res
=>
{
if
(
res
.
data
.
code
===
'
0000
'
)
{
this
.
$router
.
push
({
this
.
$message
({
path
:
`/dockers/runingEnv/
${
this
.
namespace
}
`
message
:
res
.
data
.
data
,
})
type
:
'
success
'
,
})
duration
:
1000
this
.
$message
({
})
message
:
'
正在创建,请稍候
'
,
}
else
{
type
:
'
success
'
,
this
.
$message
({
duration
:
2000
message
:
res
.
data
.
msg
,
type
:
'
error
'
})
}
})
})
}
}
}
}
...
...
src/views/docker/envDetail.vue
View file @
258641b1
...
@@ -346,14 +346,14 @@ export default {
...
@@ -346,14 +346,14 @@ 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
({
message
:
'
服务状态已拉取
'
,
type
:
'
success
'
})
})
})
},
},
refresh
()
{
refresh
()
{
this
.
getServicelist
()
this
.
getServicelist
()
this
.
$message
({
message
:
'
状态已刷新
'
,
type
:
'
success
'
})
},
},
getRepository
(
label
)
{
getRepository
(
label
)
{
this
.
label
=
label
this
.
label
=
label
...
...
src/views/docker/envTemplate.vue
View file @
258641b1
...
@@ -87,7 +87,6 @@ export default {
...
@@ -87,7 +87,6 @@ export default {
// 遍历设置
// 遍历设置
const
keys
=
Object
.
keys
(
t
)
const
keys
=
Object
.
keys
(
t
)
keys
.
forEach
(
key
=>
{
keys
.
forEach
(
key
=>
{
console
.
log
(
t
,
key
)
if
(
key
!==
'
name
'
&&
key
!==
'
_id
'
)
{
if
(
key
!==
'
name
'
&&
key
!==
'
_id
'
)
{
t
[
key
].
forEach
(
repo
=>
{
t
[
key
].
forEach
(
repo
=>
{
vm
.
selectSystem
(
repo
,
key
)
vm
.
selectSystem
(
repo
,
key
)
...
@@ -103,18 +102,11 @@ export default {
...
@@ -103,18 +102,11 @@ export default {
}
}
createEnvTemplate
(
param
).
then
(
res
=>
{
createEnvTemplate
(
param
).
then
(
res
=>
{
// todo: 异常在http服务统一处理
// todo: 异常在http服务统一处理
if
(
res
.
data
.
code
===
'
0000
'
)
{
this
.
$message
({
this
.
$message
({
message
:
res
.
data
||
'
环境模板创建成功
'
,
message
:
res
.
data
.
data
,
type
:
'
success
'
,
type
:
'
success
'
,
duration
:
1000
duration
:
1000
})
})
}
else
{
this
.
$message
({
message
:
res
.
data
.
msg
,
type
:
'
error
'
})
}
})
})
}
}
}
}
...
...
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