From 23868dd9b3d392cb496b533116f47c218813aa72 Mon Sep 17 00:00:00 2001
From: z_yu <1534695664@qq.com>
Date: Fri, 8 Jul 2022 10:14:08 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=A8=E7=B1=BB=E7=AE=A1=E7=90=86bug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/category/fileNoFormat/index.vue             |  2 +-
 src/views/category/fileNoFormat/module/sortDialog.vue |  5 +++++
 src/views/category/listBrowsing/module/sortDialog.vue |  5 +++++
 src/views/category/orderingRule/module/sortDialog.vue |  5 +++++
 src/views/category/sortDialog.vue                     |  5 +++++
 src/views/components/BindingTagDlg.vue                | 10 +++++-----
 src/views/components/category/PreviewForm.vue         |  2 ++
 7 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/src/views/category/fileNoFormat/index.vue b/src/views/category/fileNoFormat/index.vue
index e7a8651..0aa6ab1 100644
--- a/src/views/category/fileNoFormat/index.vue
+++ b/src/views/category/fileNoFormat/index.vue
@@ -10,7 +10,7 @@
       <el-table ref="leftTable" v-loading="table.left.loading" :data="table.left.data" style="width: 400px;" height="calc(100vh - 302px)" @selection-change="(val)=>selectionChangeHandler(val,'left')" @row-click="(row,column,e)=>clickRowHandler(row,column,e,'leftTable')">
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column type="index" label="序号" width="55" align="center" />
-        <el-table-column prop="fieldCnName" label="隐藏字段" align="center" />
+        <el-table-column prop="fieldCnName" label="字段名称" align="center" />
       </el-table>
       <!--表单渲染-->
       <eForm />
diff --git a/src/views/category/fileNoFormat/module/sortDialog.vue b/src/views/category/fileNoFormat/module/sortDialog.vue
index b7d5a00..a270c68 100644
--- a/src/views/category/fileNoFormat/module/sortDialog.vue
+++ b/src/views/category/fileNoFormat/module/sortDialog.vue
@@ -57,6 +57,11 @@ export default {
       })
       order(this.sortTableData).then(() => {
         this.sortVisible = false
+        this.$notify({
+          title: '保存成功',
+          type: 'success',
+          duration: 2500
+        })
         this.$emit('refresh')
       })
     }
diff --git a/src/views/category/listBrowsing/module/sortDialog.vue b/src/views/category/listBrowsing/module/sortDialog.vue
index 263a5b8..98d7654 100644
--- a/src/views/category/listBrowsing/module/sortDialog.vue
+++ b/src/views/category/listBrowsing/module/sortDialog.vue
@@ -57,6 +57,11 @@ export default {
       })
       order(this.sortTableData).then(() => {
         this.sortVisible = false
+        this.$notify({
+          title: '保存成功',
+          type: 'success',
+          duration: 2500
+        })
         this.$emit('refresh')
       })
     }
diff --git a/src/views/category/orderingRule/module/sortDialog.vue b/src/views/category/orderingRule/module/sortDialog.vue
index 9c1ad91..35fae1e 100644
--- a/src/views/category/orderingRule/module/sortDialog.vue
+++ b/src/views/category/orderingRule/module/sortDialog.vue
@@ -57,6 +57,11 @@ export default {
       })
       order(this.sortTableData).then(() => {
         this.sortVisible = false
+        this.$notify({
+          title: '保存成功',
+          type: 'success',
+          duration: 2500
+        })
         this.$emit('refresh')
       })
     }
diff --git a/src/views/category/sortDialog.vue b/src/views/category/sortDialog.vue
index 857a1bd..8e4d529 100644
--- a/src/views/category/sortDialog.vue
+++ b/src/views/category/sortDialog.vue
@@ -60,6 +60,11 @@ export default {
       })
       sort(data).then(() => {
         this.sortVisible = false
+        this.$notify({
+          title: '保存成功',
+          type: 'success',
+          duration: 2500
+        })
         this.$emit('treeNodeSort', this.sortTableData)
       })
     }
diff --git a/src/views/components/BindingTagDlg.vue b/src/views/components/BindingTagDlg.vue
index e28a99d..630a17f 100644
--- a/src/views/components/BindingTagDlg.vue
+++ b/src/views/components/BindingTagDlg.vue
@@ -279,7 +279,7 @@ export default {
           this.coverBindingVisible = true
           resolve()
         } else if (res === 1) {
-          let writeRes = await RFID.writeEPC({ op: 'RFID_WriteEPC', sDevID: 'D001', EAS: '1', Type: this.bindingType, Code: this.bindingId, Tid: this.readData.tid })
+          let writeRes = await RFID.writeEPC({ op: 'RFID_WriteEPC', sDevID: 'D002', EAS: '1', Type: this.bindingType, Code: this.bindingId, Tid: this.readData.tid })
           writeRes = JSON.parse(writeRes)
           if (writeRes.code === '0') {
             this.step = 5
@@ -308,15 +308,15 @@ export default {
     },
     async opened() {
       if (!this.isBinding) {
-        await this.tryConnect({ op: 'RFID_CheckStatus', sDevID: 'D001' })
-        await this.readEpc({ op: 'RFID_ReadEpc', sDevID: 'D001' })
+        await this.tryConnect({ op: 'RFID_CheckStatus', sDevID: 'D002' })
+        await this.readEpc({ op: 'RFID_ReadEpc', sDevID: 'D002' })
         await this.startBind()
       }
     },
     async nextStep() {
       this.isBinding = false
-      await this.tryConnect({ op: 'RFID_CheckStatus', sDevID: 'D001' })
-      await this.readEpc({ op: 'RFID_ReadEpc', sDevID: 'D001' })
+      await this.tryConnect({ op: 'RFID_CheckStatus', sDevID: 'D002' })
+      await this.readEpc({ op: 'RFID_ReadEpc', sDevID: 'D002' })
       await this.startBind()
     },
     // 关闭
diff --git a/src/views/components/category/PreviewForm.vue b/src/views/components/category/PreviewForm.vue
index 4fb7174..b10e03c 100644
--- a/src/views/components/category/PreviewForm.vue
+++ b/src/views/components/category/PreviewForm.vue
@@ -330,6 +330,8 @@ export default {
     }
   }
 }
+
+// addOrUpdateForm[item.fieldName] = item.isDefaultValue
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
 .preview-content {