Merge branch 'dev_zwpt' of http://47.92.108.28/changchao/founder_vue into dev_zwpt

src/assets/css/el-table-style.css

@@ -56,3 +56,29 @@ width: 100%;
     color: #333333;
     line-height: 16px;
 }
+
+.tt_candidate_table{
+    width:100%
+}
+/* 修改表头内容 */
+.tt_candidate_table .el-table__header-wrapper th {
+    width: 340px;
+    height: 32px;
+    background: #F6F8FA;/*width: 352px;*/
+    font-size: 14px;color: #282F3C;
+    line-height: 22px;
+}
+/* 修改表格里内容 */
+.tt_candidate_table .el-table__body-wrapper tr td {
+    width: 340px;
+    height: 24px;
+    background: #FFFFFF;
+    font-size: 12px;
+    font-family: MicrosoftYaHei;
+    color: #333333;
+    line-height: 16px;
+}
+/* 选中的颜色 */
+.tt_candidate_table tbody tr.current-row > td {
+    background: #F5F5F7;
+}
\ No newline at end of file

src/icons/error.svg

+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 64 (93537) - https://sketch.com -->
+    <title>编组 47备份 3</title>
+    <desc>Created with Sketch.</desc>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="查询与认定-正查-比中弹窗" transform="translate(-1268.000000, -560.000000)" fill-rule="nonzero">
+            <g id="编组-59" transform="translate(589.000000, 223.000000)">
+                <g id="编组-47备份-3" transform="translate(679.000000, 337.000000)">
+                    <circle id="椭圆形" fill="#FF4242" cx="8" cy="8" r="8"></circle>
+                    <path d="M8,10 C8.41421356,10 8.75,10.3357864 8.75,10.75 C8.75,11.1642136 8.41421356,11.5 8,11.5 C7.58578644,11.5 7.25,11.1642136 7.25,10.75 C7.25,10.3357864 7.58578644,10 8,10 Z M8.75,4 L8.75,9 L7.25,9 L7.25,4 L8.75,4 Z" id="形状结合" fill="#FFFFFF"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file

src/icons/loading.svg

