From 636766ea934645875f111412ecedd079c57f380b Mon Sep 17 00:00:00 2001
From: xuyiming <xuyiming@bd-apaas.com>
Date: Sat, 11 Jul 2020 12:05:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E7=94=A8=E6=9E=84=E5=BB=BA=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=E7=8A=B6=E6=80=81=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/imgs/steps_done.png                | Bin 0 -> 2492 bytes
 .../app-build-steps/app-build-steps.vue       |  75 +++++++++++++++++-
 src/pages/workbench/app_build.vue             |  31 +++++++-
 src/pages/workbench/yygl/yyglList.vue         |   8 +-
 4 files changed, 103 insertions(+), 11 deletions(-)
 create mode 100644 src/assets/imgs/steps_done.png

diff --git a/src/assets/imgs/steps_done.png b/src/assets/imgs/steps_done.png
new file mode 100644
index 0000000000000000000000000000000000000000..3cf848ec7ffd8a0103620967b0dd997f5267951b
GIT binary patch
literal 2492
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

literal 0
HcmV?d00001

diff --git a/src/components/app-build-steps/app-build-steps.vue b/src/components/app-build-steps/app-build-steps.vue
index a7cd2d3..2d476e3 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 @@
       </template>
     </ul>
 
-    <div class="steps_container">
+    <div class="steps_container steps_done" v-if="done">
+      <div class="steps_done_info">
+        <div class="left_container">
+          <img
+            :src="require('../../assets/imgs/steps_done.png')"
+            width="100%"
+          />
+        </div>
+        <div class="right_container">
+          <p v-if="doneTitle" v-text="doneTitle"></p>
+          <p v-if="doneSubTitle" v-text="doneSubTitle"></p>
+        </div>
+      </div>
+      <div class="done_action apass_button">
+        <slot name="action"></slot>
+      </div>
+    </div>
+    <div class="steps_container" v-else>
       <slot></slot>
     </div>
   </div>
@@ -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 {
 </script>
 
 <style scoped>
+.app_build_steps {
+  display: flex;
+  flex-direction: column;
+  justify-content: flex-start;
+  align-items: stretch;
+}
 .steps_header {
   display: flex;
   justify-content: space-between;
@@ -152,9 +186,44 @@ export default {
 .steps_header > .step_item.active .step_name {
   color: #8890a7;
 }
-
 .steps_container {
   border-top: 2px solid #f4f7fc;
   margin-top: 20px;
+  flex-grow: 1;
+}
+.steps_done {
+  position: relative;
+}
+.steps_done_info {
+  position: absolute;
+  top: calc(50% - 40px);
+  left: 50%;
+  transform: translate(-50%, -50%);
+}
+.steps_done_info > * {
+  display: inline-block;
+  vertical-align: middle;
+}
+.steps_done_info > .left_container {
+  width: 70px;
+  font-size: 0;
+  margin-right: 10px;
+}
+.steps_done_info > .right_container > p:nth-child(1) {
+  font-size: 18px;
+  font-weight: 700;
+  line-height: 24px;
+  color: #242c43;
+}
+.steps_done_info > .right_container > p:nth-child(2) {
+  font-size: 14px;
+  line-height: 20px;
+  color: #8890a7;
+  margin-top: 5px;
+}
+.done_action {
+  position: absolute;
+  right: 0;
+  bottom: 0;
 }
 </style>
diff --git a/src/pages/workbench/app_build.vue b/src/pages/workbench/app_build.vue
index 70c9bf4..09b71f9 100644
--- a/src/pages/workbench/app_build.vue
+++ b/src/pages/workbench/app_build.vue
@@ -6,7 +6,12 @@
         <el-breadcrumb-item>应用构建（镜像形式）</el-breadcrumb-item>
       </el-breadcrumb>
     </div>
-    <app-build-steps :active-step="step">
+    <app-build-steps
+      :active-step="step"
+      :done="done"
+      done-title="提交成功"
+      done-sub-title="应用已创建，可前往应用仓库进行应用部署"
+    >
       <app-build-step
         title="应用基础信息填写"
         :step="0"
@@ -159,7 +164,7 @@
         </el-form>
         <div class="apass_button step_action" style="margin-top: 120px;">
           <el-button
-            type="primary"
+            type="defalut"
             :loading="step2Loading"
             plain
             @click="step = 0"
@@ -265,6 +270,15 @@
         </div>
         <image-detail ref="imageDetail"></image-detail>
       </app-build-step>
+
+      <template slot="action">
+        <el-button @click="deployAction">
+          前往部署
+        </el-button>
+        <el-button type="primary" @click="backToList">
+          返回列表
+        </el-button>
+      </template>
     </app-build-steps>
 
     <apass-dialog
@@ -587,8 +601,16 @@ export default {
     },
     stepsDone() {
       this.done = true;
-      this.$router.push(`/yygl/${this.$store.getters.level}/0`);
-    }, // TODO: 增加成功的状态页
+    },
+    deployAction() {
+      // 跳转至应用详情进行部署操作
+      this.$router.push(
+        `/yygl/0/0/detail/${this.app_id}`
+      );
+    },
+    backToList() {
+      this.$router.push(`/yygl/0/0`);
+    },
   },
   mounted() {
     this.getYwlys();
@@ -630,6 +652,7 @@ export default {
   margin: -157px 40px 20px;
 }
 .app_build-container > .app_build_steps {
+  min-height: calc(100vh - 150px - 43px);
   border-radius: 12px;
   background-color: #fff;
   padding: 30px;
diff --git a/src/pages/workbench/yygl/yyglList.vue b/src/pages/workbench/yygl/yyglList.vue
index 8357c24..e078a46 100644
--- a/src/pages/workbench/yygl/yyglList.vue
+++ b/src/pages/workbench/yygl/yyglList.vue
@@ -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",
                 });
               }
@@ -1269,7 +1269,7 @@ export default {
       this.showDialog();
     },
     editItem(item) {
-      this.$router.push(`/yygl/${this.level}/${this.type}/edit/${item.id}`);
+      this.$router.push(`/yygl/${this.level}/${this.type}/edit/${item.id}?source=${item.source}`);
     },
     onLine(item) {
       this.dialogInfo.title = "提示";
-- 
2.26.0