Skip to content

A
apaas-ui
Commit 17657e51 authored by 张俊's avatar 张俊
Browse files
Options

Merge branch 'dev' of https://cloud.wodcloud.com/git/apaas/apaas-v3-ui into dev

parents 225ef21f 3c14e060
Hide whitespace changes
Inline Side-by-side
Showing with 84 additions and 35 deletions
src/components/app-build-steps/app-build-steps.vue
View file @ 17657e51
......@@ -26,15 +26,15 @@
<div class="step_icon" v-else></div>
<div class="step_info">
<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 v-show="item.step === activeStep">
<span v-else-if="item.step === activeStep">
进行中
</span>
<span v-show="item.step < activeStep">
已完成
</span>
</p>
<p class="step_name" v-text="item.title"></p>
</div>
......@@ -50,7 +50,7 @@
</template>
</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="left_container">
<img
......@@ -85,6 +85,10 @@ export default {
type: Boolean,
default: () => false,
},
showDone: {
type: Boolean,
default: () => false,
},
doneTitle: {
type: String,
default: () => "操作成功",
......@@ -193,6 +197,7 @@ export default {
}
.steps_done {
position: relative;
min-height: 400px;
}
.steps_done_info {
position: absolute;
......
src/components/deployment-info.vue
View file @ 17657e51
......@@ -51,7 +51,7 @@ export default {
name: "-",
value: "values",
content: "",
state: 2,
state: 0,
};
let status = this.data;
let statusLength = status.length;
......@@ -67,7 +67,7 @@ export default {
}, // 需要展示的状态
},
methods: {
getIcon(stateValue = 2) {
getIcon(stateValue = 0) {
const icons = [
require("../assets/imgs/ic_operation.gif"),
require("../assets/imgs/ic_true.png"),
......@@ -76,7 +76,7 @@ export default {
return icons[stateValue];
},
getText(stateValue = 2) {
getText(stateValue = 0) {
const texts = ["部署中", "成功", "失败"];
return texts[stateValue];
......@@ -101,6 +101,12 @@ export default {
justify-content: space-between;
align-items: stretch;
}
.deployment_info > .app_build_steps {
min-height: calc(100vh - 150px - 43px);
border-radius: 12px;
background-color: #fff;
padding: 30px;
}
.state_steps {
width: 270px;
flex-shrink: 0;
......
src/components/table/table-filter.vue
View file @ 17657e51
......@@ -18,19 +18,20 @@
'margin-top': i < filterLength ? '0' : '10px',
}"
>
<el-tooltip
class="item"
effect="dark"
:content="v.name"
placement="top"
<a
class="text_clip"
:class="{ current: isCurrentFilter(item.prop, v) }"
@click.prevent="selectFilter(item.prop, v)"
>
<a
class="text_clip"
:class="{ current: isCurrentFilter(item.prop, v) }"
@click.prevent="selectFilter(item.prop, v)"
v-text="v.name"
></a>
</el-tooltip>
<el-tooltip
class="item"
effect="dark"
:content="v.name"
placement="top"
>
<span v-text="v.name"></span>
</el-tooltip>
</a>
</li>
<div
......
src/pages/workbench/app_build.vue
View file @ 17657e51
......@@ -9,6 +9,7 @@
<app-build-steps
:active-step="step"
:done="done"
:show-done="true"
done-title="提交成功"
done-sub-title="应用已创建，可前往应用仓库进行应用部署"
>
......
src/pages/workbench/fwgl/fwglList.vue
View file @ 17657e51
......@@ -260,7 +260,11 @@ export default {
},
{
getLabel(item) {
return ["申请上架", "申请下架", "审核中"][item.state] || "-";
return (
["申请上架", "申请下架", "上架审核中", "下架审核中"][
item.state
] || "-"
);
},
callback(item) {
if (item.state == 0) {
......@@ -270,7 +274,7 @@ export default {
}
},
disabledRule(item) {
return item.state == 2;
return item.state == 2 || item.state == 3;
},
},
{
......@@ -308,13 +312,21 @@ export default {
prop: "state",
data: [
{
name: "审核中",
name: "已下架",
value: 0,
},
{
name: "已上架",
value: 1,
},
{
name: "已下架",
name: "上架审核中",
value: 2,
},
{
name: "下架审核中",
value: 3,
},
],
},
];
......@@ -618,7 +630,9 @@ export default {
label: "服务状态",
prop: "state",
getText(item) {
return ["已下架", "已上架", "审核中"][item.state];
return ["已下架", "已上架", "上架审核中", "下架审核中"][
item.state
];
},
align: "center",
},
......@@ -647,13 +661,21 @@ export default {
prop: "state",
data: [
{
name: "审核中",
name: "已下架",
value: 0,
},
{
name: "已上架",
value: 1,
},
{
name: "已下架",
name: "上架审核中",
value: 2,
},
{
name: "下架审核中",
value: 3,
},
],
},
];
......@@ -930,7 +952,9 @@ export default {
return "-";
}
return (item.approve_state === 1 && item.use_uid === "") ? "分配" : "已分配";
return item.approve_state === 1 && item.use_uid === ""
? "分配"
: "已分配";
},
callback: this.cloudAllot,
disabledRule(item) {
......@@ -1002,15 +1026,25 @@ export default {
},
{
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) {
item.state == 1
? _self.soldOutItem(item)
: _self.soldUpItem(item);
if (item.state == 2) {
return soldUpItem(item);
} else if (item.state == 3) {
return _self.soldOutItem(item);
} else {
return null;
}
},
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 @@
</el-breadcrumb-item>
</el-breadcrumb>
</div>
<app-build-steps :active-step="step">
<app-build-steps :active-step="step" :done="stepDone">
<app-build-step
title="部署基本信息"
:step="0"
......@@ -339,6 +339,7 @@ export default {
stateList: [],
finallyState: 0,
pvc_list:[],
stepDone: false
}),
methods: {
get_pvc_list(){
......@@ -654,6 +655,7 @@ export default {
let finallyState = event.data.state === "success" ? 1 : 2;
this.finallyState = finallyState;
currentState.state = finallyState;
this.stepDone = true;
} else {
if (event.data.state !== "notes") {
currentState.state = 2;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment