From 8f63f561293a6fab77b6282933a94c079850535d Mon Sep 17 00:00:00 2001
From: z_yu <1534695664@qq.com>
Date: Fri, 24 Jun 2022 17:31:40 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=92=E7=AE=A1=E7=90=86=20=E7=BB=91?=
 =?UTF-8?q?=E5=AE=9A=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/BindingTagDlg.vue | 70 ++++++++++++++++++--------
 1 file changed, 50 insertions(+), 20 deletions(-)

diff --git a/src/views/components/BindingTagDlg.vue b/src/views/components/BindingTagDlg.vue
index d0071ce..7fd3abc 100644
--- a/src/views/components/BindingTagDlg.vue
+++ b/src/views/components/BindingTagDlg.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-dialog class="bindingDialog" :title="bindingTitle" :visible.sync="bindingVisible" :close-on-click-modal="false" :before-close="handleClose" @opened="opened">
+    <el-dialog ref="dialog" class="bindingDialog" :title="bindingTitle" :visible.sync="bindingVisible" :close-on-click-modal="false" :before-close="handleClose" @opened="opened">
       <span class="dialog-right-top" />
       <span class="dialog-left-bottom" />
       <div class="setting-dialog">
@@ -132,26 +132,13 @@ export default {
       this.step4Message = '标签读取成功后，开始绑定档案'
       this.step5Message = '当前标签与档案绑定成功'
     },
-    opened() {
-      RFID.checkStatus({ op: 'RFID_CheckStatus', sDevID: 'D001' }).then((res) => {
+    async checkStatus(param) {
+      return RFID.checkStatus(param).then((res) => {
         res = JSON.parse(res)
         if (res.code === '0') {
           this.step = 2
           this.step1Message = '连接成功'
-          RFID.readEpc({ op: 'RFID_ReadEpc', sDevID: 'D001' }).then((res) => {
-            res = JSON.parse(res)
-            console.log(res)
-            if (res.code === '0') {
-              this.step = 3
-              this.step2Message = '已放入标签'
-            } else if (res.code === '-2') {
-              this.errorStep = 2
-              this.step2Message = '未读取到标签，请重新放入'
-            } else {
-              this.errorStep = 2
-              this.step2Message = '读取标签失败'
-            }
-          })
+          return true
         } else {
           this.errorStep = 1
           if (res.code === '-1') {
@@ -160,11 +147,54 @@ export default {
             this.step1Message = '读写器超时未响应(例如终端读写服务未开启或网络异常)'
           }
         }
-      }).catch(() => {
-        this.errorStep = 1
-        this.step1Message = '连接失败，请检查网络'
       })
     },
+    async readEpc(param) {
+      return new Promise((resolve, reject) => {
+        RFID.readEpc(param).then(res => {
+          res = JSON.parse(res)
+          if (res.code === '0') {
+            this.step = 3
+            this.step2Message = '已放入标签'
+            resolve()
+          } else if (res.code === '2') {
+            this.errorStep = 2
+            this.step2Message = '未读取到标签，请重新放入'
+            setTimeout(() => {
+              resolve(this.readEpc(param))
+            }, 1000)
+          } else {
+            this.errorStep = 2
+            this.step2Message = '读取标签失败'
+            reject()
+          }
+        })
+      })
+    },
+    async tryConnect(param) {
+      let res
+      let err
+      const MAX_NUM_RETRIES = 3
+      for (let i = 0; i < MAX_NUM_RETRIES; i++) {
+        try {
+          res = await this.checkStatus(param)
+          break
+        } catch (e) {
+          err = e
+          this.errorStep = 1
+          this.step1Message = '连接失败，请检查网络'
+        }
+      }
+      if (res) return res
+      setTimeout(() => {
+        this.$refs.dialog.handleClose()
+      }, 3000)
+      throw err
+    },
+    async opened() {
+      await this.tryConnect({ op: 'RFID_CheckStatus', sDevID: 'D001' })
+      await this.readEpc({ op: 'RFID_ReadEpc', sDevID: 'D001' })
+    },
     // 关闭
     handleClose(done) {
       this.coverBindingVisible = false