Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
apaas-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
gzga-jzapi
apaas-ui
Commits
17657e51
Commit
17657e51
authored
Jul 17, 2020
by
张俊
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of
https://cloud.wodcloud.com/git/apaas/apaas-v3-ui
into dev
parents
225ef21f
3c14e060
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
84 additions
and
35 deletions
+84
-35
src/components/app-build-steps/app-build-steps.vue
src/components/app-build-steps/app-build-steps.vue
+11
-6
src/components/deployment-info.vue
src/components/deployment-info.vue
+9
-3
src/components/table/table-filter.vue
src/components/table/table-filter.vue
+13
-12
src/pages/workbench/app_build.vue
src/pages/workbench/app_build.vue
+1
-0
src/pages/workbench/fwgl/fwglList.vue
src/pages/workbench/fwgl/fwglList.vue
+47
-13
src/pages/workbench/yygl/deployment.vue
src/pages/workbench/yygl/deployment.vue
+3
-1
No files found.
src/components/app-build-steps/app-build-steps.vue
View file @
17657e51
...
@@ -26,15 +26,15 @@
...
@@ -26,15 +26,15 @@
<div
class=
"step_icon"
v-else
></div>
<div
class=
"step_icon"
v-else
></div>
<div
class=
"step_info"
>
<div
class=
"step_info"
>
<p
class=
"step_state"
>
<p
class=
"step_state"
>
<span
v-show=
"item.step > activeStep"
>
<span
v-if=
"item.step
<
activeStep
||
done
"
>
已完成
</span>
<span
v-else-if=
"item.step > activeStep"
>
待进行
待进行
</span>
</span>
<span
v-
show
=
"item.step === activeStep"
>
<span
v-
else-if
=
"item.step === activeStep"
>
进行中
进行中
</span>
</span>
<span
v-show=
"item.step
<
activeStep
"
>
已完成
</span>
</p>
</p>
<p
class=
"step_name"
v-text=
"item.title"
></p>
<p
class=
"step_name"
v-text=
"item.title"
></p>
</div>
</div>
...
@@ -50,7 +50,7 @@
...
@@ -50,7 +50,7 @@
</
template
>
</
template
>
</ul>
</ul>
<div
class=
"steps_container steps_done"
v-if=
"done"
>
<div
class=
"steps_container steps_done"
v-if=
"done
&& showDone
"
>
<div
class=
"steps_done_info"
>
<div
class=
"steps_done_info"
>
<div
class=
"left_container"
>
<div
class=
"left_container"
>
<img
<img
...
@@ -85,6 +85,10 @@ export default {
...
@@ -85,6 +85,10 @@ export default {
type
:
Boolean
,
type
:
Boolean
,
default
:
()
=>
false
,
default
:
()
=>
false
,
},
},
showDone
:
{
type
:
Boolean
,
default
:
()
=>
false
,
},
doneTitle
:
{
doneTitle
:
{
type
:
String
,
type
:
String
,
default
:
()
=>
"
操作成功
"
,
default
:
()
=>
"
操作成功
"
,
...
@@ -193,6 +197,7 @@ export default {
...
@@ -193,6 +197,7 @@ export default {
}
}
.steps_done
{
.steps_done
{
position
:
relative
;
position
:
relative
;
min-height
:
400px
;
}
}
.steps_done_info
{
.steps_done_info
{
position
:
absolute
;
position
:
absolute
;
...
...
src/components/deployment-info.vue
View file @
17657e51
...
@@ -51,7 +51,7 @@ export default {
...
@@ -51,7 +51,7 @@ export default {
name
:
"
-
"
,
name
:
"
-
"
,
value
:
"
values
"
,
value
:
"
values
"
,
content
:
""
,
content
:
""
,
state
:
2
,
state
:
0
,
};
};
let
status
=
this
.
data
;
let
status
=
this
.
data
;
let
statusLength
=
status
.
length
;
let
statusLength
=
status
.
length
;
...
@@ -67,7 +67,7 @@ export default {
...
@@ -67,7 +67,7 @@ export default {
},
// 需要展示的状态
},
// 需要展示的状态
},
},
methods
:
{
methods
:
{
getIcon
(
stateValue
=
2
)
{
getIcon
(
stateValue
=
0
)
{
const
icons
=
[
const
icons
=
[
require
(
"
../assets/imgs/ic_operation.gif
"
),
require
(
"
../assets/imgs/ic_operation.gif
"
),
require
(
"
../assets/imgs/ic_true.png
"
),
require
(
"
../assets/imgs/ic_true.png
"
),
...
@@ -76,7 +76,7 @@ export default {
...
@@ -76,7 +76,7 @@ export default {
return
icons
[
stateValue
];
return
icons
[
stateValue
];
},
},
getText
(
stateValue
=
2
)
{
getText
(
stateValue
=
0
)
{
const
texts
=
[
"
部署中
"
,
"
成功
"
,
"
失败
"
];
const
texts
=
[
"
部署中
"
,
"
成功
"
,
"
失败
"
];
return
texts
[
stateValue
];
return
texts
[
stateValue
];
...
@@ -101,6 +101,12 @@ export default {
...
@@ -101,6 +101,12 @@ export default {
justify-content
:
space-between
;
justify-content
:
space-between
;
align-items
:
stretch
;
align-items
:
stretch
;
}
}
.deployment_info
>
.app_build_steps
{
min-height
:
calc
(
100vh
-
150px
-
43px
);
border-radius
:
12px
;
background-color
:
#fff
;
padding
:
30px
;
}
.state_steps
{
.state_steps
{
width
:
270px
;
width
:
270px
;
flex-shrink
:
0
;
flex-shrink
:
0
;
...
...
src/components/table/table-filter.vue
View file @
17657e51
...
@@ -17,6 +17,11 @@
...
@@ -17,6 +17,11 @@
:style=
"
{
:style=
"
{
'margin-top': i
<
filterLength
?
'
0
'
:
'
10px
',
'margin-top': i
<
filterLength
?
'
0
'
:
'
10px
',
}"
}"
>
<a
class=
"text_clip"
:class=
"
{ current: isCurrentFilter(item.prop, v) }"
@click.prevent="selectFilter(item.prop, v)"
>
>
<el-tooltip
<el-tooltip
class=
"item"
class=
"item"
...
@@ -24,13 +29,9 @@
...
@@ -24,13 +29,9 @@
:content=
"v.name"
:content=
"v.name"
placement=
"top"
placement=
"top"
>
>
<a
<span
v-text=
"v.name"
></span>
class=
"text_clip"
:class=
"
{ current: isCurrentFilter(item.prop, v) }"
@click.prevent="selectFilter(item.prop, v)"
v-text="v.name"
>
</a>
</el-tooltip>
</el-tooltip>
</a>
</li>
</li>
<div
<div
...
...
src/pages/workbench/app_build.vue
View file @
17657e51
...
@@ -9,6 +9,7 @@
...
@@ -9,6 +9,7 @@
<app-build-steps
<app-build-steps
:active-step=
"step"
:active-step=
"step"
:done=
"done"
:done=
"done"
:show-done=
"true"
done-title=
"提交成功"
done-title=
"提交成功"
done-sub-title=
"应用已创建,可前往应用仓库进行应用部署"
done-sub-title=
"应用已创建,可前往应用仓库进行应用部署"
>
>
...
...
src/pages/workbench/fwgl/fwglList.vue
View file @
17657e51
...
@@ -260,7 +260,11 @@ export default {
...
@@ -260,7 +260,11 @@ export default {
},
},
{
{
getLabel
(
item
)
{
getLabel
(
item
)
{
return
[
"
申请上架
"
,
"
申请下架
"
,
"
审核中
"
][
item
.
state
]
||
"
-
"
;
return
(
[
"
申请上架
"
,
"
申请下架
"
,
"
上架审核中
"
,
"
下架审核中
"
][
item
.
state
]
||
"
-
"
);
},
},
callback
(
item
)
{
callback
(
item
)
{
if
(
item
.
state
==
0
)
{
if
(
item
.
state
==
0
)
{
...
@@ -270,7 +274,7 @@ export default {
...
@@ -270,7 +274,7 @@ export default {
}
}
},
},
disabledRule
(
item
)
{
disabledRule
(
item
)
{
return
item
.
state
==
2
;
return
item
.
state
==
2
||
item
.
state
==
3
;
},
},
},
},
{
{
...
@@ -308,13 +312,21 @@ export default {
...
@@ -308,13 +312,21 @@ export default {
prop
:
"
state
"
,
prop
:
"
state
"
,
data
:
[
data
:
[
{
{
name
:
"
审核中
"
,
name
:
"
已下架
"
,
value
:
0
,
},
{
name
:
"
已上架
"
,
value
:
1
,
value
:
1
,
},
},
{
{
name
:
"
已下架
"
,
name
:
"
上架审核中
"
,
value
:
2
,
value
:
2
,
},
},
{
name
:
"
下架审核中
"
,
value
:
3
,
},
],
],
},
},
];
];
...
@@ -618,7 +630,9 @@ export default {
...
@@ -618,7 +630,9 @@ export default {
label
:
"
服务状态
"
,
label
:
"
服务状态
"
,
prop
:
"
state
"
,
prop
:
"
state
"
,
getText
(
item
)
{
getText
(
item
)
{
return
[
"
已下架
"
,
"
已上架
"
,
"
审核中
"
][
item
.
state
];
return
[
"
已下架
"
,
"
已上架
"
,
"
上架审核中
"
,
"
下架审核中
"
][
item
.
state
];
},
},
align
:
"
center
"
,
align
:
"
center
"
,
},
},
...
@@ -647,13 +661,21 @@ export default {
...
@@ -647,13 +661,21 @@ export default {
prop
:
"
state
"
,
prop
:
"
state
"
,
data
:
[
data
:
[
{
{
name
:
"
审核中
"
,
name
:
"
已下架
"
,
value
:
0
,
},
{
name
:
"
已上架
"
,
value
:
1
,
value
:
1
,
},
},
{
{
name
:
"
已下架
"
,
name
:
"
上架审核中
"
,
value
:
2
,
value
:
2
,
},
},
{
name
:
"
下架审核中
"
,
value
:
3
,
},
],
],
},
},
];
];
...
@@ -930,7 +952,9 @@ export default {
...
@@ -930,7 +952,9 @@ export default {
return
"
-
"
;
return
"
-
"
;
}
}
return
(
item
.
approve_state
===
1
&&
item
.
use_uid
===
""
)
?
"
分配
"
:
"
已分配
"
;
return
item
.
approve_state
===
1
&&
item
.
use_uid
===
""
?
"
分配
"
:
"
已分配
"
;
},
},
callback
:
this
.
cloudAllot
,
callback
:
this
.
cloudAllot
,
disabledRule
(
item
)
{
disabledRule
(
item
)
{
...
@@ -1002,15 +1026,25 @@ export default {
...
@@ -1002,15 +1026,25 @@ export default {
},
},
{
{
getLabel
(
item
)
{
getLabel
(
item
)
{
return
item
.
state
==
1
?
"
下架
"
:
"
上架
"
;
if
(
item
.
state
==
0
||
item
.
state
==
2
)
{
return
"
上架
"
;
}
else
if
(
item
.
state
==
1
||
item
.
state
==
3
)
{
return
"
下架
"
;
}
else
{
return
"
-
"
;
}
},
},
callback
(
item
)
{
callback
(
item
)
{
item
.
state
==
1
if
(
item
.
state
==
2
)
{
?
_self
.
soldOutItem
(
item
)
return
soldUpItem
(
item
);
:
_self
.
soldUpItem
(
item
);
}
else
if
(
item
.
state
==
3
)
{
return
_self
.
soldOutItem
(
item
);
}
else
{
return
null
;
}
},
},
disabledRule
(
item
)
{
disabledRule
(
item
)
{
return
item
.
state
==
=
0
;
return
item
.
state
==
0
||
item
.
state
==
1
;
},
},
},
},
{
{
...
...
src/pages/workbench/yygl/deployment.vue
View file @
17657e51
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
</el-breadcrumb-item>
</el-breadcrumb-item>
</el-breadcrumb>
</el-breadcrumb>
</div>
</div>
<app-build-steps
:active-step=
"step"
>
<app-build-steps
:active-step=
"step"
:done=
"stepDone"
>
<app-build-step
<app-build-step
title=
"部署基本信息"
title=
"部署基本信息"
:step=
"0"
:step=
"0"
...
@@ -339,6 +339,7 @@ export default {
...
@@ -339,6 +339,7 @@ export default {
stateList
:
[],
stateList
:
[],
finallyState
:
0
,
finallyState
:
0
,
pvc_list
:[],
pvc_list
:[],
stepDone
:
false
}),
}),
methods
:
{
methods
:
{
get_pvc_list
(){
get_pvc_list
(){
...
@@ -654,6 +655,7 @@ export default {
...
@@ -654,6 +655,7 @@ export default {
let
finallyState
=
event
.
data
.
state
===
"
success
"
?
1
:
2
;
let
finallyState
=
event
.
data
.
state
===
"
success
"
?
1
:
2
;
this
.
finallyState
=
finallyState
;
this
.
finallyState
=
finallyState
;
currentState
.
state
=
finallyState
;
currentState
.
state
=
finallyState
;
this
.
stepDone
=
true
;
}
else
{
}
else
{
if
(
event
.
data
.
state
!==
"
notes
"
)
{
if
(
event
.
data
.
state
!==
"
notes
"
)
{
currentState
.
state
=
2
;
currentState
.
state
=
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