Merge remote-tracking branch 'origin/dev_zwpt' into dev_zwpt

.env.development

 VUE_APP_AUTO_WRITE = dev
-VUE_APP_BB_IP = http://192.168.128.102:8075/
\ No newline at end of file
+VUE_APP_BB_IP = http://192.168.128.103:8075/
\ No newline at end of file

src/components/ImageEd.scss

@@ -1402,7 +1402,7 @@ div {
     box-sizing: border-box;
     position: absolute;
     top: -64px;
-    right: 59px;
+    right: 140px;
     width: 240px;
     height: 82px;
     background: #ffffff;
@@ -1453,7 +1453,7 @@ div {
     height: 64px;
     padding: 0;
     top: -40px;
-    right: 290px !important;
+    right: 370px !important;
     /deep/.tui-colorpicker-container {
       width: 137px;
       height: 64px;
@@ -1478,7 +1478,7 @@ div {
     height: 64px;
     padding: 0;
     top: -40px;
-    right: 200px !important;
+    right: 280px !important;
     /deep/.tui-colorpicker-container {
       width: 137px;
       height: 64px;
@@ -1512,7 +1512,7 @@ div {
     top: -120px;
   }
   .color-filter {
-    right: 315px;
+    right: 400px;
   }
   .brightness {
     right: 0;

src/components/ImageEd.vue

 <!--
  * @Author: your name
  * @Date: 2021-09-09 09:28:46
- * @LastEditTime: 2022-02-12 14:54:24
+ * @LastEditTime: 2022-02-14 15:16:35
  * @Description: In User Settings Edit
  * @FilePath: \指纹系统\founder_vue\src\views\cxyrd\LTz.vue
 -->
@@ -374,38 +374,37 @@
                 <!-- <div class="pointer"></div>
                 <div class="tzd"></div> -->
                 <!-- 只显示匹配特征的位置 -->
-                <!-- <div v-if="only_pptz">
-                  <div class="auto_tzdDom_number" v-for="(item, i) in bdjqData_source" :key="i+'number'" :style="{left: item.zwtzd_tzxzb*width_ratio_source+pixel_8+'px', top: item.zwtzd_tzyzb*height_ratio_source-pixel_18+'px'}" v-show="xstz && xssz && item.zwtzd_tzppzt==1&&only_pptz">
-                    {{item.zwtzd_tzppbs}}
+                <div v-if="only_pptz">
+                  <div class="auto_tzdDom_number" v-for="(item, i) in bdjqData_source" :key="i+'number'" :style="{left: item.zwtzd_tzxzb*width_ratio_source+pixel_8+'px', top: item.zwtzd_tzyzb*height_ratio_source-pixel_18+'px'}" v-show="xstz && xssz && item.tzppzt==1&&only_pptz">
+                    {{item.tzppbs}}
                   </div>
-                  <div class="auto_tzdDom" v-for="(item, i) in bdjqData_source" :key="i" :style="{left: item.zwtzd_tzxzb*width_ratio_source+'px', top: item.zwtzd_tzyzb*height_ratio_source+'px', transform: 'rotate('+-item.zwtzd_tzfx+'deg)'}" :class="{pptz: item.zwtzd_tzppzt==1&&only_pptz}" v-show="xstz && item.zwtzd_tzppzt==1&&only_pptz">
+                  <div class="auto_tzdDom" v-for="(item, i) in bdjqData_source" :key="i" :style="{left: item.zwtzd_tzxzb*width_ratio_source+'px', top: item.zwtzd_tzyzb*height_ratio_source+'px', transform: 'rotate('+-item.zwtzd_tzfx+'deg)'}" :class="{pptz: item.tzppzt==1&&only_pptz}" v-show="xstz && item.tzppzt==1&&only_pptz">
                     <div class="head"></div>
                     <div class="direction" v-show="xsfx"></div>
                   </div>
                 </div>
                 <div v-else-if="all_pptz">
                   <div class="auto_tzdDom_number" v-for="(item, i) in bdjqData_source" :key="i+'number'" :style="{left: item.zwtzd_tzxzb*width_ratio_source+pixel_8+'px', top: item.zwtzd_tzyzb*height_ratio_source-pixel_18+'px'}" v-show="xstz && xssz">
-                    {{item.zwtzd_tzppbs}}
+                    {{item.tzppbs}}
                   </div>
-                  <div class="auto_tzdDom" v-for="(item, i) in bdjqData_source" :key="i" :style="{left: item.zwtzd_tzxzb*width_ratio_source+'px', top: item.zwtzd_tzyzb*height_ratio_source+'px', transform: 'rotate('+-item.zwtzd_tzfx+'deg)'}" :class="{pptz: item.zwtzd_tzppzt==1&&all_pptz}" v-show="xstz && all_pptz">
+                  <div class="auto_tzdDom" v-for="(item, i) in bdjqData_source" :key="i" :style="{left: item.zwtzd_tzxzb*width_ratio_source+'px', top: item.zwtzd_tzyzb*height_ratio_source+'px', transform: 'rotate('+-item.zwtzd_tzfx+'deg)'}" :class="{pptz: item.tzppzt==1&&all_pptz}" v-show="xstz && all_pptz">
                     <div class="head"></div>
                     <div class="direction" v-show="xsfx"></div>
                   </div>
                 </div>
                 <div v-if="!only_pptz&&!all_pptz">
                   <div class="auto_tzdDom_number" v-for="(item, i) in bdjqData_source" :key="i+'number'" :style="{left: item.zwtzd_tzxzb*width_ratio_source+pixel_8+'px', top: item.zwtzd_tzyzb*height_ratio_source-pixel_18+'px'}" v-show="xstz && xssz">
-                    {{item.zwtzd_tzppbs}}
+                    {{item.tzppbs}}
                   </div>
                   <div class="auto_tzdDom" v-for="(item, i) in bdjqData_source" :key="i" :style="{left: item.zwtzd_tzxzb*width_ratio_source+'px', top: item.zwtzd_tzyzb*height_ratio_source+'px', transform: 'rotate('+-item.zwtzd_tzfx+'deg)'}" v-show="xstz">
                     <div class="head"></div>
                     <div class="direction" v-show="xsfx"></div>
                   </div>
-                </div> -->
-                <!-- 注释 -->
+                </div>
                 <!-- <div class="auto_tzdDom_number" v-for="(item, i) in bdjqData_source" :key="i+'number'" :style="{left: item.zwtzd_tzxzb*width_ratio_source+pixel_8+'px', top: item.zwtzd_tzyzb*height_ratio_source-pixel_18+'px'}" v-show="xstz && xssz">
-                  {{item.zwtzd_tzppbs}}
+                  {{item.tzppbs}}
                 </div>
-                <div class="auto_tzdDom" v-for="(item, i) in bdjqData_source" :key="i" :style="{left: item.zwtzd_tzxzb*width_ratio_source+'px', top: item.zwtzd_tzyzb*height_ratio_source+'px', transform: 'rotate('+-item.zwtzd_tzfx+'deg)'}" :class="{pptz: item.zwtzd_tzppzt==1&&only_pptz}"
+                <div class="auto_tzdDom" v-for="(item, i) in bdjqData_source" :key="i" :style="{left: item.zwtzd_tzxzb*width_ratio_source+'px', top: item.zwtzd_tzyzb*height_ratio_source+'px', transform: 'rotate('+-item.zwtzd_tzfx+'deg)'}" :class="{pptz: item.tzppzt==1&&only_pptz}"
                 v-show="xstz">
                   <div class="head"></div>
                   <div class="direction" v-show="xsfx"></div>
@@ -452,43 +451,43 @@
               <div class="tzdDrawing_2_target"></div>
               <div class="tzdDrawing_target">
                 <!-- <div class="pointer"></div> -->
-                <!-- <div v-if="only_pptz">
-                  <div class="auto_tzdDom_number" v-for="(item, i) in bdjqData_target" :key="i+'number'" :style="{left: item.zwtzd_tzxzb*width_ratio_target+pixel_8+'px', top: item.zwtzd_tzyzb*height_ratio_target-pixel_18+'px'}" v-show="xstz && xssz && item.zwtzd_tzppzt==1&&only_pptz">
-                    {{item.zwtzd_tzppbs}}
+                <div v-if="only_pptz">
+                  <div class="auto_tzdDom_number" v-for="(item, i) in bdjqData_target" :key="i+'number'" :style="{left: item.zwtzd_tzxzb*width_ratio_target+pixel_8+'px', top: item.zwtzd_tzyzb*height_ratio_target-pixel_18+'px'}" v-show="xstz && xssz && item.tzppzt==1&&only_pptz">
+                    {{item.tzppbs}}
                   </div>
-                  <div class="auto_tzdDom" v-for="(item, i) in bdjqData_target" :key="i" :style="{left: item.zwtzd_tzxzb*width_ratio_target+'px', top: item.zwtzd_tzyzb*height_ratio_target+'px', transform: 'rotate('+-item.zwtzd_tzfx+'deg)'}" :class="{pptz: item.zwtzd_tzppzt==1&&only_pptz}" v-show="xstz && item.zwtzd_tzppzt==1&&only_pptz">
+                  <div class="auto_tzdDom" v-for="(item, i) in bdjqData_target" :key="i" :style="{left: item.zwtzd_tzxzb*width_ratio_target+'px', top: item.zwtzd_tzyzb*height_ratio_target+'px', transform: 'rotate('+-item.zwtzd_tzfx+'deg)'}" :class="{pptz: item.tzppzt==1&&only_pptz}" v-show="xstz && item.tzppzt==1&&only_pptz">
                     <div class="head"></div>
                     <div class="direction" v-show="xsfx"></div>
                   </div>
                 </div>
                 <div v-else-if="all_pptz">
                   <div class="auto_tzdDom_number" v-for="(item, i) in bdjqData_target" :key="i+'number'" :style="{left: item.zwtzd_tzxzb*width_ratio_target+pixel_8+'px', top: item.zwtzd_tzyzb*height_ratio_target-pixel_18+'px'}" v-show="xstz && xssz">
-                    {{item.zwtzd_tzppbs}}
+                    {{item.tzppbs}}
                   </div>
-                  <div class="auto_tzdDom" v-for="(item, i) in bdjqData_target" :key="i" :style="{left: item.zwtzd_tzxzb*width_ratio_target+'px', top: item.zwtzd_tzyzb*height_ratio_target+'px', transform: 'rotate('+-item.zwtzd_tzfx+'deg)'}" :class="{pptz: item.zwtzd_tzppzt==1&&all_pptz}" v-show="xstz && all_pptz">
+                  <div class="auto_tzdDom" v-for="(item, i) in bdjqData_target" :key="i" :style="{left: item.zwtzd_tzxzb*width_ratio_target+'px', top: item.zwtzd_tzyzb*height_ratio_target+'px', transform: 'rotate('+-item.zwtzd_tzfx+'deg)'}" :class="{pptz: item.tzppzt==1&&all_pptz}" v-show="xstz && all_pptz">
                     <div class="head"></div>
                     <div class="direction" v-show="xsfx"></div>
                   </div>
                 </div>
                 <div v-if="!only_pptz&&!all_pptz">
                   <div class="auto_tzdDom_number" v-for="(item, i) in bdjqData_target" :key="i+'number'" :style="{left: item.zwtzd_tzxzb*width_ratio_target+pixel_8+'px', top: item.zwtzd_tzyzb*height_ratio_target-pixel_18+'px'}" v-show="xstz && xssz">
-                    {{item.zwtzd_tzppbs}}
+                    {{item.tzppbs}}
                   </div>
                   <div class="auto_tzdDom" v-for="(item, i) in bdjqData_target" :key="i" :style="{left: item.zwtzd_tzxzb*width_ratio_target+'px', top: item.zwtzd_tzyzb*height_ratio_target+'px', transform: 'rotate('+-item.zwtzd_tzfx+'deg)'}" v-show="xstz">
                     <div class="head"></div>
                     <div class="direction" v-show="xsfx"></div>
                   </div>
-                </div> -->
+                </div>
               </div>
             </div>
             <div class="edit" id="targetEdit" v-show="!isFHxx" @click="targetChange" v-if="roleArr.includes('C-1-9')">编辑</div>
             <div class="shade_target" v-show="type=='source'" @click.self="targetEdit"></div>
           </div>
         </div>
-        <div class="lt_main_footer">
+        <div class="lt_main_footer" style="padding-left: 4.375rem;">
           <!-- <div class="btn" :class="{grayActive: isGrayActive}" @click.stop="changeGray">灰度</div> -->
           <div class="btn" :class="{vintageActive: isVintageActive}" @click.stop="changeVintage">棕褐色</div>
-          <div class="btn" :class="{horseshoeMirrorActive: isHorseshoeMirrorActive}" @click.stop="changeHorseshoeMirror">
+          <div class="btn" :class="{horseshoeMirrorActive: isHorseshoeMirrorActive}" style="display: none;" @click.stop="changeHorseshoeMirror">
             马蹄镜
           </div>
           <div class="btn" :class="{equalizationActive: isEqualizationActive}" @click.stop="changeEqualization">均衡化</div>
@@ -599,7 +598,7 @@ const bdjqData = {
         zwTxzl: null,
         zwTxsj: null,
         fpt5TraitMinutiaList: null,
-        zw_pptzxzjd: 90,
+        pptzxzjd: 90,
         fpt5TraitMinutiaSet: {
           minutia: [
             {
@@ -607,32 +606,32 @@ const bdjqData = {
               zwtzd_tzxzb: "211.69230769230768",
               zwtzd_tzyzb: "228.51282051282053",
               zwtzd_tzfx: "320",
-              zwtzd_tzppzt: 1,
-              zwtzd_tzppbs: 1
+              tzppzt: 1,
+              tzppbs: 1
             },
             {
               zwtzdTzzl: null,
               zwtzd_tzxzb: "320.8205128205128",
               zwtzd_tzyzb: "216.2051282051282",
               zwtzd_tzfx: "251",
-              zwtzd_tzppzt: null,
-              zwtzd_tzppbs: null
+              tzppzt: null,
+              tzppbs: null
             },
             {
               zwtzdTzzl: null,
               zwtzd_tzxzb: "452.1025641025641",
               zwtzd_tzyzb: "299.0769230769231",
               zwtzd_tzfx: "260",
-              zwtzd_tzppzt: 1,
-              zwtzd_tzppbs: 3
+              tzppzt: 1,
+              tzppbs: 3
             },
             {
               zwtzdTzzl: null,
               zwtzd_tzxzb: "332.3076923076923",
               zwtzd_tzyzb: "294.97435897435895",
               zwtzd_tzfx: "305",
-              zwtzd_tzppzt: 0,
-              zwtzd_tzppbs: 4
+              tzppzt: 0,
+              tzppbs: 4
             },
           ]
         }
@@ -680,7 +679,7 @@ const bdjqData = {
         zwTxzl: null,
         zwTxsj: null,
         fpt5TraitMinutiaList: null,
-        zw_pptzxzjd: 45,
+        pptzxzjd: 45,
         fpt5TraitMinutiaSet: {
           minutia: [
             {
@@ -688,32 +687,32 @@ const bdjqData = {
               zwtzd_tzxzb: "325.7313432835821",
               zwtzd_tzyzb: "174.80597014925374",
               zwtzd_tzfx: "270",
-              zwtzd_tzppzt: 1,
-              zwtzd_tzppbs: 1
+              tzppzt: 1,
+              tzppbs: 1
             },
             {
               zwtzdTzzl: null,
               zwtzd_tzxzb: "188.17910447761193",
               zwtzd_tzyzb: "375.4029850746269",
               zwtzd_tzfx: "293.16887978511846",
-              zwtzd_tzppzt: 0,
-              zwtzd_tzppbs: 2
+              tzppzt: 0,
+              tzppbs: 2
             },
             {
               zwtzdTzzl: null,
               zwtzd_tzxzb: "196.77611940298507",
               zwtzd_tzyzb: "430.8059701492537",
               zwtzd_tzfx: "311.24960709400705",
-              zwtzd_tzppzt: 0,
-              zwtzd_tzppbs: 3
+              tzppzt: 0,
+              tzppbs: 3
             },
             {
               zwtzdTzzl: null,
               zwtzd_tzxzb: "233.07462686567163",
               zwtzd_tzyzb: "226.38805970149255",
               zwtzd_tzfx: "312.33540187620036",
-              zwtzd_tzppzt: 1,
-              zwtzd_tzppbs: 4
+              tzppzt: 1,
+              tzppbs: 4
             },
           ]
         }
@@ -997,7 +996,7 @@ export default {
       // 特殊显示匹配特征的位置
       all_pptz: false,
       // 根据特征匹配旋正旋转角度
-      zw_pptzxzjd: 0
+      pptzxzjd: 0
     };
   },
   components: {
@@ -2661,6 +2660,11 @@ export default {
       self.showType = showType
     })
 
+    // 获取传递过来的 源条码号，源指位号，目标条码号，目标指位号
+    this.$bus.on('target_info', (target_info) => {
+      console.log(target_info);
+      self.getBdjqData(target_info.barcode_source, target_info.seq_source, target_info.barcode_target, target_info.seq_target)
+    })
   },
   methods: {
     /**
@@ -2681,9 +2685,9 @@ export default {
           this.bdjqData_target = bdjqData.ret.personDestFingerTrait.fingerMsg.fpt5TraitMinutiaSet.minutia
         }
         if(bdjqData.ret.personDestFingerTrait && bdjqData.ret.personDestFingerTrait.fingerMsg.fpt5TraitMinutiaSet && bdjqData.ret.personDestFingerTrait.fingerMsg) {
-          this.zw_pptzxzjd = bdjqData.ret.personDestFingerTrait.fingerMsg.zw_pptzxzjd
+          this.pptzxzjd = bdjqData.ret.personDestFingerTrait.fingerMsg.pptzxzjd
         }
-        console.log(this.zw_pptzxzjd);
+        console.log(this.pptzxzjd);
         console.log(this.bdjqData_source);
         console.log(this.bdjqData_target);
       } else {
@@ -3390,11 +3394,14 @@ export default {
     features6Change () {
       // this.features6 = !this.features6
       this.features6 = true
-      console.log(11111);
-      this.rotateImage_target(this.zw_pptzxzjd);
+      let canvasImage = this.imageEditor2._graphics.getCanvasImage();
+      console.log(canvasImage);
+      if(canvasImage.angle == this.pptzxzjd) {
+        return;
+      }
+      this.rotateImage_target(this.pptzxzjd);
       // 旋转操作会存入撤销堆，需要保证历史记录顺序
       this.historys2.unshift('旋转')
-      // zw_pptzxzjd
     },
     /**
      * 恢复按钮按下事件

src/views/AllPersonnelBase/modules/dcfptxAj.vue

@@ -175,11 +175,10 @@ export default {
           barcode.push(this.rowData[i].followCase.barcode)
         }
       }
-
-
       let reqParam = {
         barcode: '',  //条码号
         seqNo: [],// 指纹序号
+        palmNo: [], // 掌纹序号
         imageType: '',// 数据类型（原图）
         baseMsg: null, // 基本信息  1导出 0不导出
         featureFlag: null, // 导出特征  1导出 0不导出
@@ -188,9 +187,22 @@ export default {
       reqParam.barcode = barcode
 
       if (barcode.length > 1) {
-        reqParam.seqNo = []
+        reqParam.seqNo = null
+        reqParam.palmNo = null
       } else {
-        reqParam.seqNo = this.checkedTargets
+        let self = this
+        console.log(this.checkedTargets, ' this.checkedTargets')
+        self.checkedTargets.map(item => {
+          console.log(item)
+          if (item <= 99) {
+            reqParam.seqNo.push(item)
+          } else {
+            reqParam.palmNo.push(item)
+          }
+
+        })
+        // reqParam.seqNo = this.checkedTargets
+
       }
       reqParam.imageType = this.sjlx
       reqParam.baseMsg = this.wzChecked == true ? 1 : 0;

src/views/Editor/modules/ajzwbjLeft.vue

 <!--
  * @Author: your name
  * @Date: 2021-10-22 09:42:07
- * @LastEditTime: 2022-01-19 14:48:31
+ * @LastEditTime: 2022-02-14 15:02:30
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\ryzwbjLeft.vue
@@ -174,7 +174,8 @@ export default {
       // 如果请求过就不再请求
       if (self.isHandRequest) {
         if (self.hands.length > 0) {
-          this.$bus.emit('ajzwbjImage', { finger_image: self.hands[0].image, finger_dealFlag: self.hands[0].dealFlag, finger_position: self.hands[0].finger_position })
+          // this.$bus.emit('ajzwbjImage', { finger_image: self.hands[0].image, finger_dealFlag: self.hands[0].dealFlag, finger_position: self.hands[0].finger_position })
+          self.HandChange(self.hands[0])
         } else {
           self.$bus.emit('ajzwbjImage', 'xxx')
         }
@@ -360,12 +361,13 @@ export default {
         // 请求掌纹数据
         this.getHandsData()
         if (this.hands && this.hands.length > 0) {
-          this.activeHand = this.hands[0].seq
+          // this.activeHand = this.hands[0].seq
+          this.HandChange(this.hands[0])
         }
         this.$bus.emit('ajzwbjType', '掌纹')
-        this.$bus.emit('ajzwbjTDZ')
       } else {
         this.$bus.emit('ajzwbjType', '指纹')
+        this.$bus.emit('ajzwbjTDZ')
         if (this.fingers.length > 0) {
           this.FingersChange(0, this.fingers[0])
         }

src/views/Editor/modules/imageEdAJ.vue

 <!--
  * @Author: your name
  * @Date: 2021-10-22 11:36:10
- * @LastEditTime: 2022-02-11 17:29:15
+ * @LastEditTime: 2022-02-14 14:47:12
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue
@@ -1853,7 +1853,7 @@ export default {
           ).then(res => { }).catch(err => { })
         return
       }
-      // console.log(self.seq);
+      console.log(self.seq);
       // console.log(sessionStorage.getItem(self.seq));
       // console.log(ajzwbjImage);
       let sourceImage = ajzwbjImage.finger_image

src/views/bzxxgl/fhxxLL.vue

 <!--
  * @Author: your name
  * @Date: 2021-12-03 15:35:26
- * @LastEditTime: 2022-01-18 17:02:00
+ * @LastEditTime: 2022-02-14 16:07:23
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \指纹系统\founder_vue\src\views\bzxxgl\fhxxLT.vue
@@ -34,8 +34,7 @@
                   </div>
                   <div class="content-item">
                     <div class="label-name">案发地点：</div>
-                                        <el-tooltip class="item" effect="dark" :content="allData.asjfsddDzmc"
-                                                    placement="top">
+                    <el-tooltip class="item" effect="dark" :content="allData.asjfsddDzmc" placement="top">
                       <div class="label-value">{{allData.asjfsddDzmc}}</div>
                     </el-tooltip>
                   </div>
@@ -55,15 +54,13 @@
                                                       </div> -->
                   <div class="content-item">
                     <div class="label-name">案件类别：</div>
-                                        <el-tooltip class="item" effect="dark" :content="allData.asjfsddDzmc"
-                                                    placement="top">
+                    <el-tooltip class="item" effect="dark" :content="allData.asjfsddDzmc" placement="top">
                       <div class="label-value">{{allData.asjfsddDzmc}}</div>
                     </el-tooltip>
                   </div>
                   <div class="content-item">
                     <div class="label-name">源逻辑库：</div>
-                                        <el-tooltip class="item" effect="dark" :content="allData.srcLogicDatabaseName"
-                                                    placement="top">
+                    <el-tooltip class="item" effect="dark" :content="allData.srcLogicDatabaseName" placement="top">
                       <div class="label-value">{{allData.srcLogicDatabaseName}}</div>
                     </el-tooltip>
                   </div>
@@ -72,8 +69,7 @@
                                                         <div class="label-value">{{allData.ajjb}}</div>
                                                       </div> -->
                   <div class="content-area content-area4">
-                                        <el-input type="textarea" :rows="3" placeholder="暂无内容" v-model="allData.jyaq"
-                                                  disabled>
+                    <el-input type="textarea" :rows="3" placeholder="暂无内容" v-model="allData.jyaq" disabled>
                     </el-input>
                   </div>
                 </div>
@@ -94,8 +90,7 @@
                   </div>
                   <div class="content-item">
                     <div class="label-name">案发地点：</div>
-                                        <el-tooltip class="item" effect="dark" :content="allData.srcLogicDatabaseName"
-                                                    placement="top">
+                    <el-tooltip class="item" effect="dark" :content="allData.srcLogicDatabaseName" placement="top">
                       <div class="label-value">{{allData.srcLogicDatabaseName}}</div>
                     </el-tooltip>
                   </div>
@@ -115,15 +110,13 @@
                                                       </div> -->
                   <div class="content-item">
                     <div class="label-name">案件类别：</div>
-                                        <el-tooltip class="item" effect="dark" :content="allData.destAjlb"
-                                                    placement="top">
+                    <el-tooltip class="item" effect="dark" :content="allData.destAjlb" placement="top">
                       <div class="label-value">{{allData.destAjlb}}</div>
                     </el-tooltip>
                   </div>
                   <div class="content-item">
                     <div class="label-name">源逻辑库：</div>
-                                        <el-tooltip class="item" effect="dark" :content="allData.srcLogicDatabaseName"
-                                                    placement="top">
+                    <el-tooltip class="item" effect="dark" :content="allData.srcLogicDatabaseName" placement="top">
                       <div class="label-value">{{allData.srcLogicDatabaseName}}</div>
                     </el-tooltip>
                   </div>
@@ -132,8 +125,7 @@
                                                         <div class="label-value">{{allData.destAjjb}}</div>
                                                       </div> -->
                   <div class="content-area content-area4">
-                                        <el-input type="textarea" :rows="3" placeholder="暂无内容"
-                                                  v-model="allData.destJyaq" disabled>
+                    <el-input type="textarea" :rows="3" placeholder="暂无内容" v-model="allData.destJyaq" disabled>
                     </el-input>
                   </div>
                 </div>
@@ -191,9 +183,8 @@
               </div>
             </div>
           </div>
-                </div>
           <div class="fhxx-bottom">
-                    <div class="fhxx-bottom-title">{{getShOrFhName()}}意见</div>
+            <!-- <div class="fhxx-bottom-title">{{getShOrFhName()}}意见</div> -->
             <div class="fhxx-bottom-textarea">
               <el-input type="textarea" :rows="3" placeholder="在此输入意见" v-model="fhyj">
               </el-input>
@@ -209,6 +200,7 @@
           </div>
         </div>
       </div>
+    </div>
     <!-- 确认解除 -->
     <div class="relieveDialog" v-show="isRelieveVisible">
       <div class="close">
@@ -233,12 +225,12 @@
 </template>
 
 <script>
-import {mapState} from 'vuex'
+import { mapState } from 'vuex'
 import ImageEd from '@/components/ImageEd.vue'
 
 export default {
   name: 'fhxxLT',
-  data() {
+  data () {
     return {
       isRelieveVisible: false,
       fhyj: '',
@@ -290,7 +282,7 @@ export default {
       formData: null
     }
   },
-  mounted() {
+  mounted () {
     this.$bus.emit('suoluetu', '指纹')
     if (localStorage.getItem('userInfo')) {
       this.bzrName = JSON.parse(localStorage.getItem('userInfo')).user.name
@@ -308,7 +300,7 @@ export default {
       loading_sd: (state) => state.loading.loading_sd,
     }),
   },
-  async created() {
+  async created () {
     this.id = this.$route.params.id
     if (this.$route.query.isFromSh) {
       this.isFromSh = this.$route.query.isFromSh
@@ -323,12 +315,12 @@ export default {
     if (this.$route.query.shxx) {
       this.shxx = JSON.parse(this.$route.query.shxx)
     }
-    logger.info("$route-LL",this.$route)
+    logger.info("$route-LL", this.$route)
 
     this.getData()
   },
   methods: {
-    getShOrFhName() {
+    getShOrFhName () {
       let _that = this
       if (_that.isFromSh === 'true') {
         return _that.isSh === 'true' ? '审核' : '复核'
@@ -339,7 +331,7 @@ export default {
     /**
      * 获取指纹（案件）图片
      */
-    getFingerPic() {
+    getFingerPic () {
       let self = this
       this.$axios({
         method: 'post',
@@ -383,7 +375,7 @@ export default {
     /**
      * 確認解除比中关系
      */
-    confirmRelieveChange() {
+    confirmRelieveChange () {
       let self = this
       this.$axios({
         method: 'post',
@@ -417,10 +409,10 @@ export default {
     /**
      * 解除比中关系
      */
-    relieveChange() {
+    relieveChange () {
       this.isRelieveVisible = true
     },
-    gotoProgress(isPass) {// 进入处理逻辑
+    gotoProgress (isPass) {// 进入处理逻辑
       let _that = this
       if (!isPass && !_that.fhyj) {
         this.$message.error('请填写不通过意见！')
@@ -455,7 +447,7 @@ export default {
     /**
      * 未通过
      */
-    noPassChange() {
+    noPassChange () {
       let self = this
       if (self.isFromSh === 'true') {
         self.doSh(false)
@@ -495,7 +487,7 @@ export default {
     /**
      * 通过
      */
-    passChange() {
+    passChange () {
       let self = this
       if (self.isFromSh === 'true') {
         self.doSh(true)
@@ -535,7 +527,7 @@ export default {
     /**
      * 获取数据
      */
-    getData() {
+    getData () {
       let self = this
       this.$axios({
         method: 'post',
@@ -566,7 +558,7 @@ export default {
       })
     },
 
-    doSh(isPass) {
+    doSh (isPass) {
       let TITLE = '审核'
       let _that = this
       var ruleForm = {}

src/views/bzxxgl/fhxxLT.vue

 <!--
  * @Author: your name
  * @Date: 2021-12-03 15:35:26
- * @LastEditTime: 2022-01-18 16:49:16
+ * @LastEditTime: 2022-02-14 15:36:41
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \指纹系统\founder_vue\src\views\bzxxgl\fhxxLT.vue
@@ -609,6 +609,8 @@ export default {
           sessionStorage.setItem('srcbarcode', this.allData.ysxtAsjbh)
           sessionStorage.setItem('destseqno', this.allData.bzxxZwXh)
           sessionStorage.setItem('destbarcode', this.allData.ysxtAsjxgrybh)
+          // 传递目标数据 -- 目标条码号，目标指位号
+          self.$bus.emit('target_info', {barcode_source: this.allData.ysxtAsjbh, seq_source: this.allData.bzxxXh, barcode_target: this.allData.ysxtAsjxgrybh, seq_target: this.allData.bzxxZwXh})
         }
       }).catch(err => {
         console.log(err)

src/views/bzxxgl/fhxxTL.vue

 <!--
  * @Author: your name
  * @Date: 2021-12-03 15:35:26
- * @LastEditTime: 2022-01-18 16:47:39
+ * @LastEditTime: 2022-02-14 16:08:52
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \指纹系统\founder_vue\src\views\bzxxgl\fhxxLT.vue
@@ -187,9 +187,8 @@
               </div>
             </div>
           </div>
-        </div>
           <div class="fhxx-bottom">
-          <div class="fhxx-bottom-title">{{getShOrFhName()}}意见</div>
+            <!-- <div class="fhxx-bottom-title">{{getShOrFhName()}}意见</div> -->
             <div class="fhxx-bottom-textarea">
               <el-input type="textarea" :rows="3" placeholder="在此输入意见" v-model="fhyj">
               </el-input>
@@ -205,6 +204,7 @@
           </div>
         </div>
       </div>
+    </div>
     <!-- 确认解除 -->
     <div class="relieveDialog" v-show="isRelieveVisible">
       <div class="close">
@@ -229,12 +229,12 @@
 </template>
 
 <script>
-  import { mapState } from 'vuex'
-  import ImageEd from '@/components/ImageEd.vue'
+import { mapState } from 'vuex'
+import ImageEd from '@/components/ImageEd.vue'
 
-  export default {
+export default {
   name: 'fhxxLT',
-    data() {
+  data () {
     return {
       // 確認解除彈窗
       isRelieveVisible: false,
@@ -296,7 +296,7 @@
       loading_sd: (state) => state.loading.loading_sd,
     }),
   },
-    mounted() {
+  mounted () {
     this.$bus.emit('suoluetu', '指纹')
     if (localStorage.getItem('userInfo')) {
       this.bzrName = JSON.parse(localStorage.getItem('userInfo')).user.name
@@ -305,7 +305,7 @@
       this.formData = this.$route.query.formData
     }
   },
-    created() {
+  created () {
     this.id = this.$route.params.id
     if (this.$route.query.isFromSh) {
       this.isFromSh = this.$route.query.isFromSh
@@ -324,7 +324,7 @@
     this.getData()
   },
   methods: {
-      getShOrFhName() {
+    getShOrFhName () {
       let _that = this
       if (_that.isFromSh === 'true') {
         return _that.isSh === 'true' ? '审核' : '复核'
@@ -335,7 +335,7 @@
     /**
      * 获取指纹（人员）图片
      */
-      getPersonPic() {
+    getPersonPic () {
       let self = this
       if (self.allData.bzxxZwXh) {
         if (self.allData.bzxxZwXh > 30) {
@@ -404,7 +404,7 @@
     /**
      * 获取指纹（案件）图片
      */
-      getCasePic() {
+    getCasePic () {
       let self = this
       this.$axios({
         method: 'post',
@@ -429,7 +429,7 @@
     /**
      * 確認解除比中关系
      */
-      confirmRelieveChange() {
+    confirmRelieveChange () {
       let self = this
       this.$axios({
         method: 'post',
@@ -463,10 +463,10 @@
     /**
      * 解除比中关系
      */
-      relieveChange() {
+    relieveChange () {
       this.isRelieveVisible = true
     },
-      gotoProgress(isPass) {// 进入处理逻辑
+    gotoProgress (isPass) {// 进入处理逻辑
       let _that = this
       if (!isPass && !_that.fhyj) {
         this.$message.error('请填写不通过意见！')
@@ -501,7 +501,7 @@
     /**
      * 未通过
      */
-      noPassChange() {
+    noPassChange () {
       let self = this
       if (self.isFromSh === 'true') {
         self.doSh(false)
@@ -541,7 +541,7 @@
     /**
      * 通过
      */
-      passChange() {
+    passChange () {
       let self = this
       if (self.isFromSh === 'true') {
         self.doSh(true)
@@ -581,7 +581,7 @@
     /**
      * 获取数据
      */
-      getData() {
+    getData () {
       let self = this
       this.$axios({
         method: 'post',
@@ -617,7 +617,7 @@
       })
     },
 
-      doSh(isPass) {
+    doSh (isPass) {
       let TITLE = '审核'
       let _that = this
       var ruleForm = {}
@@ -656,7 +656,7 @@
     },
 
   },
-  }
+}
 </script>
 
 <style lang="scss" scoped>

src/views/bzxxgl/fhxxTT.vue

 <!--
  * @Author: your name
  * @Date: 2021-12-03 15:35:26
- * @LastEditTime: 2022-01-18 16:53:29
+ * @LastEditTime: 2022-02-14 16:33:24
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \指纹系统\founder_vue\src\views\bzxxgl\fhxxLT.vue
@@ -1347,7 +1347,7 @@ export default {
       this.loadingIndex++
       // 平面 目标
       this.$axios
-        .post('/api/png/plain/barcode', {
+        .post('/api/png/roll/barcode', {
           barcode: this.destbarcode,
         })
         .then(function (response) {
@@ -1369,6 +1369,7 @@ export default {
                 }
               })
             })
+            console.log(self.destFingersRightR);
             // 去掉加载状态
             self.fingerLoading = false
           } else if (response.data.code == 4) {
@@ -1386,7 +1387,7 @@ export default {
       this.loadingIndex++
       // 滚动 目标数据
       this.$axios
-        .post('/api/png/roll/barcode', {barcode: this.destbarcode})
+        .post('/api/png/plain/barcode', {barcode: this.destbarcode})
         .then(function (response) {
           self.loadingIndex--
           if (response.data.code == 0) {

src/views/cxyrd/QueryConfirm.vue

 <template>
-  <el-container class="confirm-page" direction="vertical">
+  <el-container
+    class="confirm-page"
+    direction="vertical"
+  >
     <div class="confirm_header_search">
-      <div class="width100 margin_top24_bottom24" style="display: flex; align-items: center; position: relative">
+      <div
+        class="width100 margin_top24_bottom24"
+        style="display: flex; align-items: center; position: relative"
+      >
         <div class="display_style">
           <span class="labelFont">条码号：</span>
-          <el-input maxlength="23" show-word-limit clearable class="el_input tmh" v-model="reqParam.contrastCustomSearchReq.barcode" placeholder="请输入条码号"></el-input>
+          <el-input
+            maxlength="23"
+            show-word-limit
+            clearable
+            class="el_input tmh"
+            v-model="reqParam.contrastCustomSearchReq.barcode"
+            placeholder="请输入条码号"
+          ></el-input>
         </div>
         <div class="display_style">
-          <span class="labelFont">用户：</span>
-          <el-select class="el_select" v-model="reqParam.contrastCustomSearchReq.userid" @change="selectUserInfo" clearable @clear="clearUser">
-            <el-option v-for="(item, index) in userOption" :key="index" :label="item.label" :value="item.userid">
+          <span class="labelFont">用户名：</span>
+          <el-select
+            class="el_select"
+            v-model="reqParam.contrastCustomSearchReq.userid"
+            @change="selectUserInfo"
+            clearable
+            @clear="clearUser"
+          >
+            <el-option
+              v-for="(item, index) in userOption"
+              :key="index"
+              :label="item.label"
+              :value="item.userid"
+            >
             </el-option>
           </el-select>
         </div>
         <div class="display_style">
           <span class="labelFont">查询ID：</span>
-          <el-input class="el_input" placeholder="请输入查询ID" v-model="reqParam.contrastCustomSearchReq.qqid"></el-input>
+          <el-input
+            class="el_input"
+            placeholder="请输入查询ID"
+            v-model="reqParam.contrastCustomSearchReq.qqid"
+          ></el-input>
         </div>
         <div class="display_style">
           <span class="labelFont">任务号：</span>
-          <el-input class="el_input" placeholder="请输入任务号" v-model="reqParam.contrastCustomSearchReq.qid"></el-input>
+          <el-input
+            class="el_input"
+            placeholder="请输入任务号"
+            v-model="reqParam.contrastCustomSearchReq.qid"
+          ></el-input>
         </div>
-        <div class="display_style send_time" style="display: flex; align-items: center">
+        <div
+          class="display_style send_time"
+          style="display: flex; align-items: center"
+        >
           <span class="labelFont">发送时间：</span>
-          <el-date-picker v-model="startEndDate" style="display: flex; align-items: center" class="el_data_picker" type="daterange" range-separator="-" start-placeholder="开始时间" end-placeholder="结束时间" :picker-options="{
+          <el-date-picker
+            v-model="startEndDate"
+            style="display: flex; align-items: center"
+            class="el_data_picker"
+            type="daterange"
+            range-separator="-"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+            :picker-options="{
               disabledDate: disabledDate,
-            }">
+            }"
+          >
           </el-date-picker>
         </div>
         <div class="pRight">
-          <div class="clear_btn" @click="clearParams('yes')" :style="{ visibility: newStr ? '' : 'hidden' }">
+          <div
+            class="clear_btn"
+            @click="clearParams('yes')"
+            :style="{ visibility: newStr ? '' : 'hidden' }"
+          >
             清空
           </div>
-          <el-button type="primary" class="f-primary-button" @click="search">筛选
+          <el-button
+            type="primary"
+            class="f-primary-button"
+            @click="search"
+          >筛选
           </el-button>
         </div>
       </div>
       <div class="width100 margin_top24_bottom24 display_style">
         <div class="display_style prevent">
           <label class="btnLabel">查询类型：</label>
-          <div v-for="(btn, index) in queryTypeBtns" :key="index">
+          <div
+            v-for="(btn, index) in queryTypeBtns"
+            :key="index"
+          >
             <!--            <div-->
             <!--              class="btn"-->
             <!--              @click="getQueryType(btn, 'querytypes')"-->
@@ -51,7 +106,10 @@
             <!--                  : ''-->
             <!--              ]"-->
             <!--            >-->
-            <div class="btn1" @click="getQueryType(btn, 'querytypes')" :class="[
+            <div
+              class="btn1"
+              @click="getQueryType(btn, 'querytypes')"
+              :class="[
                 btn.value === '2'
                   ? 'btn-active-zc'
                   : btn.value === '3'
@@ -61,7 +119,8 @@
                   : btn.value === '0'
                   ? 'btn-active-cc'
                   : '',
-              ]">
+              ]"
+            >
               {{ btn.name }}
             </div>
           </div>
@@ -69,12 +128,19 @@
         <p class="shu"></p>
         <div class="display_style prevent">
           <label class="btnLabel">优先级：</label>
-          <div v-for="(btn, index) in queryClassBtns" :key="index">
-            <div class="btn" @click="getQueryType(btn, 'queryclasss')" :class="[
+          <div
+            v-for="(btn, index) in queryClassBtns"
+            :key="index"
+          >
+            <div
+              class="btn"
+              @click="getQueryType(btn, 'queryclasss')"
+              :class="[
                 reqParam.contrastCustomSearchReq.queryclasss.includes(btn.value)
                   ? 'btn-active'
                   : '',
-              ]">
+              ]"
+            >
               {{ btn.name }}
             </div>
           </div>
@@ -82,12 +148,19 @@
         <p class="shu"></p>
         <div class="display_style">
           <label class="btnLabel">是否远程：</label>
-          <div v-for="(btn, index) in remoteFlagBtns" :key="index">
-            <div class="btn" @click="getQueryType(btn, 'remoteflags')" :class="[
+          <div
+            v-for="(btn, index) in remoteFlagBtns"
+            :key="index"
+          >
+            <div
+              class="btn"
+              @click="getQueryType(btn, 'remoteflags')"
+              :class="[
                 reqParam.contrastCustomSearchReq.remoteflags.includes(btn.value)
                   ? 'btn-active'
                   : '',
-              ]">
+              ]"
+            >
               {{ btn.name }}
             </div>
           </div>
@@ -101,14 +174,24 @@
       <div class="width100 margin_top24_bottom24 display_style">
         <label class="width70 btnLabel">状态选择：</label>
         <!--          -1：无效；0：等待比对；1：正在比对；9：比对出错；10：比对完成（等待认定）；11：正在认定；19：认定出错；20：认定完成（等待复核）；21：正在复核；29：复核出错；30；复合完成；99：标记删除-->
-        <div class="btn" @click="allQueryType()">全部
+        <div
+          class="btn"
+          @click="allQueryType()"
+        >全部
         </div>
-        <div v-for="(btn, index) in queryStateBtns" :key="index">
-          <div class="btn" @click="getQueryType(btn, 'querystates')" :class="[
+        <div
+          v-for="(btn, index) in queryStateBtns"
+          :key="index"
+        >
+          <div
+            class="btn"
+            @click="getQueryType(btn, 'querystates')"
+            :class="[
               reqParam.contrastCustomSearchReq.querystates.includes(btn.value)
                 ? 'btn-active'
                 : '',
-            ]">
+            ]"
+          >
             {{ btn.name }}
           </div>
         </div>
@@ -117,7 +200,10 @@
     <div class="confirm_main">
       <div class="confirm_main_search margin0 width100">
         <div class="display_style style-one">
-          <el-button type="info" @click="batch">批量操作
+          <el-button
+            type="info"
+            @click="batch"
+          >批量操作
           </el-button>
           <div class="middle style-middle">
             <!-- <div class="font" @click="clearAll()">
@@ -125,14 +211,24 @@
                           <i class="iconfont icon-xiala"></i>
                         </div> -->
             <div class="el-tag-box">
-              <el-tag style="margin-right: 10px" :key="index" v-for="(tag, index) in dynamicTags" closable :disable-transitions="false" @close="handleClose(tag)">
+              <el-tag
+                style="margin-right: 10px"
+                :key="index"
+                v-for="(tag, index) in dynamicTags"
+                closable
+                :disable-transitions="false"
+                @close="handleClose(tag)"
+              >
                 {{ tag.name }}
               </el-tag>
             </div>
           </div>
         </div>
         <div class="display_style confirm_main_button">
-          <div class="rgrd" @click="$refs.recognitionDialog.open()">
+          <div
+            class="rgrd"
+            @click="$refs.recognitionDialog.open()"
+          >
             <!-- <img src="@/assets/img/person1.png" alt="" /> -->
             <i class="iconfont icon-rengongrending"></i>
             <span>人工认定</span>
@@ -141,9 +237,19 @@
           <div class="margin0">
             <el-dropdown trigger="click">
               <el-button type="info">自定义列</el-button>
-              <el-dropdown-menu slot="dropdown" class="el-dropdown-content-bg">
-                <el-checkbox-group v-model="checkedProps" @change="changeCheckbox">
-                  <el-checkbox v-for="(item, index) in defaultTableProps" :label="item.prop" :key="index">
+              <el-dropdown-menu
+                slot="dropdown"
+                class="el-dropdown-content-bg"
+              >
+                <el-checkbox-group
+                  v-model="checkedProps"
+                  @change="changeCheckbox"
+                >
+                  <el-checkbox
+                    v-for="(item, index) in defaultTableProps"
+                    :label="item.prop"
+                    :key="index"
+                  >
                     {{ item.colume }}
                   </el-checkbox>
                 </el-checkbox-group>
@@ -152,31 +258,76 @@
           </div>
           <!-- 自定义列 止 -->
           <!-- 复制条码号 起 -->
-          <el-button type="info" v-if="roleArr.includes('C-1-3')" v-clipboard:copy="barcode" @click="getBarcode" v-clipboard:success="onCopy" v-clipboard:error="onError">
+          <el-button
+            type="info"
+            v-if="roleArr.includes('C-1-3')"
+            v-clipboard:copy="barcode"
+            @click="getBarcode"
+            v-clipboard:success="onCopy"
+            v-clipboard:error="onError"
+          >
             复制条码
           </el-button>
           <!-- 复制条码号 止 -->
-          <el-button type="info" @click="delMore" v-if="roleArr.includes('C-1-4')">删除
+          <el-button
+            type="info"
+            @click="delMore"
+            v-if="roleArr.includes('C-1-4')"
+          >删除
           </el-button>
           <!--          <el-button>发查询</el-button>-->
         </div>
       </div>
-      <el-tag class="removeDia" style="width: 100%; color: #666666; margin-bottom: 0.5rem" v-show="isShowTip">
-        <i class="iconfont icon-tanhao1" style="color: #055fe7; font-size: 1rem; margin: 0 0.625rem"></i>
+      <el-tag
+        class="removeDia"
+        style="width: 100%; color: #666666; margin-bottom: 0.5rem"
+        v-show="isShowTip"
+      >
+        <i
+          class="iconfont icon-tanhao1"
+          style="color: #055fe7; font-size: 1rem; margin: 0 0.625rem"
+        ></i>
         已选择
         <span style="color: #055fe7">{{ selectionData.length }}</span> 项​
         <span v-html="'&nbsp;&nbsp;'"></span>
-        <el-link type="primary" :underline="false" :style="{
+        <el-link
+          type="primary"
+          :underline="false"
+          :style="{
             marginLeft: '1.25rem',
             color: selectionData.length > 0 ? '#055FE7' : '#C2C4C7',
-          }" @click="toggleSelection()">清除
+          }"
+          @click="toggleSelection()"
+        >清除
         </el-link>
       </el-tag>
       <div class="confirm_main_table">
-        <el-table style="width: 100%" :height="height" :border="false" @selection-change="handleSelectionChange" ref="confirmTable" tooltip-effect="dark" :data="list" :key="tableKey" :class="{ delSelection: !selectBoo }" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }" row-key="queryId" @row-click="confirm" @expand-change="hadnlExpandChange">
+        <el-table
+          style="width: 100%"
+          :height="height"
+          :border="false"
+          @selection-change="handleSelectionChange"
+          ref="confirmTable"
+          tooltip-effect="dark"
+          :data="list"
+          :key="tableKey"
+          :class="{ delSelection: !selectBoo }"
+          :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+          row-key="queryId"
+          @row-click="confirm"
+          @expand-change="hadnlExpandChange"
+        >
           <!-- @select-all="handleSelectAll" -->
-          <el-table-column type="selection" height width="auto"></el-table-column>
-          <el-table-column prop="" label="任务号/查询ID" :width="cxyrdWidth1">
+          <el-table-column
+            type="selection"
+            height
+            width="auto"
+          ></el-table-column>
+          <el-table-column
+            prop=""
+            label="任务号/查询ID"
+            :width="cxyrdWidth1"
+          >
             <template #header>
               <div class="tableHeader">
                 <span>任务号 </span>
@@ -184,47 +335,78 @@
               </div>
             </template>
             <template slot-scope="scope">
-              <svg-icon style="
+              <svg-icon
+                style="
                   width: 0.875rem;
                   height: 0.6875rem;
                   margin-bottom: 0.125rem;
                   margin-left: 0.3125rem;
-                " v-if="scope.row.children || scope.row.children === null" icon-class="tree_f">
+                "
+                v-if="scope.row.children || scope.row.children === null"
+                icon-class="tree_f"
+              >
               </svg-icon>
-              <svg-icon style="
+              <svg-icon
+                style="
                   width: 0.8125rem;
                   height: 0.375rem;
                   margin: 0 0 0.1875rem 0;
-                " v-else-if="!scope.row.children || scope.row.children !== null" icon-class="tree_c"></svg-icon>
+                "
+                v-else-if="!scope.row.children || scope.row.children !== null"
+                icon-class="tree_c"
+              ></svg-icon>
               {{
                             scope.row.children || scope.row.children === null
                             ? scope.row.qid
                             : scope.row.qqid
                             }}
-              <div v-show="scope.row.children && scope.row.children !== null" class="children-count">
+              <div
+                v-show="scope.row.children && scope.row.children !== null"
+                class="children-count"
+              >
                 {{ scope.row.children ? scope.row.children.length : 0 }}
               </div>
             </template>
           </el-table-column>
-          <el-table-column v-for="(item, index) in tableProps" show-overflow-tooltip :key="index" :label="item.colume" :prop="item.prop" :width="item.width" :sortable="
+          <el-table-column
+            v-for="(item, index) in tableProps"
+            show-overflow-tooltip
+            :key="index"
+            :label="item.colume"
+            :prop="item.prop"
+            :width="item.width"
+            :sortable="
               item.prop == 'affirmtime' ||
               item.prop == 'requestdatetime' ||
               item.prop == 'queryclass'
                 ? true
                 : false
-            ">
+            "
+          >
             <template slot-scope="scope">
               <template v-if="item.prop === 'querytype'">
-                <div v-if="scope.row.querytype === '3'" style="color: #055fe7">
+                <div
+                  v-if="scope.row.querytype === '3'"
+                  style="color: #055fe7"
+                >
                   {{ scope.row.queryTypeName }}
                 </div>
-                <div v-else-if="scope.row.querytype === '0'" style="color: #fa9500">
+                <div
+                  v-else-if="scope.row.querytype === '0'"
+                  style="color: #fa9500"
+                >
                   {{ scope.row.queryTypeName }}
                 </div>
-                <div v-else-if="scope.row.querytype === '1'" style="color: #e60012">
+                <div
+                  v-else-if="scope.row.querytype === '1'"
+                  style="color: #e60012"
+                >
                   {{ scope.row.queryTypeName }}
                 </div>
-                <div v-else-if="scope.row.querytype === '2'" style="color: #00b47a">
+                <div
+                  v-else-if="scope.row.querytype === '2'"
+                  style="color: #00b47a"
+                >
                   {{ scope.row.queryTypeName }}
                 </div>
                 <div v-else>
@@ -236,9 +418,16 @@
                   {{ scope.row.barcode }}
                   <!-- {{ scope.row.artificialAffirmFlag }} -->
                   <div v-if="scope.row.barcode && scope.row.artificialAffirmFlag !='1'">
-                    <img class="history" :src="historyUrl" @click.stop="getDialog(scope.row)" />
+                    <img
+                      class="history"
+                      :src="historyUrl"
+                      @click.stop="getDialog(scope.row)"
+                    />
                   </div>
-                  <div v-if="scope.row.barcode && scope.row.artificialAffirmFlag=='1'" class="rgbq">
+                  <div
+                    v-if="scope.row.barcode && scope.row.artificialAffirmFlag=='1'"
+                    class="rgbq"
+                  >
                     <p>人工</p>
                   </div>
                 </div>
@@ -268,30 +457,51 @@
                 {{ dataFormat(scope.row, item.prop) }}</template>
             </template>
           </el-table-column>
-          <el-table-column width="auto" label="操作" align="left">
+          <el-table-column
+            width="auto"
+            label="操作"
+            align="left"
+          >
             <template slot-scope="scope">
-              <Confirmation content="复制条码" v-if="scope.row.barcode && roleArr.includes('C-1-5')">
-                <img style="
+              <Confirmation
+                content="复制条码"
+                v-if="scope.row.barcode && roleArr.includes('C-1-5')"
+              >
+                <img
+                  style="
                     width: 1rem;
                     height: 1rem;
                     margin-right: 1.125rem;
                     cursor: pointer;
-                  " src="@/assets/img/qbryk/fz.svg" @click.stop="
+                  "
+                  src="@/assets/img/qbryk/fz.svg"
+                  @click.stop="
                     () => {
                       delSelect();
                       edit(scope.row);
                     }
-                  " />
+                  "
+                />
               </Confirmation>
               <div @click.stop="() => {}">
-                <Confirmation :ref="getPopConfirmRef(scope.$index)" v-if="scope.row.barcode && roleArr.includes('C-1-6')" @onConfirm="delOne(scope.row.qqid)" content="删除" :hintBoo="true">
+                <Confirmation
+                  :ref="getPopConfirmRef(scope.$index)"
+                  v-if="scope.row.barcode && roleArr.includes('C-1-6')"
+                  @onConfirm="delOne(scope.row.qqid)"
+                  content="删除"
+                  :hintBoo="true"
+                >
                   <div slot="reference">
-                    <img style="width: 1rem; height: 1rem; cursor: pointer" :src="delUrl" @click="
+                    <img
+                      style="width: 1rem; height: 1rem; cursor: pointer"
+                      :src="delUrl"
+                      @click="
                         () => {
                           clickCancle(scope.$index)
                           delSelect()
                         }
-                      " />
+                      "
+                    />
                   </div>
                 </Confirmation>
               </div>
@@ -304,16 +514,34 @@
       <span class="count">共{{ reqParam.page.total }} 条记录 第{{ reqParam.page.currPage }}/{{
           size
         }}页</span>
-      <el-pagination class="paging" background @size-change="handleSizeChange" @current-change="handleCurrPageChange" :current-page="reqParam.page.currPage" :page-sizes="[10, 20, 50, 100]" :page-size="reqParam.page.pageSize" layout="prev, pager, next" :total="reqParam.page.total">
+      <el-pagination
+        class="paging"
+        background
+        @size-change="handleSizeChange"
+        @current-change="handleCurrPageChange"
+        :current-page="reqParam.page.currPage"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="reqParam.page.pageSize"
+        layout="prev, pager, next"
+        :total="reqParam.page.total"
+      >
       </el-pagination>
     </div>
 
-    <el-dialog :visible.sync="historyDialogVisible" style="z-index: 1500">
+    <el-dialog
+      :visible.sync="historyDialogVisible"
+      style="z-index: 1500"
+    >
     </el-dialog>
 
     <recognitionDialog ref="recognitionDialog"></recognitionDialog>
 
-    <Fcxtj :isShowFcx="isShowFcx" :type="dialogType" ref="fcxtj" :dialogQid="dialogQid"></Fcxtj>
+    <Fcxtj
+      :isShowFcx="isShowFcx"
+      :type="dialogType"
+      ref="fcxtj"
+      :dialogQid="dialogQid"
+    ></Fcxtj>
   </el-container>
 </template>
 
@@ -1134,11 +1362,11 @@ const setQueryClass = [
 ]
 </script>
 <style scoped lang="scss">
-    .delSelection /deep/ .el-table-column--selection .cell {
+.delSelection /deep/ .el-table-column--selection .cell {
   display: none;
-    }
+}
 
-    /deep/ .el-pager {
+/deep/ .el-pager {
   .number {
     background-color: transparent !important;
   }
@@ -1153,27 +1381,27 @@ const setQueryClass = [
   .el-icon.more.btn-quickprev.el-icon-more {
     background-color: transparent !important;
   }
-    }
+}
 
-    /deep/ .btn-prev,
-    /deep/ .btn-next {
+/deep/ .btn-prev,
+/deep/ .btn-next {
   background-color: transparent !important;
-    }
+}
 
-    /deep/ .el-pagination__sizes {
+/deep/ .el-pagination__sizes {
   position: absolute;
   right: 0;
-    }
+}
 
-    /deep/ .btn-next {
+/deep/ .btn-next {
   //margin-right: 120px !important;
-    }
+}
 
-    .paging {
+.paging {
   float: right;
-    }
+}
 
-    .el-dropdown-menu {
+.el-dropdown-menu {
   width: 120px;
   /*height: 288px;*/
   .el-checkbox-group {
@@ -1188,117 +1416,116 @@ const setQueryClass = [
       }
     }
   }
-    }
+}
 </style>
 <style scoped>
-    .el-popper[x-placement^="bottom-end"] {
+.el-popper[x-placement^="bottom-end"] {
   border-style: none;
-    }
+}
 
-    .el-popper[x-placement^="bottom-end"] .popper__arrow::after {
+.el-popper[x-placement^="bottom-end"] .popper__arrow::after {
   border-style: none;
-    }
+}
 
-    .el-popper[x-placement^="bottom-end"] .popper__arrow {
+.el-popper[x-placement^="bottom-end"] .popper__arrow {
   border-style: none;
-    }
+}
 
-    .el-dropdown-content-bg {
+.el-dropdown-content-bg {
   transform: translate(23px, -8px);
-    }
+}
 </style>
 <style scoped lang="scss">
-    .width70 {
+.width70 {
   width: 70px !important;
   display: inline-block;
-    }
+}
 
-    // 滚动条的宽度
-    /deep/ .el-table__body-wrapper::-webkit-scrollbar {
+// 滚动条的宽度
+/deep/ .el-table__body-wrapper::-webkit-scrollbar {
   width: 6px; // 横向滚动条
   height: 6px; // 纵向滚动条 必写
-    }
+}
 
-    // 滚动条的滑块
-    /deep/ .el-table__body-wrapper::-webkit-scrollbar-thumb {
+// 滚动条的滑块
+/deep/ .el-table__body-wrapper::-webkit-scrollbar-thumb {
   background-color: #dadde0;
   border-radius: 3px;
-    }
+}
 
-    /deep/ .el-table th {
+/deep/ .el-table th {
   background-color: #f6f8fa;
   border: none;
-    }
+}
 
-    /deep/ .el-table td,
-    .el-table th.is-leaf {
+/deep/ .el-table td,
+.el-table th.is-leaf {
   background-color: #ffffff;
   border: none;
   border-bottom: 1px #f6f8fa solid;
   border-top: 1px #f6f8fa solid;
-    }
+}
 
-    // 表格最外边框
-    .el-table--border,
-    .el-table--group {
+// 表格最外边框
+.el-table--border,
+.el-table--group {
   border: none;
-    }
+}
 
-    /deep/ .el-popover {
+/deep/ .el-popover {
   padding: 15px 20px !important;
-    }
+}
 
-    /deep/ .el-popconfirm__action {
+/deep/ .el-popconfirm__action {
   display: flex;
   justify-content: center;
-    }
+}
 
-    /deep/ .el-popover.el-popper {
+/deep/ .el-popover.el-popper {
   background: #006aff;
-    }
+}
 
-    /deep/ .el-form-item__label {
+/deep/ .el-form-item__label {
   color: #333333;
-    }
+}
 
-    /deep/ .el-table th > .cell {
+/deep/ .el-table th > .cell {
   font-size: 14px;
   font-family: HarmonyOS_Sans_SC_Medium;
   font-weight: normal;
   color: #282f3c;
-    }
+}
 
-    /deep/ .el-table td > .cell {
+/deep/ .el-table td > .cell {
   font-size: 14px;
   font-family: HarmonyOS_Sans_SC;
   color: #333333;
-    }
+}
 
-    /deep/ .el-input__inner {
+/deep/ .el-input__inner {
   background: #ffffff;
   box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.03);
   border-radius: 4px;
   border: none;
-    }
+}
 
-    // 输入框选中样式
-    /deep/ .el-input.is-active .el-input__inner,
-    /deep/ .el-input__inner:focus {
+// 输入框选中样式
+/deep/ .el-input.is-active .el-input__inner,
+/deep/ .el-input__inner:focus {
   box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.08) !important;
   border-color: none !important;
   color: #055fe7;
-    }
-
+}
 
-    /deep/ .el-input.is-active .el-input__inner,
-    /deep/ .el-input__inner:hover {
+/deep/ .el-input.is-active .el-input__inner,
+/deep/ .el-input__inner:hover {
   box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.08) !important;
   border-color: none !important;
-    }
+}
 
-    // :focus-within能非常方便处理获取焦点状态。当元素本身或其后代元素获得焦点时，:focus-within伪类的元素就会有效
-    /deep/ .el-input.is-active .el-input__inner,
-    /deep/ .el-input__inner:focus-within {
+// :focus-within能非常方便处理获取焦点状态。当元素本身或其后代元素获得焦点时，:focus-within伪类的元素就会有效
+/deep/ .el-input.is-active .el-input__inner,
+/deep/ .el-input__inner:focus-within {
   box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.08) !important;
   border-color: none !important;
   color: #055fe7;
@@ -1306,22 +1533,22 @@ const setQueryClass = [
   .el-range-input {
     color: #055fe7;
   }
-    }
+}
 
-    /deep/ .el-input.is-active .el-input__inner,
-    /deep/ .el-input__inner:hover {
+/deep/ .el-input.is-active .el-input__inner,
+/deep/ .el-input__inner:hover {
   box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.08) !important;
   border-color: none !important;
-    }
+}
 
-    div {
+div {
   margin: 0;
   padding: 0;
   display: inline-block;
   /*border: none;*/
-    }
+}
 
-    .rgrd {
+.rgrd {
   display: flex !important;
   align-items: center;
   justify-content: center;
@@ -1341,31 +1568,31 @@ const setQueryClass = [
     line-height: 24px !important;
     color: #055fe7 !important;
   }
-    }
+}
 
-    hr {
+hr {
   background-color: #eeeeee;
   height: 1px;
   border: none;
   margin: 16px 0 16px 0;
-    }
+}
 
-    label {
+label {
   width: 70px;
   height: 22px;
   font-size: 14px;
   font-family: HarmonyOS_Sans_SC;
   color: #999999;
   line-height: 22px;
-    }
+}
 
-    i {
+i {
   height: 16px;
   width: 16px;
   margin: 0 9px 0 9px;
-    }
+}
 
-    b {
+b {
   width: 64px;
   height: 24px;
   font-size: 16px;
@@ -1373,15 +1600,15 @@ const setQueryClass = [
   font-weight: bold;
   color: #333333;
   line-height: 24px;
-    }
+}
 
-    .style-middle {
+.style-middle {
   display: flex !important;
   justify-content: flex-start;
   align-items: center;
-    }
+}
 
-    .font {
+.font {
   > span {
     cursor: pointer;
     font-size: 14px !important;
@@ -1412,17 +1639,17 @@ const setQueryClass = [
   line-height: 16px;
   margin: 0 6px 0 8px;
   cursor: pointer;
-    }
+}
 
-    .history {
+.history {
   width: 12px;
   height: 12px;
   margin-left: 4px;
   margin-bottom: 3px;
   cursor: pointer;
-    }
+}
 
-    .children-count {
+.children-count {
   width: 34px;
   height: 21px;
   font-size: 12px;
@@ -1432,43 +1659,43 @@ const setQueryClass = [
   border-radius: 11px;
   position: absolute;
   right: 10px;
-    }
+}
 
-    /deep/ .el-tag .el-icon-close::before {
+/deep/ .el-tag .el-icon-close::before {
   display: block;
   color: #fff;
-    }
+}
 
-    /deep/ .el-tag .el-icon-close {
+/deep/ .el-tag .el-icon-close {
   background-color: #b1b6c2;
   // right: 1px !important;
-    }
+}
 
-    .el-icon-arrow-down {
+.el-icon-arrow-down {
   color: #999999;
   border: #999999 1px solid;
   border-radius: 50%; /*边设置为圆形*/
   font-size: 12px;
-    }
+}
 
-    .el-button {
+.el-button {
   width: 72px;
   height: 32px;
   border-radius: 4px;
   margin: 0;
   padding: 0;
-    }
+}
 
-    .el-button__inner {
+.el-button__inner {
   width: 72px;
   height: 16px;
   font-size: 14px;
   font-family: HarmonyOS_Sans_SC;
   color: #2e3846;
   line-height: 16px;
-    }
+}
 
-    .el-tag {
+.el-tag {
   color: #055fe7 !important;
   height: 32px;
   box-sizing: border-box !important;
@@ -1476,10 +1703,9 @@ const setQueryClass = [
   background: #ddebff;
   border-radius: 4px;
   font-size: 0.75rem;
-    }
-
+}
 
-    .confirm-page {
+.confirm-page {
   width: 100%;
   padding: 20px 20px;
   font-family: MicrosoftYaHei;
@@ -1505,43 +1731,43 @@ const setQueryClass = [
       float: right;
     }
   }
-    }
+}
 
-    /deep/ .el-range-separator {
+/deep/ .el-range-separator {
   line-height: 24px !important;
-    }
+}
 
-    .prevent {
+.prevent {
   margin-right: 10px !important;
-    }
+}
 
-    .shu {
+.shu {
   display: inline-block;
   width: 1px;
   height: 12px;
   margin-right: 20px !important;
   background: #999999;
-    }
+}
 
-    .display_style {
+.display_style {
   display: inline-block;
   margin: 5px 24px 5px 0;
-    }
+}
 
-    /deep/ .el-button span {
+/deep/ .el-button span {
   cursor: pointer;
-    }
+}
 
-    .style-one {
+.style-one {
   display: flex !important;
-    }
+}
 
-    .margin_top24_bottom24 {
+.margin_top24_bottom24 {
   display: flex;
   align-items: center;
-    }
+}
 
-    .send_time {
+.send_time {
   display: flex;
   align-items: center;
 
@@ -1553,9 +1779,9 @@ const setQueryClass = [
     position: absolute;
     right: 6px;
   }
-    }
+}
 
-    .display_style span {
+.display_style span {
   height: 24px;
   font-size: 14px;
   font-family: HarmonyOS_Sans_SC;
@@ -1563,51 +1789,51 @@ const setQueryClass = [
   line-height: 20px;
   margin: 0;
   padding: 0;
-    }
+}
 
-    .el_select {
+.el_select {
   width: 168px;
   height: 32px;
   background: #ffffff;
   border-radius: 4px;
   // border: 1px solid #e6e6e8;
-    }
+}
 
-    /deep/ .el-input__icon {
+/deep/ .el-input__icon {
   line-height: 32px !important;
-    }
+}
 
-    .el_data_picker {
+.el_data_picker {
   width: 256px;
   height: 32px;
   background: #ffffff;
   border-radius: 4px;
   border: 1px solid #e6e6e8;
-    }
+}
 
-    .el_input {
+.el_input {
   width: 168px;
   height: 32px;
   background: #ffffff;
   border-radius: 4px;
   // border: 1px solid #e6e6e8;
-    }
+}
 
-    .tmh {
+.tmh {
   width: 300px;
-    }
+}
 
-    /deep/ .el-input__inner {
+/deep/ .el-input__inner {
   height: 32px !important;
-    }
+}
 
-    .btnLabel {
+.btnLabel {
   font-family: HarmonyOS_Sans_SC_Medium;
   color: #282f3c;
   font-size: 14px;
-    }
+}
 
-    .btn {
+.btn {
   width: fit-content;
   display: flex;
   align-items: center;
@@ -1621,17 +1847,17 @@ const setQueryClass = [
   font-weight: 350;
   color: #666666;
   cursor: pointer;
-    }
+}
 
-    .btn:hover {
+.btn:hover {
   color: #055fe7;
-    }
+}
 
-    .btn-active {
+.btn-active {
   color: #055fe7;
-    }
+}
 
-    .btn1 {
+.btn1 {
   width: fit-content;
   display: flex;
   align-items: center;
@@ -1644,29 +1870,29 @@ const setQueryClass = [
   font-size: 14px;
   font-weight: 350;
   cursor: pointer;
-    }
+}
 
-    .btn1:hover {
+.btn1:hover {
   font-weight: bolder;
-    }
+}
 
-    .btn-active-zc {
+.btn-active-zc {
   color: #00b47a;
-    }
+}
 
-    .btn-active-dc {
+.btn-active-dc {
   color: #e60012;
-    }
+}
 
-    .btn-active-cc {
+.btn-active-cc {
   color: #fa9500;
-    }
+}
 
-    .btn-active-ca {
+.btn-active-ca {
   color: #055fe7;
-    }
+}
 
-    .clear_btn {
+.clear_btn {
   width: fit-content;
   font-family: HarmonyOS_Sans_SC;
   border: none;
@@ -1686,18 +1912,18 @@ const setQueryClass = [
   &:active {
     color: #055fe7;
   }
-    }
+}
 
-    .el-button--primary {
+.el-button--primary {
   width: 72px;
   height: 32px;
   line-height: 22px;
   padding: 0;
   background: #055fe7;
   border-radius: 4px;
-    }
+}
 
-    .el-checkbox-button__inner {
+.el-checkbox-button__inner {
   width: 56px;
   height: 22px;
   font-size: 14px;
@@ -1706,15 +1932,15 @@ const setQueryClass = [
   line-height: 22px;
   -webkit-background-clip: text;
   -webkit-text-fill-color: transparent;
-    }
+}
 
-    .confirm_main_button {
+.confirm_main_button {
   .el-button--info {
     margin-right: 0;
   }
-    }
+}
 
-    .el-button--info {
+.el-button--info {
   width: 96px;
   height: 32px;
   font-weight: 350;
@@ -1723,39 +1949,39 @@ const setQueryClass = [
   border: 1px solid #aeb5c2;
   border-radius: 4px;
   margin: 0 8px 0 8px;
-    }
+}
 
-    .el-button--info:hover {
+.el-button--info:hover {
   border: 1px solid #055fe7;
   color: #055fe7;
-    }
+}
 
-    .el-button--info:active {
+.el-button--info:active {
   border: 1px solid #044cb9;
   color: #044cb9;
-    }
+}
 
-    /deep/ .el-checkbox__input.is-checked .el-checkbox__inner,
-    .el-checkbox__input.is-indeterminate .el-checkbox__inner {
+/deep/ .el-checkbox__input.is-checked .el-checkbox__inner,
+.el-checkbox__input.is-indeterminate .el-checkbox__inner {
   background-color: #055fe7 !important;
   border: 1px solid #055fe7 !important;
-    }
+}
 
-    /deep/ .el-checkbox__inner:hover {
+/deep/ .el-checkbox__inner:hover {
   border-color: #055fe7;
   /*background: #f5f5f7;*/
-    }
+}
 
-    /deep/ .el-checkbox__input + .el-checkbox__label {
+/deep/ .el-checkbox__input + .el-checkbox__label {
   color: #333333;
   font-size: 14px;
-    }
+}
 
-    /deep/ .el-checkbox__input.is-focus .el-checkbox__inner {
+/deep/ .el-checkbox__input.is-focus .el-checkbox__inner {
   border-color: #055fe7 !important;
-    }
+}
 
-    .confirm_main_search {
+.confirm_main_search {
   width: 100%;
   height: 34px;
   margin-bottom: 10px;
@@ -1771,27 +1997,27 @@ const setQueryClass = [
       }
     }
   }
-    }
+}
 
-    .confirm_main_button {
+.confirm_main_button {
   position: absolute;
   right: 0px;
-    }
+}
 
-    .el-table /deep/ {
+.el-table /deep/ {
   td.el-table__cell,
   th.el-table__cell.is-leaf {
     border-bottom: none;
   }
-    }
+}
 
-    .labelFont {
+.labelFont {
   font-size: 14px !important;
   font-family: HarmonyOS_Sans_SC !important;
   color: #333333 !important;
-    }
+}
 
-    .confirm_header_search {
+.confirm_header_search {
   width: 100%;
   padding: 20px 20px;
   background: #f6f8fa;
@@ -1805,16 +2031,16 @@ const setQueryClass = [
     border-radius: 4px;
     border: none;
   }
-    }
+}
 
-    .confirm_main {
+.confirm_main {
   width: 100%;
   // height: 60px;
   height: 620px;
   border-bottom: 1px solid #eeeeee;
-    }
+}
 
-    .confirm_main_table {
+.confirm_main_table {
   margin: 6px 0 15px 0;
   padding: 0;
   width: 100%;
@@ -1823,75 +2049,75 @@ const setQueryClass = [
   .mineral-table {
     // height: 450px;
   }
-    }
+}
 
-    /deep/ .el-table td,
-    .el-table th.is-leaf {
+/deep/ .el-table td,
+.el-table th.is-leaf {
   background-color: #ffffff;
   border: none;
   // border-bottom: 1px #f6f8fa solid;
   border-top: 1px #eeeeee solid;
-    }
+}
 
-    // 去除table表格最底部边框
-    .el-table__row > td {
+// 去除table表格最底部边框
+.el-table__row > td {
   border: none;
-    }
+}
 
-    // 去除table表格最底部边框
-    .el-table::before {
+// 去除table表格最底部边框
+.el-table::before {
   height: 0px;
-    }
+}
 
-    /deep/ .el-table .el-table__header-wrapper tr th {
+/deep/ .el-table .el-table__header-wrapper tr th {
   background-color: #ecf1f7 !important;
   font-size: 14px !important;
   font-family: HarmonyOS_Sans_SC_Medium !important;
   color: #282f3c !important;
   height: 48px !important;
   padding: 0 !important;
-    }
+}
 
-    /deep/ .el-table .el-table__body tr.current-row > td {
+/deep/ .el-table .el-table__body tr.current-row > td {
   background-color: #f2f7fe !important;
-    }
+}
 
-    /deep/ .el-table .el-table__body tr:hover > td {
+/deep/ .el-table .el-table__body tr:hover > td {
   background-color: #f2f7fe !important;
-    }
+}
 
-    /deep/ .el-table__row {
+/deep/ .el-table__row {
   height: 48px !important;
-    }
+}
 
-    /deep/ .el-table__row--level-1 {
+/deep/ .el-table__row--level-1 {
   .el-table__cell {
     background-color: #f5f6f7 !important;
   }
-    }
+}
 
-    /deep/ .el-table th > .cell {
+/deep/ .el-table th > .cell {
   font-family: HarmonyOS_Sans_SC_Medium;
-    }
+}
 
-    /deep/ .el-table .el-table__cell {
+/deep/ .el-table .el-table__cell {
   padding: 0 !important;
-    }
+}
 
-    /deep/ .el-table__body {
+/deep/ .el-table__body {
   width: 100% !important;
-    }
+}
 
-    // el-table 左侧固定 样式统一
-    /deep/ .el-table__fixed {
+// el-table 左侧固定 样式统一
+/deep/ .el-table__fixed {
   height: 100% !important;
 
   &::before {
     height: 0;
   }
-    }
+}
 
-    /deep/ .el-table__fixed-header-wrapper {
+/deep/ .el-table__fixed-header-wrapper {
   height: 48px !important;
 
   .el-table__header {
@@ -1919,24 +2145,24 @@ const setQueryClass = [
     border: none !important;
     background-color: #ecf1f7 !important;
   }
-    }
+}
 
-    /deep/ .hover-row {
+/deep/ .hover-row {
   .el-table__cell {
     background-color: #f2f7fe !important;
   }
-    }
+}
 
-    /deep/ .el-table__fixed-right {
+/deep/ .el-table__fixed-right {
   height: 100% !important;
 
   &::before {
     height: 0;
   }
-    }
+}
 
-    // 批量操作
-    .el-tag {
+// 批量操作
+.el-tag {
   color: #055fe7 !important;
   height: 32px;
   box-sizing: border-box !important;
@@ -1947,34 +2173,34 @@ const setQueryClass = [
   margin-bottom: 16px;
   display: flex;
   align-items: center;
-    }
+}
 
-    /deep/ .el-link--inner {
+/deep/ .el-link--inner {
   color: rgb(5, 95, 231);
-    }
+}
 
-    .icon-tanhao1 {
+.icon-tanhao1 {
   display: flex;
   justify-content: center;
   align-items: center;
-    }
+}
 
-    // 表格高度 -- 展示下面的border
-    .split-line {
+// 表格高度 -- 展示下面的border
+.split-line {
   height: 650px;
   border-bottom: 1px solid #eeeeee;
-    }
+}
 
-    // 复选框
-    /deep/ .el-checkbox__inner {
+// 复选框
+/deep/ .el-checkbox__inner {
   cursor: pointer;
-    }
+}
 
-    /deep/ .el-checkbox__input {
+/deep/ .el-checkbox__input {
   line-height: 16px;
-    }
+}
 
-    .search {
+.search {
   /deep/ .el-input__inner {
     background: #ffffff;
     box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.03);
@@ -2013,50 +2239,50 @@ const setQueryClass = [
     box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.08);
     border-color: none;
   }
-    }
+}
 
-    /deep/ .el-input__inner:hover {
+/deep/ .el-input__inner:hover {
   cursor: text;
-    }
+}
 
-    // @import "@/assets/css/globalBase.scss";
+// @import "@/assets/css/globalBase.scss";
 </style>
 <!--table树-->
 <style scoped lang="scss">
-    .el-select-dropdown__item.selected {
+.el-select-dropdown__item.selected {
   color: #006aff;
-    }
+}
 
-    .tableHeader {
+.tableHeader {
   > span {
     &:last-of-type {
       color: #999;
       font-size: 12px;
     }
   }
-    }
+}
 
-    .rgbq {
+.rgbq {
   padding: 0 5px;
   width: 32px;
   background: #ddebff;
   border-radius: 2px;
   font-size: 12px;
   color: #055fe7;
-    }
+}
 
-    .pRight {
+.pRight {
   position: absolute;
   right: 0;
   top: 50%;
   transform: translateY(-50%);
-    }
+}
 
-    .removeDia {
+.removeDia {
   //width: 1600px !important;
-    }
+}
 
-    .el-table {
+.el-table {
   /deep/ .el-checkbox {
     .is-indeterminate {
       .el-checkbox__inner {
@@ -2065,25 +2291,25 @@ const setQueryClass = [
       }
     }
   }
-    }
+}
 
-    .el-tree /deep/ .el-tree-node__expand-icon.expanded {
+.el-tree /deep/ .el-tree-node__expand-icon.expanded {
   -webkit-transform: rotate(0deg);
   transform: rotate(0deg);
-    }
+}
 
-    /*有子节点 且未展开*/
-    .el-table /deep/ .el-icon-arrow-right:before {
+/*有子节点 且未展开*/
+.el-table /deep/ .el-icon-arrow-right:before {
   content: "";
   display: block;
   width: 16px;
   height: 16px;
   font-size: 16px;
   background-size: 16px;
-    }
+}
 
-    /*有子节点 且已展开*/
-    .el-table /deep/ .el-table__expand-icon--expanded {
+/*有子节点 且已展开*/
+.el-table /deep/ .el-table__expand-icon--expanded {
   .el-icon-arrow-right:before {
     content: "";
     display: block;
@@ -2092,10 +2318,10 @@ const setQueryClass = [
     font-size: 18px;
     background-size: 21px;
   }
-    }
+}
 
-    /*没有子节点*/
-    .el-tree
+/*没有子节点*/
+.el-tree
   /deep/
   .el-tree-node__expand-icon.is-leaf::before
   .el-table
@@ -2107,46 +2333,46 @@ const setQueryClass = [
   height: 18px;
   font-size: 16px;
   background-size: 16px;
-    }
+}
 
-    /deep/ .el-table--enable-row-hover .el-table__body tr:hover {
+/deep/ .el-table--enable-row-hover .el-table__body tr:hover {
   cursor: pointer;
-    }
+}
 </style>
 <style lang="scss">
-    .el-tag-box {
+.el-tag-box {
   // width: 930px;
   display: flex !important;
   text-align: left;
   white-space: nowrap;
   width: 1070px;
   overflow: auto;
-    }
+}
 
-    /* 设置滚动条的样式 */
-    ::-webkit-scrollbar {
+/* 设置滚动条的样式 */
+::-webkit-scrollbar {
   width: 6px;
   height: 6px;
-    }
+}
 
-    /* 滚动槽 */
-    ::-webkit-scrollbar-track {
+/* 滚动槽 */
+::-webkit-scrollbar-track {
   -webkit-box-shadow: inset006pxrgba(0, 0, 0, 0.3);
   border-radius: 6px;
-    }
+}
 
-    /* 滚动条滑块 */
-    ::-webkit-scrollbar-thumb {
+/* 滚动条滑块 */
+::-webkit-scrollbar-thumb {
   border-radius: 6px;
   background: #dadde0;
   -webkit-box-shadow: inset006pxrgba(0, 0, 0, 0.5);
-    }
+}
 
-    ::-webkit-scrollbar-thumb:window-inactive {
+::-webkit-scrollbar-thumb:window-inactive {
   background: #dadde0;
-    }
+}
 
-    .el-table__expand-icon {
+.el-table__expand-icon {
   .el-icon-arrow-right {
     cursor: pointer !important;
   }
@@ -2165,9 +2391,9 @@ const setQueryClass = [
   background-position: center;
   background-size: 11px;
   background-repeat: no-repeat;
-    }
+}
 
-    .el-table__expand-icon.el-table__expand-icon--expanded {
+.el-table__expand-icon.el-table__expand-icon--expanded {
   width: 11px;
   height: 11px;
   background-image: url("../../assets/img/confirm/shrink.png");
@@ -2175,11 +2401,11 @@ const setQueryClass = [
   background-size: 11px;
   background-repeat: no-repeat;
   transform: rotate(180deg) !important;
-    }
-    // 修改下拉框样式
-    .el-select-dropdown__item {
+}
+// 修改下拉框样式
+.el-select-dropdown__item {
   padding-left: 20px;
-    }
+}
 </style>
 <style scoped lang="scss">
   /deep/ .el-table .el-table__body tr.current-row > td {

src/views/cxyrd/modules/LLCandidate.vue

@@ -154,7 +154,11 @@ export default {
       //目标表格点击
       targetBh: "",
       // 表格的索引
-      tableIndex: null
+      tableIndex: null,
+      // 源条码号
+      barcode_source: '',
+      // 源指位号
+      seq_source: ''
     };
   },
   created () {
@@ -188,6 +192,8 @@ export default {
           msg: null,
           delTime: null,
         });
+        // 传递目标数据 -- 目标条码号，目标指位号
+        self.$bus.emit('target_info', {barcode_source: self.barcode_source, seq_source: self.seq_source, barcode_target: '', seq_target: ''})
         return;
       }
       // 默认选中第一条数据
@@ -199,8 +205,16 @@ export default {
     });
   },
   mounted () {
+    let self = this
     // 监听键盘事件
     this.keyDown()
+
+    // 获取传递过来的 源条码号，源指位号
+    this.$bus.on('source_info', (source_info) => {
+      console.log(source_info);
+      self.barcode_source = source_info.barcode_source
+      self.seq_source = source_info.seq_source
+    })
   },
   methods: {
     /**
@@ -1094,6 +1108,8 @@ export default {
       this.$emit("targetObj", val);
       this.targetBh = val.destbarcode;
       let self = this;
+      // 传递目标数据 -- 目标条码号，目标指位号
+      self.$bus.emit('target_info', {barcode_source: self.barcode_source, seq_source: self.seq_source, barcode_target: val.destbarcode, seq_target: val.destseqno})
       if (val.removeFlag == "1") {
         // 存储目标条码号
         sessionStorage.setItem("destbarcode", val.destbarcode);
@@ -1208,6 +1224,12 @@ export default {
       //console.info(val);
     },
   },
+  beforeDestroy () {
+    this.$bus.off("changImageEditTarget");
+    this.$bus.off("targetDeleteMessage");
+    this.$bus.off('target_info')
+    this.$bus.off('bzJudgeTL')
+  },
   watch: {
     checked (newValue, oldValue) {
       if (newValue) {

src/views/cxyrd/modules/LLSrc.vue

@@ -416,6 +416,7 @@ export default {
         let barcode = val.barcode;
         // 存储原条码号
         sessionStorage.setItem("srcbarcode", barcode);
+        self.barcode = barcode
         //console.log(barcode);
         self.$axios
           .post("/api/org/case/barcode", {
@@ -542,6 +543,8 @@ export default {
         self.timer = setTimeout(() => {
           self.$store.commit("loading/setLoading", false);
         }, 500);
+        // 传递源数据 -- 源条码号，源指位号
+        self.$bus.emit('source_info', {barcode_source: self.barcode, seq_source: imageInfo.seq})
       } else {
         this.$bus.emit("changImageEdit", "xxx");
         this.$bus.emit("changImageEditTarget", "xxx");
@@ -626,6 +629,7 @@ export default {
   beforeDestroy() {
     //组件销毁前需要解绑事件。否则会出现重复触发事件的问题
     this.$bus.off("updateFinderSource");
+    this.$bus.off('source_info')
   },
 };
 // 某任务下查询的所有信息

src/views/cxyrd/modules/LTCandidate.vue

@@ -326,7 +326,11 @@ export default {
       isDelete: false,
       // 搜索类型
       searchType: '指纹',
-      tableIndex: null
+      tableIndex: null,
+      // 源条码号
+      barcode_source: '',
+      // 源指位号
+      seq_source: ''
     };
   },
   mounted () {
@@ -339,6 +343,13 @@ export default {
       self.isShowOptions = false
     })
     this.keyDown()
+
+    // 获取传递过来的 源条码号，源指位号
+    this.$bus.on('source_info', (source_info) => {
+      console.log(source_info);
+      self.barcode_source = source_info.barcode_source
+      self.seq_source = source_info.seq_source
+    })
   },
   created () {
     let self = this;
@@ -374,12 +385,15 @@ export default {
       } else {
         self.$bus.emit("bzJudge", null);
         this.$bus.emit("changImageEditTarget", "xxx");
+        // 传递目标数据 -- 目标条码号，目标指位号
+        self.$bus.emit('target_info', {barcode_source: self.barcode_source, seq_source: self.seq_source, barcode_target: '', seq_target: ''})
       }
     });
   },
   beforeDestroy () {
     this.$bus.off("deleteMessage");
     this.$bus.off("initCandidate");
+    this.$bus.off('target_info')
   },
   methods: {
     /**
@@ -1323,6 +1337,9 @@ export default {
       // 传递当前行的数据，判断是否被比中，如比中就不会弹窗比中
       this.$bus.emit("bzJudge", val);
       if (val != null) {
+        // 传递目标数据 -- 目标条码号，目标指位号
+        self.$bus.emit('target_info', {barcode_source: self.barcode_source, seq_source: self.seq_source, barcode_target: val.destbarcode, seq_target: val.destseqno})
+
         if (val.removeFlag == 1) {
           self.$bus.emit("targetDeleteMessage", {
             msg: "该条数据已删除！",

src/views/cxyrd/modules/LTSrc.vue

@@ -497,7 +497,7 @@ export default {
       let self = this;
       // this.isActive = index;
       this.isActive = imageInfo.seq;
-      //console.log(this.isActive);
+      // console.log(this.isActive);
       // 存储源数据序号
       if (imageInfo) {
         // 改变数据为点击状态
@@ -524,6 +524,8 @@ export default {
             self.$bus.emit("initCandidate", []);
           }
         });
+        // 传递源数据 -- 源条码号，源指位号
+        self.$bus.emit('source_info', {barcode_source: self.barcode, seq_source: imageInfo.seq})
       } else {
         this.$bus.emit("changImageEdit", "xxx");
         this.$bus.emit("changImageEditTarget", "xxx");
@@ -607,6 +609,7 @@ export default {
   beforeDestroy () {
     //组件销毁前需要解绑事件。否则会出现重复触发事件的问题
     this.$bus.off("updateFinderSource");
+    this.$bus.off('source_info')
   },
 };
 // 某任务下查询的所有信息

src/views/cxyrd/modules/TLCandidate.vue

@@ -75,7 +75,11 @@ export default {
       isDelete: false,
       searchType: '指纹',
       // 表格的索引
-      tableIndex: null
+      tableIndex: null,
+      // 源条码号
+      barcode_source: '',
+      // 源指位号
+      seq_source: ''
     };
   },
   created () {
@@ -114,6 +118,8 @@ export default {
           }
         });
       } else {
+        // 传递目标数据 -- 目标条码号，目标指位号
+        self.$bus.emit('target_info', {barcode_source: self.barcode_source, seq_source: self.seq_source, barcode_target: '', seq_target: ''})
         self.tableIndex = null
         self.$bus.emit('bzJudgeTL', null)
         if (self.isDelete) {
@@ -130,6 +136,16 @@ export default {
     });
     // 监听键盘事件
     this.keyDown()
+
+    // 获取传递过来的 源条码号，源指位号
+    this.$bus.on('source_info', (source_info) => {
+      console.log(source_info);
+      self.barcode_source = source_info.barcode_source
+      self.seq_source = source_info.seq_source
+      if(!source_info.barcode_source) {
+        self.$bus.emit('target_info', {barcode_source: '', seq_source: '', barcode_target: '', seq_target: ''})
+      }
+    })
   },
   methods: {
     /**
@@ -220,6 +236,8 @@ export default {
       let self = this;
       console.log(val);
       if (val != null) {
+        // 传递目标数据 -- 目标条码号，目标指位号
+        self.$bus.emit('target_info', {barcode_source: self.barcode_source, seq_source: self.seq_source, barcode_target: val.destbarcode, seq_target: val.destseqno})
         if (val.removeFlag == 1) {
           self.$bus.emit('targetDeleteMessage', {
             msg: '该条数据已删除！',
@@ -370,6 +388,7 @@ export default {
     this.$bus.off('initTLCandidate')
     this.$bus.off('deleteMessage')
     this.$bus.off('updateTLSourceData')
+    this.$bus.off('target_info')
   },
 };
 </script>

src/views/cxyrd/modules/TLSrc.vue

@@ -524,7 +524,10 @@ export default {
       if (this.hand) {
         this.changeStyleHand(0, this.hand)
       } else {
+        // 传递源数据 -- 源条码号，源指位号
+        self.$bus.emit('source_info', {barcode_source: '', seq_source: ''})
         this.$bus.emit('changImageEdit', 'xxx')
+        this.$bus.emit('changImageEditTarget', 'xxx')
       }
     },
     /**
@@ -603,6 +606,7 @@ export default {
     async handleCurrentChange (val, old) {
       let self = this;
       if (val != null) {
+        self.barcode = val.barcode
         // 发送请求
         // self.$store.commit('loading/setLoadingSd', true)
         // 被删除
@@ -1326,6 +1330,8 @@ export default {
     changeStyleHand (index, imageInfo) {
       let self = this
       if (imageInfo.image) {
+        // 传递源数据 -- 源条码号，源指位号
+        self.$bus.emit('source_info', {barcode_source: self.barcode, seq_source: imageInfo.code})
         // 改变数据为点击状态
         self.$set(imageInfo, "clickLog", "1");
         this.isActive = imageInfo.code;
@@ -1375,6 +1381,8 @@ export default {
       let self = this;
       // 如果图片存在
       if (imageInfo.image) {
+        // 传递源数据 -- 源条码号，源指位号
+        self.$bus.emit('source_info', {barcode_source: self.barcode, seq_source: imageInfo.code})
         // 改变数据为点击状态
         self.$set(imageInfo, "clickLog", "1");
         this.isActive = imageInfo.code;
@@ -1443,6 +1451,8 @@ export default {
       let self = this;
 
       if (imageInfo.image) {
+        // 传递源数据 -- 源条码号，源指位号
+        self.$bus.emit('source_info', {barcode_source: self.barcode, seq_source: imageInfo.code})
         // 改变数据为点击状态
         self.$set(imageInfo, "clickLog", "1");
         this.isActive = imageInfo.code;
@@ -1504,6 +1514,8 @@ export default {
       const source = CancelToken.source();
       let self = this;
       if (imageInfo.image) {
+        // 传递源数据 -- 源条码号，源指位号
+        self.$bus.emit('source_info', {barcode_source: self.barcode, seq_source: imageInfo.code})
         // 改变数据为点击状态
         self.$set(imageInfo, "clickLog", "1");
         this.isActive = imageInfo.code;
@@ -1565,6 +1577,8 @@ export default {
       //console.log(imageInfo);
       let self = this;
       if (imageInfo.image) {
+        // 传递源数据 -- 源条码号，源指位号
+        self.$bus.emit('source_info', {barcode_source: self.barcode, seq_source: imageInfo.code})
         // 改变数据为点击状态
         self.$set(imageInfo, "clickLog", "1");
         this.isActive = imageInfo.code;

src/views/cxyrd/modules/TTFace.vue

@@ -247,6 +247,9 @@ export default {
     scouceCode(val) {
       // var val = "Rmmmmmmmmmmmmmmmmmmmmmm";
       let self = this;
+      for(let key in self.souceGets) {
+        self.souceGets[key] = ''
+      }
       this.loadingIndex++;
       this.$emit("loadingIndex", true);
       this.$axios
@@ -275,6 +278,9 @@ export default {
       let self = this;
       this.loadingIndex++;
       this.$emit("loadingIndex", true);
+      for(let key in self.targetGets) {
+        self.targetGets[key] = ''
+      }
       this.$axios
         .post("/api/org/face/barcode", { barcode: val })
         .then((res) => {

src/views/rgrd/modules/LLCandidate.vue

@@ -118,7 +118,11 @@ export default {
       //目标表格点击
       targetBh: "",
       // 表格的索引
-      tableIndex: null
+      tableIndex: null,
+      // 源条码号
+      barcode_source: '',
+      // 源指位号
+      seq_source: ''
     };
   },
   created() {
@@ -152,6 +156,8 @@ export default {
           msg: null,
           delTime: null,
         });
+        // 传递目标数据 -- 目标条码号，目标指位号
+        self.$bus.emit('target_info', {barcode_source: self.barcode_source, seq_source: self.seq_source, barcode_target: '', seq_target: ''})
         return;
       }
       // 默认选中第一条数据
@@ -163,8 +169,16 @@ export default {
     });
   },
   mounted () {
+    let self = this
     // 监听键盘事件
     this.keyDown()
+
+    // 获取传递过来的 源条码号，源指位号
+    this.$bus.on('source_info', (source_info) => {
+      console.log(source_info);
+      self.barcode_source = source_info.barcode_source
+      self.seq_source = source_info.seq_source
+    })
   },
   methods: {
     /**
@@ -1053,11 +1067,13 @@ export default {
      * @return {*}
      */
     handleCurrentChange(val, old) {
+      let self = this
       if (!val) return;
       if (this.isDelete) return;
       this.$emit("targetObj", val);
       this.targetBh = val.destbarcode;
-      let self = this;
+      // 传递目标数据 -- 目标条码号，目标指位号
+      self.$bus.emit('target_info', {barcode_source: self.barcode_source, seq_source: self.seq_source, barcode_target: val.destbarcode, seq_target: val.destseqno})
       if (val.removeFlag == "1") {
         // 存储目标条码号
         sessionStorage.setItem("destbarcode", val.destbarcode);
@@ -1163,6 +1179,12 @@ export default {
       //console.info(val);
     },
   },
+  beforeDestroy () {
+    this.$bus.off("changImageEditTarget");
+    this.$bus.off("targetDeleteMessage");
+    this.$bus.off('target_info')
+    this.$bus.off('bzJudgeTL')
+  },
   watch: {
     checked(newValue, oldValue) {
       if (newValue) {

src/views/rgrd/modules/LLSrc.vue

@@ -399,6 +399,7 @@ export default {
         sessionStorage.setItem("qqid", self.qqid);
         sessionStorage.setItem("qid", self.qid);
         let barcode = val.barcode;
+        self.barcode = barcode
         // 存储原条码号
         sessionStorage.setItem("srcbarcode", barcode);
         //console.log(barcode);
@@ -529,6 +530,8 @@ export default {
         self.timer = setTimeout(() => {
           self.$store.commit("loading/setLoading", false);
         }, 500);
+        // 传递源数据 -- 源条码号，源指位号
+        self.$bus.emit('source_info', {barcode_source: self.barcode, seq_source: imageInfo.seq})
       } else {
         this.$bus.emit("changImageEdit", "xxx");
         this.$bus.emit("changImageEditTarget", "xxx");
@@ -599,6 +602,7 @@ export default {
   beforeDestroy() {
     //组件销毁前需要解绑事件。否则会出现重复触发事件的问题
     this.$bus.off("updateFinderSource");
+    this.$bus.off('source_info')
   },
 };
 // 某任务下查询的所有信息

src/views/rgrd/modules/LTCandidate.vue

@@ -281,7 +281,11 @@ export default {
       isDelete: false,
       // 搜索类型
       searchType: "指纹",
-      tableIndex: null
+      tableIndex: null,
+      // 源条码号
+      barcode_source: '',
+      // 源指位号
+      seq_source: ''
     };
   },
   mounted () {
@@ -291,6 +295,12 @@ export default {
       self.searchType = type;
     });
     this.keyDown()
+    // 获取传递过来的 源条码号，源指位号
+    this.$bus.on('source_info', (source_info) => {
+      console.log(source_info);
+      self.barcode_source = source_info.barcode_source
+      self.seq_source = source_info.seq_source
+    })
   },
   created () {
     let self = this;
@@ -326,12 +336,15 @@ export default {
       } else {
         self.$bus.emit("bzJudge", null);
         this.$bus.emit("changImageEditTarget", "xxx");
+        // 传递目标数据 -- 目标条码号，目标指位号
+        self.$bus.emit('target_info', {barcode_source: self.barcode_source, seq_source: self.seq_source, barcode_target: '', seq_target: ''})
       }
     });
   },
   beforeDestroy () {
     this.$bus.off("deleteMessage");
     this.$bus.off("initCandidate");
+    this.$bus.off('target_info')
   },
   methods: {
     /**
@@ -1189,6 +1202,8 @@ export default {
       // 传递当前行的数据，判断是否被比中，如比中就不会弹窗比中
       this.$bus.emit("bzJudge", val);
       if (val != null) {
+        // 传递目标数据 -- 目标条码号，目标指位号
+        self.$bus.emit('target_info', {barcode_source: self.barcode_source, seq_source: self.seq_source, barcode_target: val.destbarcode, seq_target: val.destseqno})
         if (val.removeFlag == 1) {
           self.$bus.emit("targetDeleteMessage", {
             msg: "该条数据已删除！",

src/views/rgrd/modules/LTSrc.vue

@@ -540,6 +540,8 @@ export default {
             self.$bus.emit("initCandidate", []);
           }
         });
+        // 传递源数据 -- 源条码号，源指位号
+        self.$bus.emit('source_info', {barcode_source: self.barcode, seq_source: imageInfo.seq})
       } else {
         this.$bus.emit("changImageEdit", "xxx");
         this.$bus.emit("changImageEditTarget", "xxx");
@@ -621,6 +623,7 @@ export default {
   beforeDestroy() {
     //组件销毁前需要解绑事件。否则会出现重复触发事件的问题
     this.$bus.off("updateFinderSource");
+    this.$bus.off('source_info')
   },
 };
 // 某任务下查询的所有信息

src/views/rgrd/modules/TLCandidate.vue

@@ -62,7 +62,11 @@ export default {
       isDelete: false,
       searchType: "指纹",
       // 表格的索引
-      tableIndex: null
+      tableIndex: null,
+      // 源条码号
+      barcode_source: '',
+      // 源指位号
+      seq_source: ''
     };
   },
   created () {
@@ -101,6 +105,8 @@ export default {
           }
         });
       } else {
+        // 传递目标数据 -- 目标条码号，目标指位号
+        self.$bus.emit('target_info', { barcode_source: self.barcode_source, seq_source: self.seq_source, barcode_target: '', seq_target: '' })
         self.$bus.emit("bzJudgeTL", null);
         if (self.isDelete) {
           // self.$bus.emit('changImageEditTarget', 'xxx')
@@ -116,6 +122,16 @@ export default {
     });
     // 监听键盘事件
     this.keyDown()
+
+    // 获取传递过来的 源条码号，源指位号
+    this.$bus.on('source_info', (source_info) => {
+      console.log(source_info);
+      self.barcode_source = source_info.barcode_source
+      self.seq_source = source_info.seq_source
+      if (!source_info.barcode_source) {
+        self.$bus.emit('target_info', { barcode_source: '', seq_source: '', barcode_target: '', seq_target: '' })
+      }
+    })
   },
   methods: {
     /**
@@ -182,6 +198,8 @@ export default {
       let self = this;
       console.log(val);
       if (!val) return;
+      // 传递目标数据 -- 目标条码号，目标指位号
+      self.$bus.emit('target_info', { barcode_source: self.barcode_source, seq_source: self.seq_source, barcode_target: val.destbarcode, seq_target: val.destseqno })
       if (val.removeFlag == 1) {
         self.$bus.emit("targetDeleteMessage", {
           msg: "该条数据已删除！",
@@ -352,6 +370,7 @@ export default {
     this.$bus.off("initTLCandidate");
     this.$bus.off("deleteMessage");
     this.$bus.off("updateTLSourceData");
+    this.$bus.off('target_info')
   },
 };
 </script>

src/views/rgrd/modules/TLSrc.vue

@@ -713,7 +713,10 @@ export default {
       if (this.hand) {
         this.changeStyleHand(0, this.hand);
       } else {
+        // 传递源数据 -- 源条码号，源指位号
+        self.$bus.emit('source_info', {barcode_source: '', seq_source: ''})
         this.$bus.emit("changImageEdit", "xxx");
+        this.$bus.emit('changImageEditTarget', 'xxx')
       }
     },
     /**
@@ -1504,6 +1507,8 @@ export default {
     changeStyleHand(index, imageInfo) {
       let self = this;
       if (imageInfo.image) {
+        // 传递源数据 -- 源条码号，源指位号
+        self.$bus.emit('source_info', {barcode_source: self.barcode, seq_source: imageInfo.code})
         // 改变数据为点击状态
         self.$set(imageInfo, "clickLog", "1");
         this.isActive = imageInfo.code;
@@ -1550,6 +1555,8 @@ export default {
       let self = this;
       // 如果图片存在
       if (imageInfo.image) {
+        // 传递源数据 -- 源条码号，源指位号
+        self.$bus.emit('source_info', {barcode_source: self.barcode, seq_source: imageInfo.code})
         // 改变数据为点击状态
         self.$set(imageInfo, "clickLog", "1");
         this.isActive = imageInfo.code;
@@ -1616,6 +1623,8 @@ export default {
       let self = this;
 
       if (imageInfo.image) {
+        // 传递源数据 -- 源条码号，源指位号
+        self.$bus.emit('source_info', {barcode_source: self.barcode, seq_source: imageInfo.code})
         // 改变数据为点击状态
         self.$set(imageInfo, "clickLog", "1");
         this.isActive = imageInfo.code;
@@ -1680,6 +1689,8 @@ export default {
       const source = CancelToken.source();
       let self = this;
       if (imageInfo.image) {
+        // 传递源数据 -- 源条码号，源指位号
+        self.$bus.emit('source_info', {barcode_source: self.barcode, seq_source: imageInfo.code})
         // 改变数据为点击状态
         self.$set(imageInfo, "clickLog", "1");
         this.isActive = imageInfo.code;
@@ -1744,6 +1755,8 @@ export default {
       //console.log(imageInfo);
       let self = this;
       if (imageInfo.image) {
+        // 传递源数据 -- 源条码号，源指位号
+        self.$bus.emit('source_info', {barcode_source: self.barcode, seq_source: imageInfo.code})
         // 改变数据为点击状态
         self.$set(imageInfo, "clickLog", "1");
         this.isActive = imageInfo.code;

src/views/zzwlr/xzry.vue

 <!--
  * @Author: your name
  * @Date: 2021-09-07 10:31:34
- * @LastEditTime: 2022-02-08 10:44:40
+ * @LastEditTime: 2022-02-13 21:42:29
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \founder_vue\src\views\zzwlr\Index.vue
@@ -255,7 +255,7 @@
           jzrybh: "", // 警综人员编号
           asjxgrybh: "", // 案事件相关人员编号号
           zzhwkbh: "", // 现场掌指纹卡编号
-          cjxxyydm: "", // 采集信息原因
+          cjxxyydm: [], // 采集信息原因
 
           xm: "", // 姓名
           bmch: "", // 别名
@@ -392,7 +392,6 @@
           this.$set(this.rules.zjhm[1], "pattern", /^[0-9a-zA-Z]+$/)
         }
       },
-
     },
     methods: {
       isRight() {

src/views/zzwlr/xzryedit.vue

 <!--
  * @Author: your name
  * @Date: 2021-09-07 10:31:34
- * @LastEditTime: 2022-02-08 16:03:36
+ * @LastEditTime: 2022-02-13 21:43:46
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \founder_vue\src\views\zzwlr\Index.vue
@@ -250,7 +250,7 @@
           jzrybh: "", // 警综人员编号
           asjxgrybh: "", // 案事件相关人员编号号
           zzhwkbh: "", // 现场掌指纹卡编号
-          cjxxyydm: "", // 采集信息原因
+          cjxxyydm: [], // 采集信息原因
 
           xm: "", // 姓名
           bmch: "", // 别名

vue.config.js

 /*
  * @Author: your name
  * @Date: 2021-09-07 09:57:48
- * @LastEditTime: 2022-02-12 14:54:31
+ * @LastEditTime: 2022-02-14 16:50:09
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \指纹系统\founder_vue\vue.config.js
@@ -113,13 +113,13 @@ module.exports = {
         // target: "http://192.168.128.108:8099/", // 张 认定
         // target: "http://192.168.128.101:8099",  // 湖南-马
         // target: "http://192.168.128.116:8099",  // 湖南-王
-        // target: "http://192.168.128.111:8099",  // 湖南-张呈光
+        // target: "http://192.168.128.108:8099",  // 湖南-张呈光
         // target: "http://172.18.116.73:8099/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/   ma
         // target: "http://127.0.0.1:8099",
         // target: "http://47.92.225.109:5602",
         // target: "http://www.meetfood.cn:2390", // 湖南-线上
-        target: "http://zwpt.xzclub.top:9333/",
-        // target: "http://192.168.128.103:8099",  // 江
+        // target: "http://zwpt.xzclub.top:9333/",
+        target: "http://192.168.128.103:8099",  // 江
         ws: true,
         changeOrigin: true,
         pathRewrite: {
@@ -129,9 +129,9 @@ module.exports = {
 
       "/security": {
         // target: "http://192.168.128.106:8765", // 湖南-王
-        // target: "http://192.168.128.111:8765/", // 张 认定
+        target: "http://192.168.128.108:8765/", // 张 认定
         // target: "http://www.meetfood.cn:2390", // 湖南-王
-        target: "http://zwpt.xzclub.top:9333/",
+        // target: "http://zwpt.xzclub.top:9333/",
         // target: "http://192.168.128.109:8765",
         ws: true,
         changeOrigin: true,