查重 数据等待及样式调整

src/plugins/axios.js

@@ -36,7 +36,7 @@ _axios.interceptors.request.use(
     let token = localStorage.getItem("token");
     if (token) {
       config.headers.Authorization = token;
-      console.info(config);
+      // console.info(config);
     }
     return config;
   },

src/views/cxyrd/QueryConfirm.vue

@@ -8,26 +8,54 @@
       <div class="width100 margin_top24_bottom24">
         <div class="display_style">
           <span>条码号：</span>
-          <el-input class="el_input" v-model="reqParam.contrastCustomSearchReq.barcode" placeholder="请输入条码号"></el-input>
+          <el-input
+            class="el_input"
+            v-model="reqParam.contrastCustomSearchReq.barcode"
+            placeholder="请输入条码号"
+          ></el-input>
         </div>
         <div class="display_style">
           <span>用户ID：</span>
-          <el-select class="el_select" v-model="reqParam.contrastCustomSearchReq.userid" @change="selectUserInfo">
-            <el-option v-for="item in userOption" :key="item.userid" :label="item.userdesc" :value="item.userid">
+          <el-select
+            class="el_select"
+            v-model="reqParam.contrastCustomSearchReq.userid"
+            @change="selectUserInfo"
+          >
+            <el-option
+              v-for="item in userOption"
+              :key="item.userid"
+              :label="item.userdesc"
+              :value="item.userid"
+            >
             </el-option>
           </el-select>
         </div>
         <div class="display_style">
           <span>查询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>任务号：</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">
           <span>发送时间：</span>
-          <el-date-picker v-model="startEndDate" class="el_data_picker" type="daterange" range-separator="-" start-placeholder="开始时间" end-placeholder="结束时间">
+          <el-date-picker
+            v-model="startEndDate"
+            class="el_data_picker"
+            type="daterange"
+            range-separator="-"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+          >
           </el-date-picker>
         </div>
         <!--        <div class="display_style">-->
@@ -51,11 +79,15 @@
         <div class="display_style">
           <label>查询类型：</label>
           <div v-for="(btn, index) in queryTypeBtns" :key="index">
-            <div class="btn" @click="getQueryType(btn, 'querytypes')" :class="[
+            <div
+              class="btn"
+              @click="getQueryType(btn, 'querytypes')"
+              :class="[
                 reqParam.contrastCustomSearchReq.querytypes.includes(btn.value)
                   ? 'btn-active'
                   : ''
-              ]">
+              ]"
+            >
               {{ btn.name }}
             </div>
           </div>
@@ -63,11 +95,15 @@
         <div class="display_style">
           <label>优先级：</label>
           <div v-for="(btn, index) in queryClassBtns" :key="index">
-            <div class="btn" @click="getQueryType(btn, 'queryclasss')" :class="[
+            <div
+              class="btn"
+              @click="getQueryType(btn, 'queryclasss')"
+              :class="[
                 reqParam.contrastCustomSearchReq.queryclasss.includes(btn.value)
                   ? 'btn-active'
                   : ''
-              ]">
+              ]"
+            >
               {{ btn.name }}
             </div>
           </div>
@@ -75,17 +111,23 @@
         <div class="display_style">
           <label>是否远程：</label>
           <div v-for="(btn, index) in remoteFlagBtns" :key="index">
-            <div class="btn" @click="getQueryType(btn, 'remoteflags')" :class="[
+            <div
+              class="btn"
+              @click="getQueryType(btn, 'remoteflags')"
+              :class="[
                 reqParam.contrastCustomSearchReq.remoteflags.includes(btn.value)
                   ? 'btn-active'
                   : ''
-              ]">
+              ]"
+            >
               {{ btn.name }}
             </div>
           </div>
         </div>
         <div class="display_style">
-          <el-checkbox><span>显示"{{ account }}"发查询用户查询</span></el-checkbox>
+          <el-checkbox
+            ><span>显示"{{ account }}"发查询用户查询</span></el-checkbox
+          >
         </div>
       </div>
       <div class="width100 margin_top24_bottom24 display_style">
@@ -93,11 +135,15 @@
         <!--          -1：无效；0：等待比对；1：正在比对；9：比对出错；10：比对完成（等待认定）；11：正在认定；19：认定出错；20：认定完成（等待复核）；21：正在复核；29：复核出错；30；复合完成；99：标记删除-->
         <div class="btn" @click="allQueryType()">全部</div>
         <div v-for="(btn, index) in queryStateBtns" :key="index">
