From 81dee66f6c66eacf3895891fb75fd97fe149e3d5 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Thu, 16 Feb 2023 16:20:05 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=93=E5=8C=85?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oms/apps/develop/AppDeployCustom/list.vue | 54 ++++++++++---------
 1 file changed, 28 insertions(+), 26 deletions(-)

diff --git a/project/oms/apps/develop/AppDeployCustom/list.vue b/project/oms/apps/develop/AppDeployCustom/list.vue
index eeb1259c..fc0d5edb 100644
--- a/project/oms/apps/develop/AppDeployCustom/list.vue
+++ b/project/oms/apps/develop/AppDeployCustom/list.vue
@@ -39,6 +39,8 @@
 </template>
 
 <script>
+import {resolve} from "../../../../../../dvcp_v2_wechat_app/dist/dev/mp-weixin/common/vendor";
+
 export default {
   name: "list",
   props: {
@@ -110,10 +112,7 @@ export default {
     },
     handleUpdate(row) {
       let {id} = row
-      if (!this.ws) {
-        this.initWs()
-      }
-      this.ws?.send(JSON.stringify({action: "/custom/getZip", id}))
+      this.initWs().then(() => this.ws?.send(JSON.stringify({action: "/custom/getZip", id})))
     },
     refreshRow(row, v) {
       row.error = v.error
@@ -127,10 +126,7 @@ export default {
     },
     handleCancelUpdate(row) {
       let {id} = row
-      if (!this.ws) {
-        this.initWs()
-      }
-      this.ws.send(JSON.stringify({action: "/custom/getZip", cid: id}))
+      this.initWs().then(() => this.ws.send(JSON.stringify({action: "/custom/getZip", cid: id})))
     },
     getRowById(id) {
       return this.instance.post("/node/custom/detail", null, {
@@ -149,29 +145,35 @@ export default {
       })
     },
     initWs() {
-      this.ws = new WebSocket(`ws://192.168.1.87:12525/ws`)
-      this.ws.onmessage = res => {
-        if (res?.data) {
-          const data = JSON.parse(res.data),
-              row = this.tableData.find(e => e.id == data?.row.id)
-          if (data.code == '0') {
-            row.count = data.progress
-            if (row.count == 100) {
+      return !this.ws ? new Promise(resolve => {
+        this.ws = new WebSocket(`ws://localhost:12525/ws`)
+        this.ws.onopen = () => resolve()
+        this.ws.onmessage = res => {
+          if (this.$checkJson(res?.data)) {
+            const data = JSON.parse(res.data),
+                row = this.tableData.find(e => e.id == data?.row.id)
+            if (data.code == '0') {
+              row.count = data.progress
+              if (row.count == 100) {
+                row.count = 0
+                this.$message.success("打包成功!")
+                this.refreshRow(row, data.row)
+              }
+            } else if (data.code == 1) {
               row.count = 0
-              this.$message.success("打包成功!")
+              this.$message.error("打包失败!")
               this.refreshRow(row, data.row)
             }
-          } else if (data.code == 1) {
-            row.count = 0
-            this.$message.error("打包失败!")
-            this.refreshRow(row, data.row)
           }
         }
-      }
-      this.ws.onclose = () => {
-        this.tableData.map(e => e.count = 0)
-        this.ws.close()
-      }
+        this.ws.onclose = () => {
+          this.tableData.map(e => e.count = 0)
+          this.ws.close()
+        }
+        this.ws.onerror = () => {
+          this.ws.close()
+        }
+      }) : Promise.resolve()
     }
   },
   created() {

From 31e79f88a3af6d98bd34333c400a16bbdc7b81be Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Thu, 16 Feb 2023 17:06:48 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=93=E5=8C=85?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 project/oms/apps/develop/AppDeployCustom/list.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/project/oms/apps/develop/AppDeployCustom/list.vue b/project/oms/apps/develop/AppDeployCustom/list.vue
index fc0d5edb..188a17b5 100644
--- a/project/oms/apps/develop/AppDeployCustom/list.vue
+++ b/project/oms/apps/develop/AppDeployCustom/list.vue
@@ -145,8 +145,8 @@ export default {
       })
     },
     initWs() {
-      return !this.ws ? new Promise(resolve => {
-        this.ws = new WebSocket(`ws://localhost:12525/ws`)
+      return this.ws && this.ws.readyState == 1 ? Promise.resolve() : new Promise(resolve => {
+        this.ws = new WebSocket(`ws://192.168.1.87:12525/ws`)
         this.ws.onopen = () => resolve()
         this.ws.onmessage = res => {
           if (this.$checkJson(res?.data)) {
@@ -173,7 +173,7 @@ export default {
         this.ws.onerror = () => {
           this.ws.close()
         }
-      }) : Promise.resolve()
+      })
     }
   },
   created() {

From 4c080b7b191972d5fee75c5d6989f0f1d6d00596 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Thu, 16 Feb 2023 17:30:50 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=93=E5=8C=85?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 project/oms/apps/develop/AppDeployCustom/list.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/project/oms/apps/develop/AppDeployCustom/list.vue b/project/oms/apps/develop/AppDeployCustom/list.vue
index 188a17b5..821c8ba9 100644
--- a/project/oms/apps/develop/AppDeployCustom/list.vue
+++ b/project/oms/apps/develop/AppDeployCustom/list.vue
@@ -149,9 +149,9 @@ export default {
         this.ws = new WebSocket(`ws://192.168.1.87:12525/ws`)
         this.ws.onopen = () => resolve()
         this.ws.onmessage = res => {
-          if (this.$checkJson(res?.data)) {
-            const data = JSON.parse(res.data),
-                row = this.tableData.find(e => e.id == data?.row.id)
+          if (this.$checkJson(res)) {
+            const data = JSON.parse(res),
+                row = this.tableData.find(e => e.id == data?.row?.id)
             if (data.code == '0') {
               row.count = data.progress
               if (row.count == 100) {