+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="36px" height="40px" viewBox="0 0 36 40" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 64 (93537) - https://sketch.com -->
+    <title>形状</title>
+    <desc>Created with Sketch.</desc>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.202985491">
+        <g id="方正指掌纹-查询与认定-倒查" transform="translate(-182.000000, -545.000000)" fill="#686C84" fill-rule="nonzero">
+            <g id="指纹-(4)备份" transform="translate(182.000000, 545.000000)">
+                <path d="M29.6141404,4.94017395 C29.4550796,4.93805077 29.2984436,4.90049113 29.1554117,4.83017564 C25.3271717,2.85020679 21.9939627,2.00022016 18.0172133,2.00022016 C14.0487145,2.00022016 10.30958,2.95020522 6.87901491,4.8201758 C6.39915474,5.04807943 5.82652001,4.8616013 5.56883276,4.39351585 C5.31503826,3.92554576 5.4697215,3.33875348 5.9203048,3.06020348 C9.63539816,1.03345056 13.7948701,-0.0187012462 18.0172133,0.000251589914 C22.2761303,0.000251589914 25.9954635,0.940236802 30.0745193,3.05020364 C30.3091474,3.17124673 30.4863331,3.38175189 30.5668548,3.63512188 C30.6473764,3.88849187 30.6245924,4.16382812 30.5035462,4.40018242 C30.3277716,4.73150673 29.9863004,4.93882663 29.6141404,4.94017395 L29.6141404,4.94017395 Z M1.0013464,15.4400089 C0.630164804,15.4461869 0.287063626,15.2410817 0.113833334,14.9094553 C-0.0593969567,14.5778289 -0.0333364805,14.1760018 0.181244974,13.8700335 C2.16136914,11.0700775 4.68932762,8.87011211 7.68921571,7.32013652 C13.97776,4.07018763 22.0170641,4.06018779 28.315509,7.30013684 C31.2941744,8.82900784 33.8656645,11.0581712 35.8135791,13.8000346 C35.9676297,14.0145548 36.02993,14.282575 35.9864936,14.543925 C35.9430572,14.805275 35.7975235,15.0380574 35.5825646,15.1900128 C35.1320711,15.5115393 34.509589,15.4092239 34.1832769,14.9600164 C32.4268059,12.4761008 30.1010058,10.4586578 27.4046519,9.08010884 C21.6672422,6.13015521 14.3374826,6.14015506 8.60997347,9.10010853 C5.90457593,10.4915769 3.57479271,12.526687 1.82144782,15.0300153 C1.62737029,15.2896327 1.32342394,15.4415847 1.0013464,15.4400089 L1.0013464,15.4400089 Z M13.5091306,39.5696295 C13.2423998,39.5695569 12.9868277,39.4615011 12.7995861,39.2696342 C11.0686276,37.5196617 10.1297187,36.4096792 8.77993411,33.9997171 C7.39879753,31.5397558 6.66945179,28.5298031 6.66945179,25.3098537 C6.66945179,19.3699471 11.7484702,14.5300232 17.997412,14.5300232 C24.2463539,14.5300232 29.3253723,19.3599472 29.3253723,25.3098537 C29.3253723,25.8598451 28.8748941,26.309838 28.3254096,26.309838 C27.7766197,26.3107731 27.3299816,25.8641254 27.3254469,25.3098537 C27.3254469,20.4699298 23.1457348,16.5299917 17.997412,16.5299917 C12.8589899,16.5299917 8.66937716,20.4699298 8.66937719,25.3098537 C8.66937719,28.1898084 9.30961736,30.8497666 10.5174931,33.0197325 C11.807874,35.3196963 12.6675779,36.3096808 14.2087745,37.8596564 C14.3968454,38.0456806 14.502011,38.3009021 14.5001441,38.5667679 C14.4982773,38.8326338 14.3895382,39.086323 14.1988739,39.2696342 C14.0227677,39.4667073 13.770237,39.5762803 13.5074805,39.5696295 L13.5091306,39.5696295 Z M27.8353289,35.8696877 C25.4558797,35.8696877 23.3668487,35.2696971 21.6358902,34.0997155 C18.665704,32.0797473 16.8868924,28.7997989 16.8868924,25.3198535 C16.8868924,24.7698622 17.3373707,24.3198692 17.8868551,24.3198692 C18.4363396,24.3198692 18.8868178,24.7698622 18.8868178,25.3198535 C18.8868178,28.1298094 20.3372587,30.7897675 22.7662111,32.4397416 C24.1753994,33.3997265 25.8354035,33.8697191 27.8353289,33.8697191 C28.3138589,33.8697191 29.1240597,33.8197199 29.9243599,33.6797221 C30.4653823,33.5833963 30.9824899,33.9444673 31.0843826,34.4897094 C31.1771738,35.035298 30.8156585,35.5539435 30.2758319,35.6496912 C29.4694187,35.7927486 28.6524294,35.8663454 27.8336788,35.8696877 L27.8353289,35.8696877 Z M23.8057762,39.9998299 C23.7177691,40.0016986 23.6300839,39.9881602 23.54671,39.9596234 C20.35706,39.0896371 18.2779296,37.9096556 16.1179442,35.7596894 C13.3406234,33.0113403 11.7793687,29.2469692 11.7880727,25.3198535 C11.7880727,22.0699047 14.5486958,19.4299461 17.9479089,19.4299461 C21.347122,19.4299461 24.106095,22.0699047 24.1060951,25.3198535 C24.1060951,27.4598199 25.9756623,29.2097924 28.2643558,29.2097924 C30.5546994,29.2097924 32.4226165,27.4698198 32.4226165,25.3198535 C32.4226165,17.7799721 25.9261592,11.6500685 17.9380083,11.6500684 C12.2484516,11.6500684 7.05887617,14.8100187 4.72067961,19.7099417 C3.94018067,21.3299162 3.54910615,23.2198866 3.54910615,25.3198535 C3.54910615,26.879829 3.69101507,29.3397903 4.88073964,32.5297402 C4.97177181,32.7799236 4.96067463,33.0563852 4.84988942,33.2983045 C4.73910422,33.5402237 4.53770632,33.727783 4.29000258,33.8197199 C3.77253692,34.0117697 3.19820133,33.7491708 2.99962167,33.2297292 C2.02111032,30.5997705 1.54093022,28.0198111 1.54093022,25.3198535 C1.54093022,22.9198913 2.00130908,20.7399256 2.91051609,18.8499552 C5.58038348,13.270043 11.4778533,9.66009973 17.9264576,9.66009973 C27.0152275,9.66009973 34.4142914,16.6899892 34.4142914,25.3298534 C34.4142914,28.5798023 31.6437677,31.2197608 28.2544552,31.2197608 C24.8651427,31.2197608 22.0962691,28.5798023 22.0962691,25.3298534 C22.0962691,23.189887 20.2267018,21.4399146 17.9380083,21.4399146 C15.6476647,21.4399146 13.7780975,23.1798872 13.7780975,25.3298534 C13.7780975,28.7397998 15.1080809,31.9497493 17.5172319,34.3497116 C19.4066004,36.2296821 21.2464658,37.2696657 24.0664926,38.0396536 C24.5945257,38.1896512 24.9162959,38.7396426 24.7661365,39.2696342 C24.6451052,39.7034987 24.2520532,40.0022652 23.8057762,39.9998299 Z" id="形状" transform="translate(18.000000, 20.000000) rotate(-360.000000) translate(-18.000000, -20.000000) "></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file