-          <div class="btn" @click="getQueryType(btn, 'querystates')" :class="[
+          <div
+            class="btn"
+            @click="getQueryType(btn, 'querystates')"
+            :class="[
               reqParam.contrastCustomSearchReq.querystates.includes(btn.value)
                 ? 'btn-active'
                 : ''
-            ]">
+            ]"
+          >
             {{ btn.name }}
           </div>
         </div>
@@ -113,7 +159,14 @@
               全部数据&nbsp>
               <!--                <span>共找到{{ reqParam.page.total }}条</span>-->
             </div>
-            <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>
@@ -124,8 +177,15 @@
             <el-dropdown trigger="click">
               <el-button type="info">自定义列</el-button>
               <el-dropdown-menu slot="dropdown">
-                <el-checkbox-group v-model="checkedProps" @change="changeCheckbox">
-                  <el-checkbox v-for="(item, index) in defaultTableProps" :label="item.prop" :key="index">
+                <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>
@@ -134,7 +194,13 @@
           </div>
           <!-- 自定义列 止 -->
           <!-- 复制条码号 起 -->
-          <el-button type="info" v-clipboard:copy="barcode" @click="getBarcode" v-clipboard:success="onCopy" v-clipboard:error="onError">
+          <el-button
+            type="info"
+            v-clipboard:copy="barcode"
+            @click="getBarcode"
+            v-clipboard:success="onCopy"
+            v-clipboard:error="onError"
+          >
             复制条码
           </el-button>
           <!-- 复制条码号 止 -->
@@ -143,13 +209,38 @@
         </div>
       </div>
       <div class="confirm_main_table">
-        <el-table class="mineral-table" border @selection-change="handleSelectionChange" height="490" ref="confirmTable" tooltip-effect="dark" :data="list" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }" row-key="queryId" @row-click="confirm" @expand-change="hadnlExpandChange">
-          <el-table-column type="selection" height width="auto" v-if="isSelected"></el-table-column>
+        <el-table
+          class="mineral-table"
+          border
+          @selection-change="handleSelectionChange"
+          height="490"
+          ref="confirmTable"
+          tooltip-effect="dark"
+          :data="list"
+          :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+          row-key="queryId"
+          @row-click="confirm"
+          @expand-change="hadnlExpandChange"
+        >
+          <el-table-column
+            type="selection"
+            height
+            width="auto"
+            v-if="isSelected"
+          ></el-table-column>
           <el-table-column prop="" label="任务号/查询号" width="155">
             <template slot-scope="scope">
-              <svg-icon style="width: 14px;height: 11px;margin-bottom: 2px ;margin-left: 5px ;" v-if="scope.row.children || scope.row.children === null" icon-class="tree_f">
+              <svg-icon
+                style="width: 14px;height: 11px;margin-bottom: 2px ;margin-left: 5px ;"
+                v-if="scope.row.children || scope.row.children === null"
+                icon-class="tree_f"
+              >
               </svg-icon>
-              <svg-icon style="width: 13px;height: 6px;margin: 0 0 3px 0 ;" v-else-if="!scope.row.children || scope.row.children !== null" icon-class="tree_c"></svg-icon>
+              <svg-icon
+                style="width: 13px;height: 6px;margin: 0 0 3px 0 ;"
+                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
@@ -163,19 +254,35 @@
               </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">
+          <el-table-column
+            v-for="(item, index) in tableProps"
+            show-overflow-tooltip
+            :key="index"
+            :label="item.colume"
+            :prop="item.prop"
+            :width="item.width"
+          >
             <template slot-scope="scope">
               <template v-if="item.prop === 'querytype'">
                 <div v-if="scope.row.querytype === '3'" style="color: #FFA219">
                   {{ scope.row.queryTypeName }}
                 </div>
-                <div v-else-if="scope.row.querytype === '0'" style="color: #005FE7">
+                <div
+                  v-else-if="scope.row.querytype === '0'"
+                  style="color: #005FE7"
+                >
                   {{ 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:#08BD9E">
+                <div
+                  v-else-if="scope.row.querytype === '2'"
+                  style="color:#08BD9E"
+                >
                   {{ scope.row.queryTypeName }}
                 </div>
                 <div v-else>
@@ -213,21 +320,42 @@
                 }}
               </template>
               <template v-else>
