diff --git a/src/assets/styles/archives-manage.scss b/src/assets/styles/archives-manage.scss index 80af257..ddf4e1b 100644 --- a/src/assets/styles/archives-manage.scss +++ b/src/assets/styles/archives-manage.scss @@ -324,7 +324,7 @@ content: ""; position: absolute; left: 15px; - top: 32px; + top: -48px; width: 2px; height: 45px; // background-color: #0348F3; @@ -332,12 +332,12 @@ opacity: 0.3; z-index: 1; } - &:last-child::before{ + &:first-child::before{ display: none; } &.step-active{ &::before{ - opacity: 0.3; + opacity: 1; } } &.step-loading{ diff --git a/src/views/archivesManage/managementLibrary/module/collectHeader.vue b/src/views/archivesManage/managementLibrary/module/collectHeader.vue index e0d43e9..71dc5df 100644 --- a/src/views/archivesManage/managementLibrary/module/collectHeader.vue +++ b/src/views/archivesManage/managementLibrary/module/collectHeader.vue @@ -516,10 +516,21 @@ export default { // 绑定标签 bindingTag(data) { if (data[0].tid) { - this.$refs.bindingTag.isBinding = true + // this.$refs.bindingTag.isBinding = true this.$refs.bindingTag.tidCode = data[0].tid + this.$confirm('当前标签已被绑定,是否覆盖' + '你是否还要继续?', '提示', { + confirmButtonText: '继续', + cancelButtonText: '取消', + type: 'warning', + dangerouslyUseHTMLString: true + }).then(() => { + this.$refs.bindingTag.bindingVisible = true + this.$refs.bindingTag.opened() + }).catch(() => { + }) + } else { + this.$refs.bindingTag.bindingVisible = true } - this.$refs.bindingTag.bindingVisible = true }, // 导出 handleExport() { diff --git a/src/views/components/BindingTagDlg.vue b/src/views/components/BindingTagDlg.vue index d18298f..3e8df88 100644 --- a/src/views/components/BindingTagDlg.vue +++ b/src/views/components/BindingTagDlg.vue @@ -5,12 +5,12 @@
-
+ +
+
1
@@ -20,7 +20,7 @@
-
+
2

第二步放入标签

@@ -30,7 +30,7 @@
-
+
3

第三步读取标签

@@ -40,7 +40,7 @@
-
+
4

第四步开始绑定

@@ -63,9 +63,9 @@
-
@@ -114,13 +114,13 @@ export default { bindingVisible: false, // 绑定标签对话框是否显示 tidCode: '', coverBindingVisible: false, - step: 3, + step: 1, errorStep: 0, step1Message: '连接中', - step2Message: '请放入标签', - step3Message: '放入标签后开始读取标签', - step4Message: '标签读取成功后,开始绑定档案', - step5Message: '当前标签与' + this.bindingTxt + '绑定成功', + step2Message: '请放入电子标签', + step3Message: '放入电子标签后,读写器开始读取', + step4Message: '电子标签读取成功后,开始绑定档案', + step5Message: '当前电子标签与' + this.bindingTxt + '绑定成功', readData: {}, timeOut: null, timer: null, @@ -143,10 +143,10 @@ export default { this.step = 1 this.errorStep = 0 this.step1Message = '连接中' - this.step2Message = '请放入标签' - this.step3Message = '放入标签后开始读取标签' - this.step4Message = '标签读取成功后,开始绑定档案' - this.step5Message = '当前标签与' + this.bindingTxt + '绑定成功' + this.step2Message = '请放入电子标签' + this.step3Message = '放入电子标签后,读写器开始读取' + this.step4Message = '电子标签读取成功后,开始绑定档案' + this.step5Message = '当前电子标签与' + this.bindingTxt + '绑定成功' this.isBinding = false this.coverLabel = false this.tidCode = '' @@ -156,7 +156,7 @@ export default { res = JSON.parse(res) if (res.code && res.code === '0') { this.step = 2 - this.step1Message = '连接成功' + this.step1Message = '设备连接成功' return true } else { this.errorStep = 1 @@ -290,14 +290,14 @@ export default { }) }, async opened() { - if (!this.isBinding) { - const devInfo = await this.getDevId() - this.devId = devInfo.deviceId - this.devIp = devInfo.deviceIp + ':' + devInfo.devicePort - await this.tryConnect({ op: 'RFID_CheckStatus', sDevID: devInfo.deviceId, ip: this.devIp }) - await this.readEpc({ op: 'RFID_ReadEpc', sDevID: devInfo.deviceId, ip: this.devIp }) - await this.startBind() - } + // if (!this.isBinding) { + const devInfo = await this.getDevId() + this.devId = devInfo.deviceId + this.devIp = devInfo.deviceIp + ':' + devInfo.devicePort + await this.tryConnect({ op: 'RFID_CheckStatus', sDevID: devInfo.deviceId, ip: this.devIp }) + await this.readEpc({ op: 'RFID_ReadEpc', sDevID: devInfo.deviceId, ip: this.devIp }) + await this.startBind() + // } }, async nextStep() { this.isBinding = false