From b6b3266a3ec9cb539648321225762a6393d27527 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 1 Apr 2022 17:28:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=89=93=E5=8C=85=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 project/oms/apps/AppDeploy/AppDeploy.vue | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/project/oms/apps/AppDeploy/AppDeploy.vue b/project/oms/apps/AppDeploy/AppDeploy.vue
index 6a44591f..89524868 100644
--- a/project/oms/apps/AppDeploy/AppDeploy.vue
+++ b/project/oms/apps/AppDeploy/AppDeploy.vue
@@ -16,7 +16,7 @@
                   @getList="getTableData" :col-configs="colConfigs" :dict="dict">
           <el-table-column slot="process" label="打包进度">
             <template slot-scope="{row}">
-              <span v-if="row.count==0" v-text="row.download?`最近打包时间:${row.download}`:`暂无打包`"/>
+              <span v-if="row.count==0" v-text="getProcessMsg(row)"/>
               <el-progress v-else :percentage="row.count"/>
             </template>
           </el-table-column>
@@ -130,10 +130,15 @@ export default {
               clearInterval(timer)
               this.$message.error("打包失败!")
             } else this.handleConfirmZip(row).then(v => {
-              if (v) {
+              if (v.error) {
                 clearInterval(timer)
-                row.count = 100
-                row.download = true
+                this.$message.error("打包失败!")
+                row.error = v.error
+                row.count = 0
+              } else if (v.download) {
+                clearInterval(timer)
+                row.download = v.download
+                row.count = 0
               } else row.count++
             })
           }, 3000)
@@ -185,8 +190,10 @@ export default {
         params: {id}
       }).then(res => {
         if (res?.code == 0) return res.data
-        else return false
       })
+    },
+    getProcessMsg(row) {
+      return row.error || (row.download ? `最近打包时间:${row.download}` : `暂无打包`)
     }
   },
   created() {