-                {{ dataFormat(scope.row, item.prop) }}</template>
+                {{ dataFormat(scope.row, item.prop) }}</template
+              >
             </template>
           </el-table-column>
           <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">
+              <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;cursor: pointer;
-" :src="editUrl" alt />
+                  <img
+                    style="width:16px;height:16px;cursor: pointer;
+"
+                    :src="editUrl"
+                    alt
+                  />
                 </i>
               </div>
-              <div v-if="scope.row.barcode" class="img" @click.stop="delOne(scope.row.qqid)" type="text" style="font-size:24px">
+              <div
+                v-if="scope.row.barcode"
+                class="img"
+                @click.stop="delOne(scope.row.qqid)"
+                type="text"
+                style="font-size:24px"
+              >
                 <i>
-                  <img style="width:12px;height:14px;cursor: pointer;
-" :src="delUrl" alt />
+                  <img
+                    style="width:12px;height:14px;cursor: pointer;
+"
+                    :src="delUrl"
+                    alt
+                  />
                 </i>
               </div>
             </template>
@@ -236,9 +364,11 @@
       </div>
     </div>
     <div class="footer">
-      <span class="count">共{{ reqParam.page.total }} 条记录 第{{ reqParam.page.currPage }}/{{
+      <span class="count"
+        >共{{ reqParam.page.total }} 条记录 第{{ reqParam.page.currPage }}/{{
           Tpage
-        }}页</span>
+        }}页</span
+      >
       <div class="page">
         <el-pagination
           class="paging"
