正查/倒查比中逻辑优化

src/views/Editor/modules/imageEd.vue

 <!--
  * @Author: your name
  * @Date: 2021-10-22 11:36:10
- * @LastEditTime: 2021-12-11 14:57:52
+ * @LastEditTime: 2021-12-11 15:57:05
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue
@@ -1794,6 +1794,7 @@ export default {
     // 判断指纹类型
     this.$bus.on("zwType", (zwType) => {
       self.zwType = zwType;
+      console.log(self.zwType);
     });
 
     // 更改指纹编辑区域标题

src/views/Editor/modules/imageEdAJ.scss

@@ -942,8 +942,8 @@ $canvasWidth: var(--canvasWidth, 640px);
           background: #ffffff;
           display: flex;
           filter: "FlipV";
-          // justify-content: center;
-          // align-items: center;
+          justify-content: center;
+          align-items: center;
           .tui-image-editor {
             width: 640px !important;
             height: 640px !important;
@@ -958,9 +958,9 @@ $canvasWidth: var(--canvasWidth, 640px);
             width: $canvasWidth !important;
             // height: auto !important;
             // width: auto !important;
-            // display: flex !important;
-            // justify-content: center !important;
-            // align-items: center !important;
+            display: flex !important;
+            justify-content: center !important;
+            align-items: center !important;
           }
 
           /deep/ .lower-canvas {

src/views/Editor/modules/ryzwbjLeft.vue

 <!--
  * @Author: your name
  * @Date: 2021-10-22 09:42:07
- * @LastEditTime: 2021-12-10 18:17:44
+ * @LastEditTime: 2021-12-11 15:54:08
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\ryzwbjLeft.vue
@@ -934,11 +934,13 @@ export default {
         this.$store.commit('ryzwbj/setIsFace', true)
         // 获取人脸数据
         this.getFaceData()
+        this.$bus.emit('zwType', '人像')
       } else {
         // 指纹列表
         // 传入判断，为指纹则开启图像编辑的功能
         // this.$bus.emit('isFace', false)
         this.$store.commit('ryzwbj/setIsFace', false)
+        this.$bus.emit('zwType', '指纹')
         // 找到第一个有图片的指纹
         this.findFinger()
         if (self.finger && self.finger.code) {

src/views/cxyrd/LT.vue

@@ -181,17 +181,19 @@ export default {
     //console.log("源qid====>", this.qid);
     this.userInfo = JSON.parse(localStorage.getItem('userInfo')).user
     console.log(this.userInfo);
-    this.bzr = this.userInfo.name
-    this.bzdw = this.userInfo.unitName
-    this.dwdm = this.userInfo.unitCode
-    this.bzrsfzh = this.userInfo.idCard
-    this.phone = this.userInfo.phoneNumber
-
+    if(this.userInfo) {
+      this.bzr = this.userInfo.name
+      this.bzdw = this.userInfo.unitName
+      this.dwdm = this.userInfo.unitCode
+      this.bzrsfzh = this.userInfo.idCard
+      this.phone = this.userInfo.phoneNumber
+    } 
+  },
+  mounted () {
+    let self = this
     this.$bus.on('bzJudge', (val) => {
       self.bzData = val
-      console.log(self.bzData);
     })
-
   },
   watch: {
     phone (newValue, oldValue) {
@@ -389,6 +391,7 @@ export default {
      * @return {*}
      */
     async Bz () {
+      if(this.bzData == null) return;
       if(this.bzData.affirmstatus == '2' || this.bzData.affirmstatus == '3'){
         return
       }
@@ -513,8 +516,9 @@ export default {
     }),
   },
   beforeDestroy () {
-    //组件销毁前需要解绑事件。否则会出现重复触发事件的问题
+    // 组件销毁前需要解绑事件。否则会出现重复触发事件的问题
     this.$bus.off("updateFinderSource");
+    this.$bus.off("bzJudge");
   }
 };
 </script>

src/views/cxyrd/QueryConfirm.vue

@@ -1646,7 +1646,6 @@ b {
 }
 /*有子节点 且未展开*/
 .el-table /deep/ .el-icon-arrow-right:before {
-  // background: url("../../icons/tree_f.svg") no-repeat 0 3px;
   content: "";
   display: block;
   width: 16px;
@@ -1657,7 +1656,6 @@ b {
 /*有子节点 且已展开*/
 .el-table /deep/ .el-table__expand-icon--expanded {
   .el-icon-arrow-right:before {
-    // background: url("../../icons/tree_c.svg") no-repeat 0 3px;
     content: "";
     display: block;
     width: 15px;
@@ -1673,7 +1671,6 @@ b {
   .el-table
   /deep/
   .el-table__placeholder::before {
-  // background: url("../../icons/tree_f.svg") no-repeat 0 3px;
   content: "";
   display: block;
   width: 16px;

src/views/cxyrd/TL.vue

@@ -171,20 +171,26 @@ export default {
     };
   },
   created () {
-    let self = this
     this.userInfo = JSON.parse(localStorage.getItem('userInfo')).user
     console.log(this.userInfo);
-    this.bzr = this.userInfo.name
-    this.bzdw = this.userInfo.unitName
-    this.dwdm = this.userInfo.unitCode
-    this.bzrsfzh = this.userInfo.idCard
-    this.phone = this.userInfo.phoneNumber
-
+    if(this.userInfo) {
+      this.bzr = this.userInfo.name
+      this.bzdw = this.userInfo.unitName
+      this.dwdm = this.userInfo.unitCode
+      this.bzrsfzh = this.userInfo.idCard
+      this.phone = this.userInfo.phoneNumber
+    }
+  },
+  mounted () {
+    let self = this
     this.$bus.on('bzJudgeTL', (val) => {
       self.bzData = val
       console.log(self.bzData);
     })
   },
+  beforeDestroy () {
+    this.$bus.off('bzJudgeTL')
+  },
   watch: {
     phone (newValue, oldValue) {
       if (newValue.length < 7) {
@@ -353,7 +359,7 @@ export default {
      * @return {*}
      */
     async Bz () {
-      console.log(this.bzData);
+      if(this.bzData == null) return;
       if(this.bzData.affirmstatus == '2' || this.bzData.affirmstatus == '3') {
         return
       }

src/views/cxyrd/modules/LTCandidate.vue

@@ -328,11 +328,13 @@ export default {
           self.$refs.singleTable.setCurrentRow(self.tableData[0]);
         })
       } else {
-
+        self.$bus.emit('bzJudge', null)
       }
     });
-
-
+  },
+  beforeDestroy () {
+    this.$bus.off('deleteMessage')
+    this.$bus.off('initCandidate')
   },
   methods: {
     /**
@@ -1231,6 +1233,10 @@ export default {
           }
         } else {
           this.$bus.emit("changImageEditTarget", 'xxx');
+          // 存储目标条码号 --- 置空
+          sessionStorage.setItem("destbarcode", "");
+          // 存储目的数据序号 --- 置空
+          sessionStorage.setItem("destseqno", "");
         }
       }
     },
@@ -1336,6 +1342,9 @@ const candidates = [
       line-height: 34px;
       color: #ffffff;
       text-align: center;
+      font-size: 14px;
+      font-family: MicrosoftYaHei;
+      color: #FFFFFF;
     }
 
     .checked {

src/views/cxyrd/modules/LTSrc.vue

@@ -313,14 +313,16 @@ export default {
           },
         }).then(response => {
           //console.log(response);
-          self.sourceDataList = response.data.ret;
-          self.dataList = self.sourceDataList;
-          self.total = self.dataList.length;
-          //console.log(self.dataList);
-          // 默认选中第一行
-          self.$nextTick(() => {
-            self.$refs.singleTable.setCurrentRow(self.dataList[0]);
-          });
+          if(response.data.code === 0) {
+            self.sourceDataList = response.data.ret;
+            self.dataList = self.sourceDataList;
+            self.total = self.dataList.length;
+            //console.log(self.dataList);
+            // 默认选中第一行
+            self.$nextTick(() => {
+              self.$refs.singleTable.setCurrentRow(self.dataList[0]);
+            });
+          }
         })
       } else {
         this.$axios({
@@ -331,14 +333,16 @@ export default {
           },
         }).then(response => {
           //console.log(response);
-          self.sourceDataList = response.data.ret;
-          self.dataList = self.sourceDataList;
-          self.total = self.dataList.length;
-          //console.log(self.dataList);
-          // 默认选中第一行
-          self.$nextTick(() => {
-            self.$refs.singleTable.setCurrentRow(self.dataList[0]);
-          });
+          if(response.data.code === 0) {
+            self.sourceDataList = response.data.ret;
+            self.dataList = self.sourceDataList;
+            self.total = self.dataList.length;
+            //console.log(self.dataList);
+            // 默认选中第一行
+            self.$nextTick(() => {
+              self.$refs.singleTable.setCurrentRow(self.dataList[0]);
+            });
+          }
         })
       }
 
@@ -1038,6 +1042,17 @@ $tableHeight: var(--tableHeight, 320px);
   height: $tableHeight;
 }
 
+// 滚动条的宽度
+/deep/ .el-table__body-wrapper::-webkit-scrollbar {
+  width: 6px; // 横向滚动条
+  height: 6px; // 纵向滚动条 必写
+}
+// 滚动条的滑块
+/deep/ .el-table__body-wrapper::-webkit-scrollbar-thumb {
+  background-color: #dadde0;
+  border-radius: 3px;
+}
+
 /* 设置滚动条的样式 */
 ::-webkit-scrollbar {
   width: 6px;

src/views/cxyrd/modules/TLCandidate.vue

@@ -60,21 +60,20 @@ export default {
     })
 
     this.$bus.on("initTLCandidate", (tableData) => {
-      console.log(tableData);
       self.tableData = tableData;
       if (self.tableData) {
         self.total = self.tableData.length;
       }
       self.sourceTableData = tableData;
-      //console.log(self.tableData);
       // 默认选中第一条数据
       if (self.tableData && self.tableData.length > 0) {
-        // setTimeout(() => {
-        //   self.$refs.singleTable.setCurrentRow(self.tableData[0]);
-        // }, 20000);
         self.$nextTick(() => {
-          self.$refs.singleTable.setCurrentRow(self.tableData[0]);
+          if (self.tableData.length > 0) {
+            self.$refs.singleTable.setCurrentRow(this.tableData[0])
+          }
         });
+      } else {
+        self.$bus.emit('bzJudgeTL', null)
       }
     });
     // 比中，认定完成之后更新列表数据
@@ -97,9 +96,8 @@ export default {
       this.$axios.post(`/api/query/matchcand/dest/${qqid}/${dcseq}`, {
         srcbarcode: sessionStorage.getItem("srcbarcode"),
         destbarcode: self.input3.trim()
-      }, { loading: false })
+      }, { loading: true })
         .then(response => {
-          //console.log(response);
           if (response.data.code === 0) {
             self.tableData = response.data.ret;
             self.total = self.tableData.total;
@@ -107,10 +105,6 @@ export default {
             self.tableData = []
             self.total = 0
           }
-          clearTimeout(self.timer)
-          self.timer = setTimeout(() => {
-            self.$store.commit('loading/setLoadingSd', false)
-          }, 500);
         });
     },
     /**
@@ -119,7 +113,9 @@ export default {
      * @param old
      */
     handleCurrentChange (val, old) {
+      debugger
       let self = this;
+      console.log(val);
       // 传递当前行的数据，判断是否被比中，如比中就不会弹窗比中
       this.$bus.emit('bzJudgeTL', val)
       if (this.isDelete) {
@@ -173,6 +169,12 @@ export default {
       }
       else {
         self.$bus.emit("changImageEditTarget", 'xxx');
+        // 存储目标条码号 --- 置空
+        sessionStorage.setItem("destbarcode", "");
+        // 存储目的数据序号 --- 置空
+        sessionStorage.setItem("destseqno", "");
+        // 存储倒查序号 --- 置空
+        sessionStorage.setItem("backcheckXh", "");
       }
     },
     tableRowClassName ({ row, column, rowIndex, columnIndex }) {
@@ -200,7 +202,12 @@ export default {
       }
       this.total = this.tableData.length;
     }
-  }
+  },
+  beforeDestroy () {
+    this.$bus.off('initTLCandidate')
+    this.$bus.off('deleteMessage')
+    this.$bus.off('updateTLSourceData')
+  },
 };
 </script>
 
@@ -251,6 +258,9 @@ export default {
       line-height: 32px;
       color: #ffffff;
       text-align: center;
+      font-size: 14px;
+      font-family: MicrosoftYaHei;
+      color: #FFFFFF;
     }
   }
   .checked {

src/views/cxyrd/modules/TLSrc.vue

@@ -1709,10 +1709,9 @@ label {
   width: 6px; // 横向滚动条
   height: 6px; // 纵向滚动条 必写
 }
-
 // 滚动条的滑块
 /deep/ .el-table__body-wrapper::-webkit-scrollbar-thumb {
-  background-color: #DADDE0;
+  background-color: #dadde0;
   border-radius: 3px;
 }
 

vue.config.js

 /*
  * @Author: your name
  * @Date: 2021-09-07 09:57:48
- * @LastEditTime: 2021-12-11 15:00:03
+ * @LastEditTime: 2021-12-12 20:35:59
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \指纹系统\founder_vue\vue.config.js
@@ -132,9 +132,9 @@ module.exports = {
 
       "/security": {
         //target: "http://192.168.128.106:8765", // 湖南-王
-        target: "http://192.168.128.124:8764", // 湖南-张
+        // target: "http://192.168.128.124:8764", // 湖南-张
         // target: "http://www.meetfood.cn:2390", // 湖南-王
-        // target: "http://zwpt.xzclub.top:9333",
+        target: "http://zwpt.xzclub.top:9333",
         ws: true,
         changeOrigin: true,
         pathRewrite: {