src/main.js

 /*
  * @Author: your name
  * @Date: 2021-09-07 14:39:52
- * @LastEditTime: 2021-09-28 09:31:22
+ * @LastEditTime: 2021-10-14 16:03:57
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \指纹系统\founder_vue\src\main.js
@@ -24,8 +24,7 @@ import VueBus from 'vue-bus';
 
 //引入svg组件
 import IconSvg from './utils/IconSvg.vue'
-
-// //全局注册svg-icon
+//全局注册svg-icon
 Vue.component('svg-icon', IconSvg)
 
 Vue.prototype.$driver = new Driver({

src/utils/Error.vue

+<!--
+ * @Author: your name
+ * @Date: 2021-10-14 16:08:22
+ * @LastEditTime: 2021-10-14 16:08:23
+ * @LastEditors: Please set LastEditors
+ * @Description: In User Settings Edit
+ * @FilePath: \指纹系统\founder_vue\src\utils\Error.vue
+-->

src/views/Home.vue

@@ -7,10 +7,10 @@
             <img class="jh" src="../assets/img/Home/jh.png" alt="">
             <img v-show="!isCollapse" class="title" src="../assets/img/Home/title.png" alt="">
           </div>
-          <div class="search">
+          <!-- <div class="search">
             <el-input v-if="!isCollapse" @keyup.enter.native="goSearch()" class="searchTxt" prefix-icon="el-icon-search" v-model="searchTxt" placeholder="搜索"></el-input>
             <i class="search-icon el-icon-search" v-else></i>
-          </div>
+          </div> -->
           <el-menu :collapse-transition="false" ref="menu" :default-active="menuActive" text-color="#CCCCCC" active-text-color="#ffffff" background-color="#1F2D45" class="el-menu-vertical-demo" @open="handleOpen" @close="handleClose" :collapse="isCollapse" @select="selectPath">
             <div v-for="(menu, i) in routes" :key="i">
               <el-submenu :index="menu.name" v-if="menu.children">

src/views/cxyrd/LT.scss

@@ -128,9 +128,13 @@ $phone: var(--phone, #606266);  //#ff4242;
           width: 16px;
           height: 16px;
           right: 51px;
-          top: 2px;
-          img {
-            object-fit: contain;
+          top: 6px;
+          // img {
+          //   object-fit: contain;
+          // }
+          .icon {
+            width: 16px;
+            height: 16px;
           }
         }
         .bzname {
@@ -147,6 +151,7 @@ $phone: var(--phone, #606266);  //#ff4242;
       /deep/.el-input__inner {
         height: 32px;
         line-height: 32px;
+        border: 1px solid #E6E6E8;
       }
     }
     .line {
@@ -193,10 +198,28 @@ $phone: var(--phone, #606266);  //#ff4242;
         font-family: MicrosoftYaHei;
         color: #2e3846;
       }
+      .bzconfirm {
+        &:hover {
+          border: 1px solid #055fe7;
+          color: #055fe7;
+        }
+        &:active {
+          border: 1px solid #044CB9;
+          color: #044CB9;
+        }
+      }
       .bzcancel {
         margin-left: 24px;
         background: #055fe7;
         color: #ffffff;
+        &:hover {
+          background: #377FEC;
+          color: #FFFFFF;
+        }
+        &:active {
+          background: #044CB9;
+          color: #FFFFFF;
+        }
       }
     }
   }

src/views/cxyrd/LT.vue

@@ -84,7 +84,8 @@
             <div class="bzname">比中人联系电话：</div>
             <el-input class="bzphone" v-model="phone" placeholder="请输入内容"></el-input>
             <div class="input-error" v-show="isPhoneError">
-              <img src="@/assets/img/inputerror.png" alt="">
+              <!-- <img src="@/assets/img/inputerror.png" alt=""> -->
+              <svg-icon icon-class="error" class="icon"/>
             </div>
             <div class="error-desc" v-show="isPhoneError">联系电话不应低于7位数！</div>
           </div>
@@ -105,6 +106,7 @@
 </template>
 
 <script>
+import "@/icons/error.svg";
 import Utils from '@/utils/util.js';
 import LTSrc from "./modules/LTSrc.vue";
 import LTCandidate from "./modules/LTCandidate.vue";
@@ -115,7 +117,7 @@ export default {
   components: {
     LTSrc,
     LTCandidate,
-    ImageEd
+    ImageEd,
   },
   data () {
     return {
@@ -191,34 +193,51 @@ export default {
           destbarcode,
           qqid,
           qid,
-          querytype
+          querytype,
+          affirmDescribe: self.textarea
         }
       }).then(response => {
         // 跟新列表数据
         self.$bus.emit("updateFinderSource");
         console.log(response);
         this.$message.success("比中成功！");
-      });
+      }).catch(err => {
+        this.$message.error("比中失败！");
+      })
+
+      // 更新电话
+      this.$axios({
+        method: 'post',
+        url: '/api/user/update',
+        data: {
+          telephone: self.phone
+        }
+      }).then(res => {
+        console.log(res);
+      })
 
       this.isShowbzDialogBg = false
       this.isShowbzDialog = false
     },
     /**
-     * @description: 获取正查比中上方的数据
+     * @description: 获取现场勘验编号
      * @param {*}
      * @return {*}
      */
     getUserInfo2 () {
+      let self = this
       let destbarcode = sessionStorage.getItem("destbarcode") || "";
       console.log(destbarcode);
       this.$axios({
-        url: 'api/personstore/detail',
+        url: '/api/casestore/casebase',
         method: 'get',
         params: {
           barcode: destbarcode
         }
       }).then(res => {
-        console.log(res);
+        if(res.data.code == 0) {
+          self.xckybh = res.data.ret.kybh
+        }
       })
     },
     /**
@@ -259,7 +278,7 @@ export default {
      */
     Bz () {
       this.getUserInfo()
-      // this.getUserInfo2()
+      this.getUserInfo2()
       this.asjbh = sessionStorage.getItem('srcbarcode')
       this.xh = sessionStorage.getItem('srcseqno')
       this.rybh = sessionStorage.getItem('destbarcode')
@@ -374,7 +393,11 @@ export default {
           break;
       }
     }
-  }
+  },
+  beforeDestroy () {
+    //组件销毁前需要解绑事件。否则会出现重复触发事件的问题
+    this.$bus.$off('updateFinderSource');
+  },
 };
 </script>
 
@@ -421,6 +444,7 @@ div {
   font-size: 14px;
   line-height: 22px;
   .bz-btn {
+    cursor: pointer;
     width: 96px;
     height: 32px;
     background: #ff0039;
@@ -430,6 +454,7 @@ div {
     line-height: 32px;
   }
   .rd-btn {
+    cursor: pointer;
     width: 96px;
     height: 32px;
     background: #055fe7;

src/views/cxyrd/QueryConfirm.vue

@@ -304,19 +304,21 @@
               >
             </template>
           </el-table-column>
-          <el-table-column width="140" label="操作">
+          <el-table-column width="auto" label="操作">
             <template slot-scope="scope">
               <div
                 class="img"
                 @click="edit(scope.row)"
                 type="text"
                 style="font-size:24px"
+                v-if="scope.row.barcode"
               >
                 <i>
                   <img style="width:16px;height:16px" :src="editUrl" alt />
                 </i>
               </div>
               <div
+                v-if="scope.row.barcode"
                 class="img"
                 @click="delOne(scope.row.qqid)"
                 type="text"
@@ -447,7 +449,8 @@ export default {
         { value: "99", name: "标记删除", type: "querystates" },
         { value: "-1", name: "无效", type: "querystates" },
         { value: "-2", name: "同步特征", type: "querystates" }
-      ]
+      ],
+      expanded: false  // 展开标志
       // arr: []
     };
   },
@@ -459,7 +462,7 @@ export default {
       );
       //挑选被选中的对象
       this.key = this.key + 1; //为了保证table 每次都会重渲，这样做体验感更好，如果不为table设置key值的话，用户一旦选中了复选框选项，就是在原来table基础上添加删除每一列，页面就有跳动的感觉，体验感不好
-    }
+    },
   },
   computed: {
     // 计算总页数
@@ -666,30 +669,50 @@ export default {
     edit() {},
     // 展开或关闭行
     hadnlExpandChange(row, expanded) {
+      // 获取展开标志
+      this.expanded = expanded
       // 获取下标
       var i = this.list.findIndex(table => table.queryId === row.queryId);
+      // var i = this.tableData.findIndex(table => table.id === row.id);
+      console.log(i);
       if (expanded) {
+        this.list[i] = {
+          qid: row.qid,
+          children: row.children,
+          queryId: row.queryId,
+        };
+        this.$forceUpdate();
+        console.info("展开时row数据", this.list[i]);
+        // this.$set(this.tableData[i], "barcode", "");
         // 保证临时变量中存在下标属性，方便后续折叠时取值
-        row.index = i;
+        //row.index = i;
         // // push到临时数组中
         // this.arr.push(row);
         // 清空表格数据
-        var obj = {
+        // var obj = {
+        //   qid: row.qid,
+        //   children: row.children,
+        //   queryId: row.queryId
+        // };
+        // this.list[i] = obj;
+      } else {
+        console.info("折叠时row数据", this.list[i]);
+        this.list[i] = {
           qid: row.qid,
           children: row.children,
-          queryId: row.queryId
+          queryId: row.queryId,
+          barcode: row.children[0].barcode,
+          maxcandidatecnt: row.children[0].maxcandidatecnt,
+          querytype: row.children[0].querytype,
+          queryStateName: row.children[0].queryStateName,
+          hitpossibility: row.children[0].hitpossibility,
+          queryclass: row.children[0].queryclass,
+          affirmtime: row.children[0].affirmtime,
+          requestdatetime: row.children[0].requestdatetime,
+          userdesc: row.children[0].userdesc
         };
-        this.list[i] = obj;
-      } else {
-        console.info("折叠时row数据", row);
-        var rowObj = row.children[0];
-        rowObj.children = row.children;
-        // this.$set(rowObj, "children", row.children);
-        // // 根据下标取临时变量
-        // var rowObj = this.arr.find(row => row.index === i);
-        // 赋值
-        console.info("折叠时rowObj数据", rowObj);
-        this.list[i] = rowObj;
+        this.$forceUpdate();
+        console.info("塞完数据的row", this.list[i]);
       }
     },
     // table表格选中获取数据
@@ -1108,7 +1131,7 @@ const setQueryClass = [
   right: 34px;
 }
 /deep/ .btn-next {
-  // margin-right: 120px;
+  margin-right: 120px !important;
 }
 
 .el-dropdown-menu {
@@ -1383,15 +1406,29 @@ b {
   background-size: 16px;
 }
 </style>
-<style>
+<style lang="scss">
 .el-table__expand-icon {
   position: absolute;
   right: 20px;
   cursor: pointer;
   color: #b51f1f;
   transition: transform 0.2s ease-in-out;
-  height: 20px;
-  border: black 1px solid;
+  width: 11px;
+  height: 11px;
+  /* border: black 1px solid; */
   margin: 0;
+  background-image: url('../../assets/img/confirm/expend.png');
+  background-position: center;
+  background-size: 11px;
+  background-repeat: no-repeat;
+}
+.el-table__expand-icon.el-table__expand-icon--expanded {
+  width: 11px;
+  height: 11px;
+  background-image: url('../../assets/img/confirm/shrink.png');
+  background-position: center;
+  background-size: 11px;
+  background-repeat: no-repeat;
+  transform: rotate(180deg) !important;
 }
 </style>

src/views/cxyrd/TL.scss

+// 电话验证颜色
+$phone: var(--phone, #606266); //#ff4242;
+
+* {
+  box-sizing: border-box;
+  margin: 0;
+  padding: 0;
+}
+.bzDialog {
+  position: absolute;
+  top: 0;
+  left: 0;
+  z-index: 100;
+  width: 100%;
+  height: 100%;
+  background: rgba($color: #fff, $alpha: 0.65);
+  filter: blur(2px);
+}
+.bzcontent {
+  box-sizing: border-box;
+  position: absolute;
+  top: calc(50% - 317px);
+  left: calc(50% - 371.5px);
+  z-index: 1000;
+  width: 743px;
+  height: 634px;
+  background: #ffffff;
+  box-shadow: 0px 14px 30px 0px rgba(0, 21, 51, 0.25);
+  border-radius: 6px;
+  .head-title {
+    box-sizing: border-box;
+    width: 100%;
+    height: 50px;
+    display: flex;
+    justify-content: space-between;
+    padding: 14px 32px;
+    .left {
+      font-size: 16px;
+      font-family: Microsoft YaHei;
+      color: #282f3c;
+    }
+    .close {
+      cursor: pointer;
+      width: 13px;
+      height: 13px;
+      img {
+        object-fit: contain;
+      }
+    }
+  }
+  .bzdesc {
+    font-size: 14px;
+    font-family: Microsoft YaHei;
+    color: #333333;
+    .bz-source {
+      width: 743px;
+      height: 160px;
+      background: rgba(230, 0, 18, 0.04);
+      padding: 24px 32px;
+      .bzitem {
+        width: 338px;
+        margin-bottom: 20px;
+        .bzname {
+          width: 114px;
+        }
+      }
+      .bzvalue {
+        &.zc {
+          font-size: 14px;
+          font-family: MicrosoftYaHei-Bold, MicrosoftYaHei;
+          font-weight: bold;
+          color: #e60012;
+        }
+        .dot {
+          margin-bottom: 2px;
+          margin-right: 5px;
+          width: 6px;
+          height: 6px;
+          background: #e60012;
+          border-radius: 50%;
+        }
+      }
+      /deep/.el-radio {
+        color: #666;
+        margin-right: 24px;
+      }
+      /deep/.el-radio__input.is-checked + .el-radio__label {
+        color: #333333;
+        padding-left: 8px;
+      }
+      /deep/.el-radio__input.is-checked .el-radio__inner {
+        border: 1px solid #055fe7;
+        background: #055fe7;
+      }
+      /deep/.el-radio__inner {
+        width: 16px;
+        height: 16px;
+        &::after {
+          width: 8px;
+          height: 8px;
+        }
+      }
+    }
+    .bz-target {
+      width: 743px;
+      height: 160px;
+      padding: 24px 32px;
+      .bzitem {
+        width: 338px;
+        margin-bottom: 20px;
+        position: relative;
+        .bzphone {
+          /deep/.el-input__inner {
+            color: $phone;
+            width: 180px;
+          }
+        }
+        .error-desc {
+          position: absolute;
+          height: 20px;
+          bottom: -24px;
+          right: 36px;
+          font-size: 12px;
+          font-family: Microsoft YaHei;
+          color: #ff3745;
+        }
+        .input-error {
+          position: absolute;
+          width: 16px;
+          height: 16px;
+          right: 51px;
+          top: 6px;
+          // img {
+          //   object-fit: contain;
+          // }
+          .icon {
+            width: 16px;
+            height: 16px;
+          }
+        }
+        .bzname {
+          width: 114px;
+        }
+      }
+      /deep/.el-input {
+        width: 180px;
+        height: 32px;
+        background: #ffffff;
+        border-radius: 4px;
+        border: 1px solid #e6e6e8;
+      }
+      /deep/.el-input__inner {
+        height: 32px;
+        line-height: 32px;
+      }
+    }
+    .line {
+      width: 679px;
+      height: 1px;
+      background: #eeeeee;
+      margin-left: 32px;
+    }
+    .bzfooter {
+      padding: 0 32px;
+      width: 100%;
+      .footer-title {
+        font-size: 14px;
+        font-family: Microsoft YaHei;
+        color: #666666;
+        /deep/.el-textarea {
+          width: 100%;
+        }
+      }
+      /deep/.el-textarea__inner {
+        background: #f6f8fa;
+        box-shadow: 0px 1px 2px 0px rgba(5, 95, 231, 0.18);
+        border-radius: 4px;
+        border: 1px solid #eeeeee;
+      }
+    }
+    .bzbtns {
+      display: flex;
+      align-items: center;
+      margin-left: 287px;
+      margin-top: 30px;
+      .bzconfirm,
+      .bzcancel {
+        cursor: pointer;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        width: 72px;
+        height: 40px;
+        background: #ffffff;
+        border-radius: 4px;
+        border: 1px solid #aeb5c2;
+        font-size: 14px;
+        font-family: MicrosoftYaHei;
+        color: #2e3846;
+      }
+      .bzconfirm {
+        &:hover {
+          border: 1px solid #055fe7;
+          color: #055fe7;
+        }
+        &:active {
+          border: 1px solid #044CB9;
+          color: #044CB9;
+        }
+      }
+      .bzcancel {
+        margin-left: 24px;
+        background: #055fe7;
+        color: #ffffff;
+        &:hover {
+          background: #377FEC;
+          color: #FFFFFF;
+        }
+        &:active {
+          background: #044CB9;
+          color: #FFFFFF;
+        }
+      }
+    }
+  }
+}

src/views/cxyrd/TT.vue

@@ -6,6 +6,7 @@
         <div class="bz-btn" @click="Bz">比中</div>
         <div class="rd-btn" @click="Rdwc">认定完成</div>
       </div>
+      e
     </div>
     <div class="tt_main">
       <div class="tt_main_top">
@@ -19,7 +20,7 @@
           <el-table
             highlight-current-row
             :data="tableData"
-            class="lt_candidate_table"
+            class="tt_candidate_table"
             height="150"
             @current-change="handleCurrentChange"
           >
@@ -187,8 +188,9 @@ export default {
       }
     },
     handleCurrentChange(val) {
-      console.info(val);
       this.destbarcode = val.destbarcode;
+      console.info(this.destbarcode);
+      this.$bus.emit("ccbarcode", this.destbarcode);
     },
     //比中
     Bz() {

src/views/cxyrd/modules/LTSrc.vue

@@ -2,7 +2,7 @@
   <div class="lt_src">
     <div class="lt_top">
       <!-- <label>任务号：{{ tableData.qid }}</label> -->
-      <label>任务号：{{ rwh }}</label>
+      <label class="rwh">任务号：{{ rwh }}</label>
       <el-checkbox v-model="checked">显示已认定完成查询ID</el-checkbox>
     </div>
     <div class="lt_middle">
@@ -22,9 +22,9 @@
       <div class="lt_middle_finger_print" v-show="isShowPrint">
         <!--指纹图-->
         <div class="lt_middle_finger_prints">
-          <div class="finger_print" :class="{ finger_print_active: index === isActive }" v-for="(item, index) in enumerate" @click="changeStyle(index, item)" :key="index">
-            <div class="finger_print_number" :class="{ finger_print_number_active: index === isActive }">
-              {{ Number(index+1) < 9 ? ('0'+Number(index+1)) : Number(index+1) }}
+          <div class="finger_print" :class="{ finger_print_active: index === isActive, fingerLook: item.clickLog==1, fingerRD: item.affirmstatus==1, fingerBZ:item.affirmstatus==2, fingerRB:item.affirmstatus==3 }" v-for="(item, index) in enumerate" @click="changeStyle(index, item)" :key="index">
+            <div class="finger_print_number" :class="{ finger_print_number_active: index === isActive, fingerLookNum: item.clickLog==1, fingerRDNum: item.affirmstatus==1, fingerBZNum:item.affirmstatus==2, fingerRBNum:item.affirmstatus==3 }">
+              {{ Number(index+1) &lt; 9 ? ('0'+Number(index+1)) : Number(index+1) }}
             </div>
             <br />
             <img :src="'data:image/jpeg;base64,'+item.image" style="width: 106px;height: 106px;" />
@@ -102,6 +102,7 @@ export default {
      * @return {*}
      */
     handleCurrentChange (val, old) {
+      if (val == null) return;
       this.currentRow = val;
       console.log(val);
       let self = this
@@ -114,9 +115,11 @@ export default {
       // 存储原条码号
       sessionStorage.setItem('srcbarcode', barcode)
       console.log(barcode);
-      this.$axios
-        .get(`/api/png/caseBybarcode/${barcode}`)
-        .then(response => {
+      this.$axios.post('/api/png/caseBybarcode/barcode', {
+        querytype: '2',
+        barcode: barcode,
+        qqid: self.qqid,
+      }).then(response => {
         console.log(response);
         self.enumerate = response.data.ret
         self.fingerTotal = response.data.ret.length
@@ -141,7 +144,9 @@ export default {
           self.total = self.dataList.length
           console.log(self.dataList);
           // 默认选中第一行
+          self.$nextTick(() => {
             self.$refs.singleTable.setCurrentRow(self.dataList[0]);
+          })
         });
     },
     // 获取选择的任务详情
@@ -169,7 +174,7 @@ export default {
       // 存储源数据序号
       sessionStorage.setItem('srcseqno', imageInfo.seq)
       this.$bus.emit('changImageEdit', imageInfo.image)
-      this.$axios.post(`/api/query/matchcand/dest/${self.qqid}/${imageInfo.seq}`, {srcbarcode: sessionStorage.getItem('srcbarcode')})
+      this.$axios.post(`/api/query/matchcand/dest/${self.qqid}/${imageInfo.seq}`, { srcbarcode: sessionStorage.getItem('srcbarcode') })
         .then(response => {
           console.log(response);
           self.$bus.emit('initCandidate', response.data.ret)
@@ -222,7 +227,11 @@ export default {
     this.$bus.on('updateFinderSource', () => {
       self.getDetailData()
     })
-  }
+  },
+  beforeDestroy () {
+    //组件销毁前需要解绑事件。否则会出现重复触发事件的问题
+    this.$bus.$off('updateFinderSource');
+  },
 };
 // 某任务下查询的所有信息
 const datas = [
@@ -270,6 +279,12 @@ const datas = [
   .lt_top {
     width: 100%;
     margin: 0 0 10px 0;
+    .rwh {
+      font-size: 14px;
+      font-family: Microsoft YaHei-Bold, Microsoft YaHei;
+      font-weight: bold;
+      color: #282F3C;
+    }
   }
   .lt_middle {
     width: 100%;
@@ -359,6 +374,34 @@ const datas = [
       border-radius: 0px 0px 7px 0px;
     }
   }
+  .fingerLook {
+    border: 1px solid #333;
+  }
+  .fingerRD {
+    border: 1px solid #055fe7;
+  }
+  .fingerBZ {
+    border: 1px solid #FF0039;
+  }
+  .fingerRB {
+    border: 1px solid #FF0039;
+  }
+  .fingerLookNum {
+    background:#ddebff !important;
+    color: #303133 !important;
+  }
+  .fingerRDNum {
+    background:#055fe7 !important;
+    color: #ffffff !important;
+  }
+  .fingerBZNum {
+    background: #FF0039 !important;
+    color: #ffffff !important;
+  }
+  .fingerRBNum {
+    background: #FF0039 !important;
+    color: #ffffff !important;
+  }
   .finger_print_active {
     position: relative;
     width: 106px;
@@ -373,3 +416,30 @@ const datas = [
   }
 }
 </style>
+<style lang="scss" scoped>
+// 滚动条的宽度
+/deep/ .el-table__body-wrapper::-webkit-scrollbar {
+  width: 6px; // 横向滚动条
+  height: 6px; // 纵向滚动条 必写
+}
+// 滚动条的滑块
+/deep/ .el-table__body-wrapper::-webkit-scrollbar-thumb {
+  background-color: #DADDE0;
+  border-radius: 3px;
+}
+// 修改多选框样式
+/deep/.el-checkbox.is-checked {
+  .el-checkbox__label {
+    color: #333333;
+  }
+  .el-checkbox__input.is-checked {
+    .el-checkbox__inner {
+      background: #055fe7;
+      border-color: #055fe7;
+    }
+  }
+}
+/deep/.el-checkbox {
+  color: #666;
+}
+</style>
\ No newline at end of file

src/views/cxyrd/modules/TLCandidate.vue

@@ -56,6 +56,8 @@ export default {
         sessionStorage.setItem("destbarcode", val.destbarcode);
         // 存储目的数据序号
         sessionStorage.setItem("destseqno", val.destid);
+        // 存储倒查序号
+        sessionStorage.setItem("backcheckXh", val.destseqno)
         // this.$axios.get(`/api/api/org/plainByBarcode/R1100002487002018050034/1/`)
         this.$axios
           .get(`/api/org/plainByBarcode/${val.destbarcode}/${val.destid}/`)
@@ -163,3 +165,32 @@ export default {
   }
 }
 </style>
+<style scoped lang="scss">
+.el-input {
+  /deep/ .el-input__inner {
+    border: none;
+  }
+  width: 296px;
+  height: 32px;
+  background: #ffffff;
+  border-radius: 4px;
+  border: 1px solid #e6e6e8;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+}
+// 修改多选框样式
+/deep/.el-checkbox.is-checked {
+  .el-checkbox__label {
+    color: #333333;
+  }
+  .el-checkbox__input.is-checked {
+    .el-checkbox__inner {
+      background: #055fe7;
+      border-color: #055fe7;
+    }
+  }
+}
+/deep/.el-checkbox {
+  color: #666;
+}
+</style>

src/views/cxyrd/modules/TTFingerPrint.vue

@@ -168,14 +168,7 @@
 <script>
 export default {
   name: "TTFingerPrint",
-  props: ["destBarcodeData"],
-  watch: {
-    destBarcodeData(val) {
-      if (val) {
-        this.destbarcode = val;
-      }
-    }
-  },
+
   data() {
     return {
       activeIndex: "1",
@@ -235,6 +228,8 @@ export default {
         { name: "环", code: 14, img: null },
         { name: "小", code: 15, img: null }
       ],
+      pageHeight: 0,
+      scrollFLag: true,
       qid: null,
       currentQqid: null,
       sourcebarcode: null,
@@ -316,11 +311,11 @@ export default {
         });
     },
     // 获取目标指纹图
-    getDestFingerPrintDetail() {
+    getDestFingerPrintDetail(barcode) {
       let self = this;
       // 滚动 目标数据
       this.$axios
-        .get("/api/org/rollByBarcode/" + this.destbarcode)
+        .get("/api/org/rollByBarcode/" + barcode)
         .then(function(response) {
           if (response.data.code === 0) {
             response.data.ret.forEach((element, index) => {
@@ -345,7 +340,7 @@ export default {
         });
       // 平面 目标
       this.$axios
-        .get("/api/org/plainByBarcode/" + this.destbarcode)
+        .get("/api/org/plainByBarcode/" + barcode)
         .then(function(response) {
           console.info("平面", response);
           if (response.data.code === 0) {
@@ -372,7 +367,10 @@ export default {
   },
   mounted() {
     this.getSourceFingerPrintDetail();
-    this.getDestFingerPrintDetail();
+    this.$bus.on("ccbarcode", code => {
+      console.log(code);
+      this.getDestFingerPrintDetail(code);
+    });
   }
 };
 </script>

vue.config.js

 /*
  * @Author: your name
  * @Date: 2021-09-07 09:57:48
- * @LastEditTime: 2021-10-13 14:22:13
+ * @LastEditTime: 2021-10-15 13:52:44
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \指纹系统\founder_vue\vue.config.js
@@ -83,7 +83,8 @@ module.exports = {
       "/api": {
         // target: "http://192.168.0.137:8080/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/
         // target: "http://172.18.108.2:8099/", // 张 认定
-        target: "http://192.168.128.108:8099",  // 湖南
+        target: "http://192.168.128.118:8099",  // 湖南-张
+        // target: "http://192.168.128.104:8099",  // 湖南-马
         // target: "http://172.18.116.73:8099/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/   ma
         ws: true,
         changeOrigin: true,