@@ -270,7 +400,7 @@ import "@/icons/tree_c.svg";
 export default {
   name: "QueryConfirm",
   components: { SvgIcon },
-  data () {
+  data() {
     return {
       reqParam: {
         page: {
@@ -364,7 +494,7 @@ export default {
   },
   watch: {
     // 批量处理
-    checkedProps (val) {
+    checkedProps(val) {
       this.tableProps = this.defaultTableProps.filter(
         i => val.indexOf(i.prop) >= 0
       );
@@ -374,7 +504,7 @@ export default {
   },
   computed: {
     // 计算总页数
-    Tpage () {
+    Tpage() {
       return (
         Math.floor(this.reqParam.page.total / this.reqParam.page.pageSize) + 1
       );
@@ -382,7 +512,7 @@ export default {
   },
   methods: {
     // 获取认定列表
-    search () {
+    search() {
       this.getParam();
       // console.info("请求===>", this.reqParam.contrastCustomSearchReq);
       this.$axios
@@ -400,7 +530,7 @@ export default {
         });
     },
     // 格式化参数
-    getParam () {
+    getParam() {
       if (this.startEndDate !== null) {
         this.reqParam.contrastCustomSearchReq.sendTimeStart = moment(
           this.startEndDate[0]
@@ -411,7 +541,7 @@ export default {
       }
     },
     // 选择用户下拉框变化时 当前页为1
-    selectUserInfo () {
+    selectUserInfo() {
       this.reqParam.page.currPage = 1;
       console.info(
         "当前选中的用户为-------->",
@@ -420,11 +550,11 @@ export default {
       this.search();
     },
     // 清空用户id
-    clearUser () {
+    clearUser() {
       this.reqParam.contrastCustomSearchReq.userid = null;
     },
     // 获取用户信息
-    getUserInfo (val) {
+    getUserInfo(val) {
       var userInfo = [];
       val.forEach(item => {
         var user = {};
@@ -444,7 +574,7 @@ export default {
       // console.info("用户信息==>", this.userOption);
     },
     // 用户信息去重
-    unique (arr) {
+    unique(arr) {
       // 需要唯一标识来对数组进行过滤
       // 定义常量res，值为一个map对象实例
       const res = new Map();
@@ -455,7 +585,7 @@ export default {
       );
     },
     // 多条件查询 获取查询条件
-    getQueryType (data, type) {
+    getQueryType(data, type) {
       let { name, value } = data;
       let list = this.reqParam.contrastCustomSearchReq[type];
       if (list.includes(value)) {
@@ -473,7 +603,7 @@ export default {
       this.search();
     },
     // 格式化
-    dataFormat (row, prop) {
+    dataFormat(row, prop) {
       // colnum为使用了formatter的列
       // clonum.property为当前列的prop值
       // row为当前行，是一个类数组对象，可通过[]拿值
@@ -484,7 +614,7 @@ export default {
       }
     },
     // 优先级格式化
-    queryClassFormat (row, colnum) {
+    queryClassFormat(row, colnum) {
       let prop = colnum.property;
       let showProp = null;
       for (let i = 0; i < this.queryClassList.length; i++) {
@@ -494,7 +624,7 @@ export default {
       return showProp;
     },
     // 多选删除
-    delMore () {
+    delMore() {
       // 检查table选择的数据 如果没有选择则不可以删除
       if (this.selectionData.length === 0) {
         this.$message.error("请选择需要删除的数据！");
@@ -508,7 +638,7 @@ export default {
       this.doDelete(qqid);
     },
     // 单选删除
-    delOne (val) {
+    delOne(val) {
       // 将传入的qqid转为数组
       let qqid = [];
       qqid.push(val);
@@ -516,7 +646,7 @@ export default {
       this.doDelete(qqid);
     },
     // 请求删除接口
-    doDelete (qqid) {
+    doDelete(qqid) {
       // 删除确认提示
       this.$confirm("是否确定删除已选择的数据?", "提示", {
         confirmButtonText: "确定",
@@ -543,7 +673,7 @@ export default {
         });
     },
     // 认定
-    confirm (row) {
+    confirm(row) {
       // tt 查重 0
       if (row.querytype === "0") {
         console.log(row);
@@ -551,17 +681,26 @@ export default {
         if (row.children) {
           let routeUrl = this.$router.resolve({
             path: "/confirm/TT",
-            query: { qqid: row.qqid, qid: row.qid, barcode: row.barcode, type: 'father' }
+            query: {
+              qqid: row.qqid,
+              qid: row.qid,
+              barcode: row.barcode,
+              type: "father"
+            }
           });
           window.open(routeUrl.href, "_blank");
         } else {
           let routeUrl = this.$router.resolve({
             path: "/confirm/TT",
-            query: { qqid: row.qqid, qid: row.qid, barcode: row.barcode, type: 'son' }
+            query: {
+              qqid: row.qqid,
+              qid: row.qid,
+              barcode: row.barcode,
+              type: "son"
+            }
           });
           window.open(routeUrl.href, "_blank");
         }
-
       } //  tl 倒查 1
       else if (row.querytype === "1") {
         // console.info("倒查", row.querytype);
@@ -571,14 +710,14 @@ export default {
           // 父级
           let routeUrl = this.$router.resolve({
             path: "/confirm/TL",
-            query: { qid: row.qid, qqid: row.qqid, type: 'father' }
+            query: { qid: row.qid, qqid: row.qqid, type: "father" }
           });
           window.open(routeUrl.href, "_blank");
         } else {
           // 子级
           let routeUrl = this.$router.resolve({
             path: "/confirm/TL",
-            query: { qid: row.qid, qqid: row.qqid, type: 'son' }
+            query: { qid: row.qid, qqid: row.qqid, type: "son" }
           });
           window.open(routeUrl.href, "_blank");
         }
@@ -590,22 +729,22 @@ export default {
         if (row.children) {
           let routeUrl = this.$router.resolve({
             path: "/confirm/LT",
-            query: { qid: row.qid, qqid: row.qqid, type: 'father' }
+            query: { qid: row.qid, qqid: row.qqid, type: "father" }
           });
           window.open(routeUrl.href, "_blank");
         } else {
           let routeUrl = this.$router.resolve({
             path: "/confirm/LT",
-            query: { qid: row.qid, qqid: row.qqid, type: 'son' }
+            query: { qid: row.qid, qqid: row.qqid, type: "son" }
           });
           window.open(routeUrl.href, "_blank");
         }
       }
     },
     // 编辑
-    edit () { },
+    edit() {},
     // 展开或关闭行
-    hadnlExpandChange (row, expanded) {
+    hadnlExpandChange(row, expanded) {
       // 获取展开标志
       this.expanded = expanded;
       // 获取下标
@@ -638,6 +777,7 @@ export default {
           qid: row.qid,
           children: row.children,
           queryId: row.queryId,
+
           barcode: row.children[0].barcode,
           maxcandidatecnt: row.children[0].maxcandidatecnt,
           querytype: row.children[0].querytype,
@@ -655,12 +795,12 @@ export default {
       }
     },
     // table表格选中获取数据
-    handleSelectionChange (val) {
+    handleSelectionChange(val) {
       this.selectionData = val;
     },
     // 复制条码号 获取选中条码值
-    getBarcode () {
-      let self = this
+    getBarcode() {
+      let self = this;
       this.barcode = [];
       // if (this.selectionData.length === 0) {
       //   this.$message.error("请选择需要复制条码号的数据！");
@@ -674,13 +814,13 @@ export default {
       } else {
         console.log(this.selectionData);
         self.selectionData.forEach(item => {
-          self.barcode.push(item.barcode)
-        })
-        this.barcode = this.barcode.join(',')
+          self.barcode.push(item.barcode);
+        });
+        this.barcode = this.barcode.join(",");
       }
     },
     // 复制成功时的回调函数
-    onCopy (e) {
+    onCopy(e) {
       this.$message({
         type: "success",
         // message: "复制条码号:" + this.barcode + "成功！"
@@ -688,27 +828,27 @@ export default {
       });
     },
     // 复制失败时的回调函数
-    onError (e) {
+    onError(e) {
       this.$message.error("抱歉，复制条码号失败！");
     },
     // 自定义展示列 多选框
-    changeCheckbox () {
+    changeCheckbox() {
       // console.info("默认", this.defaultTableProps);
       // console.info("table", this.tableProps);
       // console.info("选中", this.checkedProps);
     },
     // 当期页发生变化
-    handleCurrPageChange: function (val) {
+    handleCurrPageChange: function(val) {
       this.reqParam.page.currPage = val;
       this.search();
     },
     // 每页展示数量发生变化
-    handleSizeChange: function (val) {
+    handleSizeChange: function(val) {
       this.reqParam.page.pageSize = val;
       this.search();
     },
     // 标签关闭 isTag：是否为标签点击
-    handleClose (tag) {
+    handleClose(tag) {
       let { type, value } = tag;
       this.dynamicTags = this.dynamicTags.filter(item => item.value !== value);
       this.reqParam.contrastCustomSearchReq[
@@ -719,7 +859,7 @@ export default {
       this.search();
     },
     // 标签生成
-    tagClick (name) {
+    tagClick(name) {
       if (this.dynamicTags.indexOf(name) === -1) {
         this.dynamicTags.push(name);
       } else {
@@ -727,7 +867,7 @@ export default {
       }
     },
     // 全部状态
-    allQueryType () {
+    allQueryType() {
       let newdynamicTags = [];
       this.dynamicTags.forEach((item, index) => {
         if (item.type !== "querystates") {
@@ -739,17 +879,17 @@ export default {
       this.reqParam.contrastCustomSearchReq.querytypes = [];
       this.search();
     },
-    showHistory () {
+    showHistory() {
       this.historyDialogVisible = true;
     },
     // 全部数据
-    clearAll () {
+    clearAll() {
       this.dynamicTags = [];
       this.clearParams();
       this.search();
     },
     // 清空筛选条件
-    clearParams () {
+    clearParams() {
       // this.remoteFlag = null;
       this.startEndDate = null;
       this.reqParam.page.currPage = 1;
@@ -772,11 +912,11 @@ export default {
     //   this.tableProps = this.defaultTableProps;
     // },
     // 批量操作
-    batch () {
+    batch() {
       this.isSelected = !this.isSelected;
     }
   },
-  mounted () {
+  mounted() {
     this.search();
   }
 };

src/views/cxyrd/TT.vue

@@ -12,6 +12,7 @@
       <div class="data">
         <div class="source-data">
           <template v-for="(item, index) in sourcedatas">
+            <div v-if="sourcedatas.length > 0 && index === activeIndex3">
               <div class="source-top">
                 <div class="barcode">任务号：{{ qid }}</div>
                 <div class="count">
@@ -24,7 +25,7 @@
               </div>
               <div class="source-bottom">
                 <div class="source-count">
-                {{ index + 1 }}/{{ sourcedatas.length }}
+                  {{ activeIndex3 + 1 }}/{{ sourcedatas.length }}
                 </div>
                 <div class="source">
                   <div class="label">查询ID：</div>
@@ -65,28 +66,18 @@
                   </div>
                 </div>
               </div>
+            </div>
+            <!-- 数据加载中 -->
           </template>
         </div>
         <div class="btns">
-          <div
-            class="btn"
-            :class="isFinger === true ? 'active' : ''"
-            @click="finger"
-          >
+          <div class="btn" :class="isFinger === true" @click="finger">
             指纹
           </div>
-          <div
-            class="btn"
-            :class="isPlam === true ? 'active' : ''"
-            @click="plam"
-          >
+          <div class="btn" :class="isPlam === true" @click="plam">
             掌纹
           </div>
-          <div
-            class="btn"
-            :class="isFace === true ? 'active' : ''"
-            @click="face"
-          >
+          <div class="btn" :class="isFace === true" @click="face">
             人像
           </div>
           <br />
@@ -148,7 +139,11 @@
                 <!-- 源 左手 滚动 -->
                 <div v-for="(item, index) in sourceFingersLeftR">
                   <div class="finger-img" @click="showDetail">
-                    <img v-if="fingerLoading" src="@/assets/img/loading1.gif" />
+                    <img
+                      v-if="fingerLoading"
+                      src="@/assets/img/hand1.gif"
+                      style="width: 200px;height: 200px"
+                    />
                     <div v-else>
                       <!-- 有指纹图片 -->
                       <img
@@ -415,6 +410,7 @@ export default {
   },
   data() {
     return {
+      activeIndex3: 0,
       dataType: null,
       qid: null,
       currentQqid: null,
@@ -434,7 +430,7 @@ export default {
       destloading: false,
       dsetbarcode: "",
       sourcebarcode: "",
-      activeIndex: "1",
+      activeIndex: 1,
       sourcedatas: [],
       sourcedatasIndex: -1,
       sourcedatasLength: -1,
@@ -503,9 +499,11 @@ export default {
   created() {
     this.dataType = this.$route.query.type;
     this.qid = this.$route.query.qid;
+    this.currentQqid = this.$route.query.qqid;
     this.type = this.$route.query.type;
-    this.currentQqid = parseInt(this.$route.query.qqid);
+    // this.currentQqid = parseInt(this.$route.query.qqid);
     this.sourcebarcode = this.$route.query.barcode;
+    this.getSourceList();
     this.activeIndex = 1;
     console.log("源qid====>", this.qid);
     console.log("源qqid====>", this.currentQqid);
@@ -529,6 +527,7 @@ export default {
         let i = index;
         this.currentQqid = this.sourcedatas[i - 1].qqid;
         this.sourcebarcode = this.sourcedatas[i - 1].barcode;
+        this.activeIndex3 -= 1;
       } else {
         this.$message.error("已经是第一条数据了");
       }
@@ -542,6 +541,7 @@ export default {
       this.getSourcePlainFingerPrintDetail(this.sourcebarcode);
       // 获取候选列表
       this.getMatchcandList();
+
       console.info(this.currentQqid);
       console.info(this.sourcebarcode);
     },
@@ -551,6 +551,7 @@ export default {
         let i = index;
         this.currentQqid = this.sourcedatas[i + 1].qqid;
         this.sourcebarcode = this.sourcedatas[i + 1].barcode;
+        this.activeIndex3 += 1;
       } else {
         this.$message.error("已经是最后一条数据了");
       }
@@ -579,6 +580,8 @@ export default {
             if (res.data.code === 0) {
               me.sourcedatas = res.data.ret;
               me.sourcedatasLength = res.data.ret.length;
+              me.sourcebarcode = res.data.ret[0].barcode;
+              me.currentQqid = res.data.ret[0].qqid;
             }
             console.info("源数据", this.sourcedatas);
           });
@@ -600,7 +603,11 @@ export default {
     getMatchcandList() {
       let me = this;
       if (me.currentQqid !== null) {
-        me.$axios.get("/api/query/matchcand/" + me.currentQqid).then(res => {
+        me.$axios
+          .get(
+            "/api/query/matchcand/" + me.currentQqid + "/" + me.sourcebarcode
+          )
+          .then(res => {
             if (res.data.code === 0) {
               me.tableData = res.data.ret;
               me.$nextTick(() => {
@@ -855,7 +862,6 @@ export default {
     }
   },
   mounted() {
-    this.getSourceList();
     this.getSourceRollFingerPrintDetail(this.sourcebarcode);
     this.getSourcePlainFingerPrintDetail(this.sourcebarcode);
     this.getMatchcandList(this.currentQqid);