Commit fe359d35 by maxiaohan

查重 数据等待及样式调整

parent ed22752b
...@@ -36,7 +36,7 @@ _axios.interceptors.request.use( ...@@ -36,7 +36,7 @@ _axios.interceptors.request.use(
let token = localStorage.getItem("token"); let token = localStorage.getItem("token");
if (token) { if (token) {
config.headers.Authorization = token; config.headers.Authorization = token;
console.info(config); // console.info(config);
} }
return config; return config;
}, },
......
...@@ -12,81 +12,72 @@ ...@@ -12,81 +12,72 @@
<div class="data"> <div class="data">
<div class="source-data"> <div class="source-data">
<template v-for="(item, index) in sourcedatas"> <template v-for="(item, index) in sourcedatas">
<div class="source-top"> <div v-if="sourcedatas.length > 0 && index === activeIndex3">
<div class="barcode">任务号:{{ qid }}</div> <div class="source-top">
<div class="count"> <div class="barcode">任务号:{{ qid }}</div>
<img <div class="count">
src="../../assets/img/TT/ttcount.png"
style="width: 14px;height: 14px;margin:0 5px 3px 0"
/>已认定:{{ rdcount }}
<!-- />已认定:{{ qid }}条-->
</div>
</div>
<div class="source-bottom">
<div class="source-count">
{{ index + 1 }}/{{ sourcedatas.length }}
</div>
<div class="source">
<div class="label">查询ID:</div>
<div class="value">{{ currentQqid }}</div>
</div>
<div class="source">
<div class="label">源条码号:</div>
<div class="value">{{ sourcebarcode }}</div>
</div>
<div class="more">
<div class="last">
<img
v-show="index === 0"
@click="last(index)"
style=" cursor: pointer;"
src="../../assets/img/TT/last.png"
/>
<img <img
v-show="index > 0" src="../../assets/img/TT/ttcount.png"
style=" cursor: pointer;" style="width: 14px;height: 14px;margin:0 5px 3px 0"
src="../../assets/img/TT/last-active.png" />已认定:{{ rdcount }}
@click="last(index)" <!-- />已认定:{{ qid }}条-->
/>
</div> </div>
<div class="next"> </div>
<img <div class="source-bottom">
v-show="index === sourcedatas.length - 1" <div class="source-count">
style=" cursor: pointer;" {{ activeIndex3 + 1 }}/{{ sourcedatas.length }}
src="../../assets/img/TT/next.png" </div>
@click="next(index)" <div class="source">
/> <div class="label">查询ID:</div>
<img <div class="value">{{ currentQqid }}</div>
v-show="index < sourcedatas.length - 1" </div>
style=" cursor: pointer;" <div class="source">
src="../../assets/img/TT/next-active.png" <div class="label">源条码号:</div>
@click="next(index)" <div class="value">{{ sourcebarcode }}</div>
/> </div>
<div class="more">
<div class="last">
<img
v-show="index === 0"
@click="last(index)"
style=" cursor: pointer;"
src="../../assets/img/TT/last.png"
/>
<img
v-show="index > 0"
style=" cursor: pointer;"
src="../../assets/img/TT/last-active.png"
@click="last(index)"
/>
</div>
<div class="next">
<img
v-show="index === sourcedatas.length - 1"
style=" cursor: pointer;"
src="../../assets/img/TT/next.png"
@click="next(index)"
/>
<img
v-show="index < sourcedatas.length - 1"
style=" cursor: pointer;"
src="../../assets/img/TT/next-active.png"
@click="next(index)"
/>
</div>
</div> </div>
</div> </div>
</div> </div>
<!-- 数据加载中 -->
</template> </template>
</div> </div>
<div class="btns"> <div class="btns">
<div <div class="btn" :class="isFinger === true" @click="finger">
class="btn"
:class="isFinger === true ? 'active' : ''"
@click="finger"
>
指纹 指纹
</div> </div>
<div <div class="btn" :class="isPlam === true" @click="plam">
class="btn"
:class="isPlam === true ? 'active' : ''"
@click="plam"
>
掌纹 掌纹
</div> </div>
<div <div class="btn" :class="isFace === true" @click="face">
class="btn"
:class="isFace === true ? 'active' : ''"
@click="face"
>
人像 人像
</div> </div>
<br /> <br />
...@@ -148,7 +139,11 @@ ...@@ -148,7 +139,11 @@
<!-- 源 左手 滚动 --> <!-- 源 左手 滚动 -->
<div v-for="(item, index) in sourceFingersLeftR"> <div v-for="(item, index) in sourceFingersLeftR">
<div class="finger-img" @click="showDetail"> <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> <div v-else>
<!-- 有指纹图片 --> <!-- 有指纹图片 -->
<img <img
...@@ -415,6 +410,7 @@ export default { ...@@ -415,6 +410,7 @@ export default {
}, },
data() { data() {
return { return {
activeIndex3: 0,
dataType: null, dataType: null,
qid: null, qid: null,
currentQqid: null, currentQqid: null,
...@@ -434,7 +430,7 @@ export default { ...@@ -434,7 +430,7 @@ export default {
destloading: false, destloading: false,
dsetbarcode: "", dsetbarcode: "",
sourcebarcode: "", sourcebarcode: "",
activeIndex: "1", activeIndex: 1,
sourcedatas: [], sourcedatas: [],
sourcedatasIndex: -1, sourcedatasIndex: -1,
sourcedatasLength: -1, sourcedatasLength: -1,
...@@ -503,9 +499,11 @@ export default { ...@@ -503,9 +499,11 @@ export default {
created() { created() {
this.dataType = this.$route.query.type; this.dataType = this.$route.query.type;
this.qid = this.$route.query.qid; this.qid = this.$route.query.qid;
this.currentQqid = this.$route.query.qqid;
this.type = this.$route.query.type; 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.sourcebarcode = this.$route.query.barcode;
this.getSourceList();
this.activeIndex = 1; this.activeIndex = 1;
console.log("源qid====>", this.qid); console.log("源qid====>", this.qid);
console.log("源qqid====>", this.currentQqid); console.log("源qqid====>", this.currentQqid);
...@@ -529,6 +527,7 @@ export default { ...@@ -529,6 +527,7 @@ export default {
let i = index; let i = index;
this.currentQqid = this.sourcedatas[i - 1].qqid; this.currentQqid = this.sourcedatas[i - 1].qqid;
this.sourcebarcode = this.sourcedatas[i - 1].barcode; this.sourcebarcode = this.sourcedatas[i - 1].barcode;
this.activeIndex3 -= 1;
} else { } else {
this.$message.error("已经是第一条数据了"); this.$message.error("已经是第一条数据了");
} }
...@@ -542,6 +541,7 @@ export default { ...@@ -542,6 +541,7 @@ export default {
this.getSourcePlainFingerPrintDetail(this.sourcebarcode); this.getSourcePlainFingerPrintDetail(this.sourcebarcode);
// 获取候选列表 // 获取候选列表
this.getMatchcandList(); this.getMatchcandList();
console.info(this.currentQqid); console.info(this.currentQqid);
console.info(this.sourcebarcode); console.info(this.sourcebarcode);
}, },
...@@ -551,6 +551,7 @@ export default { ...@@ -551,6 +551,7 @@ export default {
let i = index; let i = index;
this.currentQqid = this.sourcedatas[i + 1].qqid; this.currentQqid = this.sourcedatas[i + 1].qqid;
this.sourcebarcode = this.sourcedatas[i + 1].barcode; this.sourcebarcode = this.sourcedatas[i + 1].barcode;
this.activeIndex3 += 1;
} else { } else {
this.$message.error("已经是最后一条数据了"); this.$message.error("已经是最后一条数据了");
} }
...@@ -579,6 +580,8 @@ export default { ...@@ -579,6 +580,8 @@ export default {
if (res.data.code === 0) { if (res.data.code === 0) {
me.sourcedatas = res.data.ret; me.sourcedatas = res.data.ret;
me.sourcedatasLength = res.data.ret.length; me.sourcedatasLength = res.data.ret.length;
me.sourcebarcode = res.data.ret[0].barcode;
me.currentQqid = res.data.ret[0].qqid;
} }
console.info("源数据", this.sourcedatas); console.info("源数据", this.sourcedatas);
}); });
...@@ -600,15 +603,19 @@ export default { ...@@ -600,15 +603,19 @@ export default {
getMatchcandList() { getMatchcandList() {
let me = this; let me = this;
if (me.currentQqid !== null) { if (me.currentQqid !== null) {
me.$axios.get("/api/query/matchcand/" + me.currentQqid).then(res => { me.$axios
if (res.data.code === 0) { .get(
me.tableData = res.data.ret; "/api/query/matchcand/" + me.currentQqid + "/" + me.sourcebarcode
me.$nextTick(() => { )
me.$refs.singleTable.setCurrentRow(me.tableData[0]); .then(res => {
}); if (res.data.code === 0) {
} me.tableData = res.data.ret;
console.info(" 候选列表", res); me.$nextTick(() => {
}); me.$refs.singleTable.setCurrentRow(me.tableData[0]);
});
}
console.info(" 候选列表", res);
});
} }
}, },
...@@ -855,7 +862,6 @@ export default { ...@@ -855,7 +862,6 @@ export default {
} }
}, },
mounted() { mounted() {
this.getSourceList();
this.getSourceRollFingerPrintDetail(this.sourcebarcode); this.getSourceRollFingerPrintDetail(this.sourcebarcode);
this.getSourcePlainFingerPrintDetail(this.sourcebarcode); this.getSourcePlainFingerPrintDetail(this.sourcebarcode);
this.getMatchcandList(this.currentQqid); this.getMatchcandList(this.currentQqid);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment