diff --git a/src/assets/imgs/steps_done.png b/src/assets/imgs/steps_done.png new file mode 100644 index 0000000000000000000000000000000000000000..3cf848ec7ffd8a0103620967b0dd997f5267951b Binary files /dev/null and b/src/assets/imgs/steps_done.png differ diff --git a/src/components/app-build-steps/app-build-steps.vue b/src/components/app-build-steps/app-build-steps.vue index a7cd2d327282dc15e17d5ed6067d63384b18fedc..2d476e361172701e1ec07eb66226a84cacd3d84f 100644 --- a/src/components/app-build-steps/app-build-steps.vue +++ b/src/components/app-build-steps/app-build-steps.vue @@ -50,7 +50,24 @@ -
+
+
+
+ +
+
+

+

+
+
+
+ +
+
+
@@ -64,11 +81,22 @@ export default { type: Number, default: () => "", }, + done: { + type: Boolean, + default: () => false, + }, + doneTitle: { + type: String, + default: () => "操作成功", + }, + doneSubTitle: { + type: String, + default: () => "", + }, }, data: () => ({ steps: [], }), - computed: {}, methods: { getSteps() { this.steps = this.$slots.default @@ -88,6 +116,12 @@ export default { diff --git a/src/pages/workbench/app_build.vue b/src/pages/workbench/app_build.vue index 70c9bf40e2e6b66989a8213bbfa949037c414afe..09b71f90b813095b1794ac195783c5f4ae85e4eb 100644 --- a/src/pages/workbench/app_build.vue +++ b/src/pages/workbench/app_build.vue @@ -6,7 +6,12 @@ 应用构建(镜像形式) - +
+ + .app_build_steps { + min-height: calc(100vh - 150px - 43px); border-radius: 12px; background-color: #fff; padding: 30px; diff --git a/src/pages/workbench/yygl/deployment.vue b/src/pages/workbench/yygl/deployment.vue index dc2df552b51147665e5a5c0af4d55972fcb0c311..8584f675e945f89e14bcf56496bca98a146af552 100644 --- a/src/pages/workbench/yygl/deployment.vue +++ b/src/pages/workbench/yygl/deployment.vue @@ -473,6 +473,7 @@ export default { namespace: this.baseInfoForm.namespace, uu: this.evtUuid, values: this.app_set_info, + source: this.$route.query.source == "apply" ? "apply" : "" }; } else { //编辑提交 @@ -483,6 +484,7 @@ export default { namespace: this.baseInfoForm.namespace, uu: this.evtUuid, values: yaml.load(this.app_set_code), + source: this.$route.query.source == "apply" ? "apply" : "" }; } this.next_step(); diff --git a/src/pages/workbench/yygl/yyglList.vue b/src/pages/workbench/yygl/yyglList.vue index 8357c24d063eae7e76b9baa4da668670fbf05e00..cda2407df31d95efa7a018c5bf6fb7268b3b7ab7 100644 --- a/src/pages/workbench/yygl/yyglList.vue +++ b/src/pages/workbench/yygl/yyglList.vue @@ -231,7 +231,7 @@ export default { label: "申请时间", getText(item) { let time = item.time || ""; - return helper.dateStringTransform(date); + return helper.dateStringTransform(time); }, align: "center", }, @@ -1097,7 +1097,7 @@ export default { this.initDatas(this.tempFliter); } else { this.$message({ - message: `删除${item.app_name}失败.`, + message: data.errMsg || `删除${item.app_name}失败.`, type: "warning", }); } @@ -1133,7 +1133,7 @@ export default { this.initDatas(this.tempFliter); } else { this.$message({ - message: `申请下架${item.app_name}失败.`, + message: data.errMsg || `申请下架${item.app_name}失败.`, type: "warning", }); } @@ -1169,7 +1169,7 @@ export default { this.initDatas(this.tempFliter); } else { this.$message({ - message: `删除${item.deploy_name}失败.`, + message: data.errMsg || `删除${item.deploy_name}失败.`, type: "warning", }); } @@ -1187,7 +1187,7 @@ export default { }, deploymentAction(item) { this.$router.push( - `/yygl/${this.level}/${this.type}/deployment/${item.app_id}` + `/yygl/${this.level}/${this.type}/deployment/${item.app_id}?source=${item.source}` ); }, changePageSize(value) {