diff --git a/src/components/app-build-steps/app-build-steps.vue b/src/components/app-build-steps/app-build-steps.vue index 2d476e361172701e1ec07eb66226a84cacd3d84f..a9aa49ddd2f1622cbeac816045d27c90ec967609 100644 --- a/src/components/app-build-steps/app-build-steps.vue +++ b/src/components/app-build-steps/app-build-steps.vue @@ -26,15 +26,15 @@

- + + 已完成 + + 待进行 - + 进行中 - - 已完成 -

@@ -50,7 +50,7 @@ -
+
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; diff --git a/src/components/deployment-info.vue b/src/components/deployment-info.vue index 89a05ae9721a6c583d7ceef5e6e60bcb16f75a61..a6adaa1689752aea9f427d040671d812e3a4bad0 100644 --- a/src/components/deployment-info.vue +++ b/src/components/deployment-info.vue @@ -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; diff --git a/src/components/table/table-filter.vue b/src/components/table/table-filter.vue index 2a04fdde1072d5590cb5488767030c1d7cd6a0d8..2b043163793395e0f5b12142a3e80b2fb97f671f 100644 --- a/src/components/table/table-filter.vue +++ b/src/components/table/table-filter.vue @@ -18,19 +18,20 @@ 'margin-top': i < filterLength ? '0' : '10px', }" > - - - + + + +
diff --git a/src/pages/workbench/fwgl/fwglList.vue b/src/pages/workbench/fwgl/fwglList.vue index 7d54766b2b337e11245fdc929cd5d6846b09d0e9..058e7b77cd506c113e6639f4dae626d62a614a8a 100644 --- a/src/pages/workbench/fwgl/fwglList.vue +++ b/src/pages/workbench/fwgl/fwglList.vue @@ -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; }, }, { diff --git a/src/pages/workbench/yygl/deployment.vue b/src/pages/workbench/yygl/deployment.vue index 6e46238a79871b27099b4fd7f87fbd549e0fefdd..ab0df7f6547c282771ad7185b47a0c627772527b 100644 --- a/src/pages/workbench/yygl/deployment.vue +++ b/src/pages/workbench/yygl/deployment.vue @@ -15,7 +15,7 @@
- +