档案管理style修改

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{

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('当前标签已被绑定，是否覆盖' + '<span>你是否还要继续？</span>', '提示', {
+          confirmButtonText: '继续',
+          cancelButtonText: '取消',
+          type: 'warning',
+          dangerouslyUseHTMLString: true
+        }).then(() => {
           this.$refs.bindingTag.bindingVisible = true
+          this.$refs.bindingTag.opened()
+        }).catch(() => {
+        })
+      } else {
+        this.$refs.bindingTag.bindingVisible = true
+      }
     },
     // 导出
     handleExport() {

src/views/components/BindingTagDlg.vue

@@ -5,12 +5,12 @@
       <span class="dialog-left-bottom" />
       <div class="setting-dialog">
         <div class="binding-wrap">
-          <div v-if="isBinding" class="rebinding">
+          <!-- <div v-if="isBinding" class="rebinding">
             <span>TID</span>
             <el-input v-model="tidCode" placeholder="请输入内容" />
-          </div>
-          <div v-else class="binding-flow">
-            <div class="step-item" :class="{ 'step-active': 1 <= step, 'step-loading': 2 === step }">
+          </div> -->
+          <div class="binding-flow">
+            <div class="step-item" :class="{ 'step-active': 1 <= step, 'step-loading': 1 === step }">
               <!-- step-active 完成  step-loading 进行种 -->
               <span class="step-left-num" :class="{ 'step-active': 1 <= step, 'step-loading': 1 === step }">1</span>
               <div class="step-right-cont">
@@ -20,7 +20,7 @@
                 <!-- err: 当前电脑未绑定读写器，请到档案设备里进行绑定 -->
               </div>
             </div>
-            <div class="step-item" :class="{ 'step-active': 2 <= step, 'step-loading': 3 === step }">
+            <div class="step-item" :class="{ 'step-active': 2 <= step, 'step-loading': 2 === step }">
               <span class="step-left-num" :class="{ 'step-active': 2 <= step, 'step-loading': 2 === step }">2</span>
               <div class="step-right-cont">
                 <p class="step-title">第二步<span>放入标签</span></p>
@@ -30,7 +30,7 @@
                 <!-- err: 未读取到标签，请重新放入 -->
               </div>
             </div>
-            <div class="step-item" :class="{ 'step-active': 3 <= step, 'step-loading': 4 === step }">
+            <div class="step-item" :class="{ 'step-active': 3 <= step, 'step-loading': 3 === step }">
               <span class="step-left-num" :class="{ 'step-active': 3 <= step, 'step-loading': 3 === step }">3</span>
               <div class="step-right-cont">
                 <p class="step-title">第三步<span>读取标签</span></p>
@@ -40,7 +40,7 @@
                 <!-- err: 当前标签存在多个，请取出多余的标签只保留一张！ -->
               </div>
             </div>
-            <div class="step-item" :class="{ 'step-active': 4 <= step, 'step-loading': 5 === step }">
+            <div class="step-item" :class="{ 'step-active': 4 <= step, 'step-loading': 4 === step }">
               <span class="step-left-num" :class="{ 'step-active': 4 <= step, 'step-loading': 4 === step }">4</span>
               <div class="step-right-cont">
                 <p class="step-title">第四步<span>开始绑定</span></p>
@@ -63,9 +63,9 @@
               </div>
             </div>
           </div>
-          <div v-if="isBinding" slot="footer" class="dialog-footer">
+          <!-- <div v-if="isBinding" slot="footer" class="dialog-footer">
             <el-button type="primary" @click="nextStep">下一步</el-button>
-          </div>
+          </div> -->
         </div>
       </div>
     </el-dialog>
@@ -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) {
+      // 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