From 752c769b16e81300eb10ca2a1143ff2665934c16 Mon Sep 17 00:00:00 2001
From: xuyiming <xuyiming@bd-apaas.com>
Date: Thu, 9 Jul 2020 11:08:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E7=94=A8=E6=9E=84=E5=BB=BAfixed?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/image-detail.vue   |  8 ++--
 src/pages/workbench/app_build.vue | 69 +++++++++++++++++++------------
 2 files changed, 47 insertions(+), 30 deletions(-)

diff --git a/src/components/image-detail.vue b/src/components/image-detail.vue
index f738e65..a716100 100644
--- a/src/components/image-detail.vue
+++ b/src/components/image-detail.vue
@@ -1,11 +1,11 @@
 <template>
   <div class="image_detail">
-    <apass-dialog ref="listdialog" :title="title" width="1200px">
+    <apass-dialog ref="listdialog" :title="title" width="1400px">
       <template slot="content">
         <div class="apass_table">
           <el-table :data="imageData">
             <el-table-column width="20"></el-table-column>
-            <el-table-column label="版本号" width="120" align="left">
+            <el-table-column label="版本号" align="left">
               <template slot-scope="scope">
                 {{ scope.row.name }}
               </template>
@@ -15,7 +15,7 @@
                 {{ scope.row.author }}
               </template>
             </el-table-column>
-            <el-table-column label="镜像地址" align="left">
+            <el-table-column label="镜像地址" width="400" align="left">
               <template slot-scope="scope">
                 {{ scope.row.image_url }}
               </template>
@@ -30,7 +30,7 @@
                 {{ getSize(scope.row.size) }}
               </template>
             </el-table-column>
-            <el-table-column label="漏洞" align="center">
+            <el-table-column label="漏洞" width="100" align="center">
               <template slot-scope="scope">
                 <image-bugs
                   v-if="scope.row.scan_overview"
diff --git a/src/pages/workbench/app_build.vue b/src/pages/workbench/app_build.vue
index 228826c..e58334b 100644
--- a/src/pages/workbench/app_build.vue
+++ b/src/pages/workbench/app_build.vue
@@ -397,39 +397,47 @@ export default {
       }
     },
     imageUploadChange(file) {
-      if (file.raw.type !== "application/x-tar") {
+      /* if (file.raw.type !== "application/x-tar") {
         this.$message.error("镜像文件只能是 TAR 格式!");
         this.image_info.file = "";
         this.$refs.step1_upload.clearFiles();
+      } else { */
+      this.image_info.file = file;
+      this.$refs.step1_upload_item.clearValidate();
+      // }
+    },
+    imageUploadSuccess(response) {
+      if (response.success == 1) {
+        this.$message({
+          message: `上传镜像成功`,
+          type: "success",
+        });
+        this.image_info.image_name = "";
+        this.image_info.tag = "";
+        this.image_info.file = "";
+        this.$refs.step1_upload.clearFiles();
+        this.step1UplaodLoading = false;
+        this.image_datas = [];
+        this.image_page = 1;
+        this.initImageList();
       } else {
-        this.image_info.file = file;
-        this.$refs.step1_upload_item.clearValidate();
+        this.$message({
+          message: response.errMsg || `上传镜像失败`,
+          type: "warning",
+        });
+        this.step1UplaodLoading = false;
       }
     },
-    imageUploadSuccess(response) {
+    imageUploadError() {
       this.$message({
-        message: `上传镜像成功`,
-        type: "success",
+        message: `上传镜像失败`,
+        type: "warning",
       });
-      this.image_info.image_name = "";
-      this.image_info.tag = "";
-      this.image_info.file = "";
-      this.$refs.step1_upload.clearFiles();
       this.step1UplaodLoading = false;
-      this.image_datas = [];
-      this.image_page = 1;
-      this.initImageList();
     },
     imageUploadRemove() {
       this.image_info.file = "";
     },
-    imageUploadError(response) {
-      this.$message({
-        message: `上传失败`,
-        type: "warning",
-      });
-      this.step1UplaodLoading = false;
-    },
     submitImage(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
@@ -540,18 +548,27 @@ export default {
       this.deploy_info.file = "";
     },
     deployUploadSuccess(response) {
-      this.$message({
-        message: `提交成功`,
-        type: "success",
-      });
-      this.submitLoading = false;
-      this.$router.push("/yygl/2/0");
+      if (response.success == 1) {
+        this.$message({
+          message: `提交成功`,
+          type: "success",
+        });
+        this.submitLoading = false;
+        this.$router.push("/yygl/2/0");
+      } else {
+        this.$message({
+          message: response.errMsg || `提交失败`,
+          type: "warning",
+        });
+        this.submitLoading = false;
+      }
     },
     deployUploadError() {
       this.$message({
         message: `提交失败`,
         type: "warning",
       });
+      this.submitLoading = false;
     },
     sunbmitAction(formName) {
       this.$refs[formName].validate((valid) => {
-- 
2.26.0