From 4def35d35db58b19a006ce9d9ee864b678053eb7 Mon Sep 17 00:00:00 2001
From: xuyiming <xuyiming@bd-apaas.com>
Date: Thu, 2 Jul 2020 09:41:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E9=94=AE=E9=83=A8=E7=BD=B2=E8=B0=83?=
 =?UTF-8?q?=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/workbench/yygl/deployment.vue | 50 ++++++++++++++-----------
 1 file changed, 28 insertions(+), 22 deletions(-)

diff --git a/src/pages/workbench/yygl/deployment.vue b/src/pages/workbench/yygl/deployment.vue
index 1cdaa1a..b124c6c 100644
--- a/src/pages/workbench/yygl/deployment.vue
+++ b/src/pages/workbench/yygl/deployment.vue
@@ -203,29 +203,29 @@
           style="margin-top: 30px;"
         ></deployment-info>
         <div class="apass_button step_action">
-          <el-button type="primary" v-if="finallyState === 1">
+          <el-button
+            type="primary"
+            v-if="finallyState === 1"
+            @click="finallyAction1"
+          >
             前往查看
           </el-button>
-          <el-button type="primary" v-if="finallyState === 2">
+          <el-button
+            type="primary"
+            v-if="finallyState === 2"
+            @click="finallyAction2"
+          >
             重新部署
           </el-button>
         </div>
       </app-build-step>
     </app-build-steps>
-
-    <apass-dialog
-      ref="dialog"
-      :title="dialogInfo.title"
-      :msg="dialogInfo.msg"
-      :submit="dialogInfo.submit"
-    ></apass-dialog>
   </div>
 </template>
 
 <script>
 import appBuildSteps from "@/components/app-build-steps/app-build-steps";
 import appBuildStep from "@/components/app-build-steps/app-build-step";
-import apassDialog from "@/components/apass-dialog";
 import codes from "@/components/codes";
 import yaml from "js-yaml";
 var checkNumber = (rule, value, callback) => {
@@ -253,7 +253,6 @@ export default {
   components: {
     appBuildSteps,
     appBuildStep,
-    apassDialog,
     deploymentInfo,
     "v-apaas-code": codes,
   },
@@ -261,11 +260,6 @@ export default {
     step: 0,
     senior_flag: false,
     begin_code: "",
-    dialogInfo: {
-      title: "",
-      msg: "",
-      submit: null,
-    },
     baseInfoForm: {
       namespace: "",
       name: "",
@@ -320,6 +314,7 @@ export default {
       ],
     },
     step2_arr: [],
+    deploy_id: "",
     evtUuid: "",
     evtSource: null,
     stateList: [],
@@ -458,8 +453,9 @@ export default {
         .post(`/apaas/hubApi/market/build`, temp)
         .then((response) => {
           this.is_loading = false;
-          if (response.data.data) {
-            this.$message.success("开始部署成功");
+          if (response.data.success === 1) {
+            // this.$message.success("开始部署成功");
+            this.deploy_id = response.data.data.deploy_id;
             this.next_step();
           }
         })
@@ -598,12 +594,22 @@ export default {
         }
       }
     },
+    finallyAction1() {
+      this.$router.push(`/yygl/0/1/deploydetail/${this.deploy_id}`);
+    },
+    finallyAction2() {
+      this.init();
+    },
+    init() {
+      this.step = 0;
+      this.get_status();
+      this.get_name_space();
+      this.get_step_info();
+      this.get_step_file();
+    },
   },
   created() {
-    this.get_status();
-    this.get_name_space();
-    this.get_step_info();
-    this.get_step_file();
+    this.init();
   },
 };
 </script>
-- 
2.26.0