Skip to content

F
founder_vue
Commit c72472bb by li_hongchao
Options

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

parents 7df00e69 bc75c714
Showing with 188 additions and 181 deletions
src/views/cxyrd/TT.vue
...@@ -121,7 +121,11 @@ ...@@ -121,7 +121,11 @@
{{ scope.$index + 1 }} {{ scope.$index + 1 }}
</div> </div>
</el-table-column> </el-table-column>
<el-table-column prop="score" label="得分" :width="!roleArr.includes('C-1-7')?'auto':width1"> <el-table-column
prop="score"
label="得分"
:width="!roleArr.includes('C-1-7') ? 'auto' : width1"
>
<div <div
class="del" class="del"
slot-scope="scope" slot-scope="scope"
...@@ -1405,13 +1409,13 @@ export default { ...@@ -1405,13 +1409,13 @@ export default {
//console.info("目标plan", response.data.ret); //console.info("目标plan", response.data.ret);
response.data.ret.forEach((element, index) => { response.data.ret.forEach((element, index) => {
// 目标 左手 平面 // 目标 左手 平面
self.destFingersLeftL.forEach((item) => { self.destFingersLeftR.forEach((item) => {
if (item.code == element.seq) { if (item.code == element.seq) {
item.img = element.image; item.img = element.image;
} }
}); });
// 目标 右手 平面 // 目标 右手 平面
self.destFingersRightL.forEach((item) => { self.destFingersRightR.forEach((item) => {
if (item.code == element.seq) { if (item.code == element.seq) {
item.img = element.image; item.img = element.image;
} }
...@@ -1441,13 +1445,13 @@ export default { ...@@ -1441,13 +1445,13 @@ export default {
//console.info("目标roll", response.data.ret); //console.info("目标roll", response.data.ret);
response.data.ret.forEach((element, index) => { response.data.ret.forEach((element, index) => {
// 目标 左手 滚动 // 目标 左手 滚动
self.destFingersLeftR.forEach((item) => { self.destFingersLeftL.forEach((item) => {
if (item.code == element.seq) { if (item.code == element.seq) {
item.img = element.image; item.img = element.image;
} }
}); });
// 目标 右手 滚动 // 目标 右手 滚动
self.destFingersRightR.forEach((item) => { self.destFingersRightL.forEach((item) => {
if (item.code == element.seq) { if (item.code == element.seq) {
item.img = element.image; item.img = element.image;
} }
......
src/views/cxyrd/modules/LLCandidate.vue
...@@ -67,20 +67,22 @@ ...@@ -67,20 +67,22 @@
</el-table-column> </el-table-column>
<el-table-column prop="destseqno" label="序号" :width="!roleArr.includes('C-1-7')?'auto':width3"> <el-table-column prop="destseqno" label="序号" :width="!roleArr.includes('C-1-7')?'auto':width3">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="scope.row.destseqno">
<span v-if="scope.row.removeFlag === 1"> <span v-if="scope.row.removeFlag === 1">
<del>{{ <del>{{
scope.$index + 1 >= 9 scope.row.destseqno > 9
? scope.$index + 1 ? scope.row.destseqno
: "0" + (scope.$index + 1) : "0" + scope.row.destseqno
}}</del> }}</del>
</span> </span>
<span v-else> <span v-else>
{{ {{
scope.$index + 1 >= 9 scope.row.destseqno > 9
? scope.$index + 1 ? scope.row.destseqno
: "0" + (scope.$index + 1) : "0" + scope.row.destseqno
}} }}
</span> </span>
</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
......
src/views/cxyrd/modules/Recognition_dialog.vue
...@@ -112,26 +112,64 @@ export default { ...@@ -112,26 +112,64 @@ export default {
}, },
}) })
.then((res) => { .then((res) => {
if (res.data.code == 0 && res.data.message == 'success'){ let result = res.data.ret;
if (res.data.code == 0 && res.data.message == "success") {
//人人查重 //人人查重
if (form.originCodeType == "0" && form.targetCodeType == "0") { if (form.originCodeType == "0" && form.targetCodeType == "0") {
self.$router.pushToTab("/rgTT"); self.$router.pushToTab({
path: "/rgTT",
query: {
qid: result.qid,
qqid: result.qqid,
barcode: result.srcbarcode,
type: "son",
},
});
//人案倒查 //人案倒查
} else if (form.originCodeType == "0" && form.targetCodeType == "1") { } else if (
self.$router.pushToTab("/rgTL"); form.originCodeType == "0" &&
form.targetCodeType == "1"
) {
self.$router.pushToTab({
path: "/rgTL",
query: {
qid: result.qid,
qqid: result.qqid,
type: "son",
},
});
//案人正查 //案人正查
} else if (form.originCodeType == "1" && form.targetCodeType == "0") { } else if (
self.$router.pushToTab("/rgLT"); form.originCodeType == "1" &&
form.targetCodeType == "0"
) {
self.$router.pushToTab({
path: "/rgLT",
query: {
qid: result.qid,
qqid: result.qqid,
type: "son",
},
});
//案案串查 //案案串查
} else if (form.originCodeType == "1" && form.targetCodeType == "1") { } else if (
self.$router.pushToTab("/rgLL"); form.originCodeType == "1" &&
form.targetCodeType == "1"
) {
self.$router.pushToTab({
path: "/rgLL",
query: {
qid: result.qid,
qqid: result.qqid,
type: "son",
},
});
} }
self.dialogVisible = false self.dialogVisible = false;
} else{ } else {
this.$message.error(res.data.message) this.$message.error(res.data.message);
} }
}); });
} }
}); });
}, },
......
src/views/rgrd/modules/LLCandidate.vue
...@@ -37,20 +37,22 @@ ...@@ -37,20 +37,22 @@
> >
<el-table-column prop="destseqno" label="序号" :width="width3"> <el-table-column prop="destseqno" label="序号" :width="width3">
<template slot-scope="scope"> <template slot-scope="scope">
<div>
<span v-if="scope.row.removeFlag === 1"> <span v-if="scope.row.removeFlag === 1">
<del>{{ <del>{{
scope.$index + 1 >= 9 scope.row.destseqno > 9
? scope.$index + 1 ? scope.row.destseqno
: "0" + (scope.$index + 1) : "0" + scope.row.destseqno
}}</del> }}</del>
</span> </span>
<span v-else> <span v-else>
{{ {{
scope.$index + 1 >= 9 scope.row.destseqno > 9
? scope.$index + 1 ? scope.row.destseqno
: "0" + (scope.$index + 1) : "0" + scope.row.destseqno
}} }}
</span> </span>
</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -60,6 +62,7 @@ ...@@ -60,6 +62,7 @@
v-if="roleArr.includes('C-1-7')" v-if="roleArr.includes('C-1-7')"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="scope.$index == 0">
<!-- 被删除--> <!-- 被删除-->
<span v-if="scope.row.removeFlag === 1"> <span v-if="scope.row.removeFlag === 1">
<del>{{ scope.row.destbarcode }}</del> <del>{{ scope.row.destbarcode }}</del>
...@@ -67,6 +70,7 @@ ...@@ -67,6 +70,7 @@
<span v-else> <span v-else>
{{ scope.row.destbarcode }} {{ scope.row.destbarcode }}
</span> </span>
</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -1052,13 +1056,13 @@ export default { ...@@ -1052,13 +1056,13 @@ export default {
sessionStorage.setItem("destseqno", val.destseqno); sessionStorage.setItem("destseqno", val.destseqno);
self.$store.commit("loading/setLoading", true); self.$store.commit("loading/setLoading", true);
/////////////////////////////// ///////////////////////////////
if (self.fingerShowType == "指纹") { if (val.destseqno <= 99) {
//案件指纹 //案件指纹
this.$axios this.$axios
.post("/api/org/case/barcode/seqNo", { .post("/api/org/case/barcode/seqNo", {
barcode: val.destbarcode, barcode: val.destbarcode,
seqno: val.destseqno, seqno: val.destseqno,
qqid: val.qqid, qqid: sessionStorage.getItem("qqid"),
}) })
.then((response) => { .then((response) => {
self.$bus.emit( self.$bus.emit(
...@@ -1071,7 +1075,7 @@ export default { ...@@ -1071,7 +1075,7 @@ export default {
self.$store.commit("loading/setLoading", false); self.$store.commit("loading/setLoading", false);
}, 500); }, 500);
} else { } else {
//案件指纹 //案件掌纹
this.$axios this.$axios
.post("/api/org/case/palm/barcode/seq", { .post("/api/org/case/palm/barcode/seq", {
barcode: val.destbarcode, barcode: val.destbarcode,
...@@ -1089,14 +1093,6 @@ export default { ...@@ -1089,14 +1093,6 @@ export default {
self.$store.commit("loading/setLoading", false); self.$store.commit("loading/setLoading", false);
}, 500); }, 500);
} }
// this.$axios.get(`/api/api/org/plainByBarcode/R1100002487002018050034/1/`)
// this.$axios
// .get(`/api/org/plainByBarcode/${val.destbarcode}/${val.destseqno}`)
// .then(response => {
// //console.log(response);
// self.$bus.emit("changImageEditTarget", response.data.ret.image);
// });
} else { } else {
this.$bus.emit("changImageEditTarget", "xxx"); this.$bus.emit("changImageEditTarget", "xxx");
} }
......
src/views/rgrd/modules/LLSrc.vue
...@@ -74,6 +74,7 @@ ...@@ -74,6 +74,7 @@
fingerRB: item.affirmstatus == 3, fingerRB: item.affirmstatus == 3,
}" }"
v-for="(item, index) in enumerate" v-for="(item, index) in enumerate"
v-show="item.image"
@click="changeStyle(index, item)" @click="changeStyle(index, item)"
:key="index" :key="index"
> >
...@@ -89,7 +90,9 @@ ...@@ -89,7 +90,9 @@
> >
{{ Number(item.seq + 1) &lt; 11 ? ("0" + Number(item.seq)) : Number(item.seq) }} {{ Number(item.seq + 1) &lt; 11 ? ("0" + Number(item.seq)) : Number(item.seq) }}
</div> </div>
<img :src="'data:image/jpeg;base64,' + item.image" /> <img
:src="'data:image/jpeg;base64,' + item.image"
/>
<div class="finger-tips"> <div class="finger-tips">
<!-- 认定完成 --> <!-- 认定完成 -->
<div class="affirmstatus1" v-if="item.affirmstatus == 1"> <div class="affirmstatus1" v-if="item.affirmstatus == 1">
...@@ -363,9 +366,11 @@ export default { ...@@ -363,9 +366,11 @@ export default {
// 发送请求 // 发送请求
self.$store.commit("loading/setLoading", true); self.$store.commit("loading/setLoading", true);
this.$axios this.$axios
.post(`/api/query/matchcand/dest/${self.qqid}/${imageInfo.seq}`, { .post(
srcbarcode: sessionStorage.getItem("srcbarcode"), `/api/queryIdentification/matchcand/dest?qqid=${
}) self.qqid
}&barcode=${sessionStorage.getItem("srcbarcode")}`
)
.then((response) => { .then((response) => {
//console.log(response); //console.log(response);
self.$bus.emit("initCandidate", response.data.ret); self.$bus.emit("initCandidate", response.data.ret);
...@@ -511,9 +516,11 @@ export default { ...@@ -511,9 +516,11 @@ export default {
// 发送请求 // 发送请求
self.$store.commit("loading/setLoading", true); self.$store.commit("loading/setLoading", true);
this.$axios this.$axios
.post(`/api/query/matchcand/dest/${self.qqid}/${imageInfo.seq}`, { .post(
srcbarcode: sessionStorage.getItem("srcbarcode"), `/api/queryIdentification/matchcand/dest?qqid=${
}) self.qqid
}&barcode=${sessionStorage.getItem("srcbarcode")}`
)
.then((response) => { .then((response) => {
//console.log(response); //console.log(response);
self.$bus.emit("initCandidate", response.data.ret); self.$bus.emit("initCandidate", response.data.ret);
......
src/views/rgrd/modules/LTSrc.vue
<template> <template>
<div class="lt_src"> <div class="lt_src">
<div class="lt_top">
<label class="rwh">任务号：{{ rwh }}</label>
<el-checkbox v-model="checked">显示已认定完成查询ID</el-checkbox>
</div>
<div class="lt_middle"> <div class="lt_middle">
<!-- 源数据区 --> <!-- 源数据区 -->
<div class="lt_middle_src_data"> <div class="lt_middle_src_data">
...@@ -16,11 +12,6 @@ ...@@ -16,11 +12,6 @@
@row-click="getFirgerPrintDetail" @row-click="getFirgerPrintDetail"
:row-class-name="tableRowClassName" :row-class-name="tableRowClassName"
> >
<el-table-column
prop="qqid"
label="查询ID"
:width="width1"
></el-table-column>
<el-table-column prop="barcode" label="源条码号" width="auto"> <el-table-column prop="barcode" label="源条码号" width="auto">
<template slot-scope="scope"> <template slot-scope="scope">
<!-- 被删除--> <!-- 被删除-->
...@@ -94,7 +85,7 @@ ...@@ -94,7 +85,7 @@
}" }"
> >
<!-- {{ Number(index + 1) &lt; 9 ? ("0" + Number(index + 1)) : Number(index + 1) }} --> <!-- {{ Number(index + 1) &lt; 9 ? ("0" + Number(index + 1)) : Number(index + 1) }} -->
{{ Number(item.seq + 1) &lt; 9 ? ("0" + Number(item.seq + 1)) : Number(item.seq + 1) }} {{ Number(item.seq) &lt; 9 ? ("0" + Number(item.seq)) : Number(item.seq) }}
</div> </div>
<img :src="'data:image/jpeg;base64,' + item.image" /> <img :src="'data:image/jpeg;base64,' + item.image" />
<div class="finger-tips"> <div class="finger-tips">
...@@ -132,7 +123,7 @@ ...@@ -132,7 +123,7 @@
<div <div
class="finger_print_zw" class="finger_print_zw"
:class="{ :class="{
finger_print_active_zw: index === isActive, finger_print_active_zw: item.seq === isActive,
fingerLook: item.clickLog == 1, fingerLook: item.clickLog == 1,
fingerRD: item.affirmstatus == 1, fingerRD: item.affirmstatus == 1,
fingerBZ: item.affirmstatus == 2, fingerBZ: item.affirmstatus == 2,
...@@ -145,7 +136,7 @@ ...@@ -145,7 +136,7 @@
<div <div
class="finger_print_number" class="finger_print_number"
:class="{ :class="{
finger_print_number_active: index === isActive, finger_print_number_active: item.seq === isActive,
fingerLookNum: item.clickLog == 1, fingerLookNum: item.clickLog == 1,
fingerRDNum: item.affirmstatus == 1, fingerRDNum: item.affirmstatus == 1,
fingerBZNum: item.affirmstatus == 2, fingerBZNum: item.affirmstatus == 2,
...@@ -333,6 +324,7 @@ export default { ...@@ -333,6 +324,7 @@ export default {
handleCurrentChange(val, old) { handleCurrentChange(val, old) {
let self = this; let self = this;
this.fingerShowType = "指纹"; this.fingerShowType = "指纹";
if (val != null) {
// 被删除 // 被删除
if (val.removeFlag === 1) { if (val.removeFlag === 1) {
this.isDelete = true; this.isDelete = true;
...@@ -374,7 +366,6 @@ export default { ...@@ -374,7 +366,6 @@ export default {
.catch((err) => { .catch((err) => {
console.log(err); console.log(err);
}); });
// 请求该条码号的案件指纹图片 // 请求该条码号的案件指纹图片
self self
.$axios({ .$axios({
...@@ -395,14 +386,12 @@ export default { ...@@ -395,14 +386,12 @@ export default {
sessionStorage.setItem("srcseqno", imageInfo.seq); sessionStorage.setItem("srcseqno", imageInfo.seq);
sessionStorage.setItem("zcseq", imageInfo.seq); sessionStorage.setItem("zcseq", imageInfo.seq);
} }
self self
.$axios({ .$axios({
method: "post", method: "post",
url: `/api/query/matchcand/dest/${self.qqid}/${imageInfo.seq}`, url: `/api/queryIdentification/matchcand/dest?qqid=${
data: { self.qqid
srcbarcode: sessionStorage.getItem("srcbarcode"), }&barcode=${sessionStorage.getItem("srcbarcode")}`,
},
}) })
.then((response) => { .then((response) => {
if (response.data.code === 0) { if (response.data.code === 0) {
...@@ -465,6 +454,7 @@ export default { ...@@ -465,6 +454,7 @@ export default {
}); });
self.isActive = ""; self.isActive = "";
} }
}
}, },
/** /**
* @description: 获取列表数据 * @description: 获取列表数据
...@@ -540,10 +530,9 @@ export default { ...@@ -540,10 +530,9 @@ export default {
// 发送请求 // 发送请求
this.$axios({ this.$axios({
method: "post", method: "post",
url: `/api/query/matchcand/dest/${self.qqid}/${imageInfo.seq}`, url: `/api/queryIdentification/matchcand/dest?qqid=${
data: { self.qqid
srcbarcode: sessionStorage.getItem("srcbarcode"), }&barcode=${sessionStorage.getItem("srcbarcode")}`,
},
}).then((response) => { }).then((response) => {
if (response.data.code === 0) { if (response.data.code === 0) {
self.$bus.emit("initCandidate", response.data.ret); self.$bus.emit("initCandidate", response.data.ret);
...@@ -581,6 +570,18 @@ export default { ...@@ -581,6 +570,18 @@ export default {
}, },
}, },
watch: { watch: {
// 监听指掌纹类型
fingerShowType: {
immediate: true,
handler(val) {
//console.info("源数据传入组件的值为===>", val);
if (val == "掌纹") {
this.$bus.emit("searchTypeLT", "掌纹");
} else {
this.$bus.emit("searchTypeLT", "指纹");
}
},
},
/** /**
* @description: 过滤显示已认定完成查询ID * @description: 过滤显示已认定完成查询ID
* @param {*} newValue * @param {*} newValue
...@@ -673,7 +674,7 @@ const datas = [ ...@@ -673,7 +674,7 @@ const datas = [
.lt_top { .lt_top {
width: 100%; width: 100%;
margin: 0 0 10px 0; margin: 0 0 10px 0;
visibility: hidden;
.rwh { .rwh {
font-size: 14px; font-size: 14px;
font-family: MicrosoftYaHei-Bold, MicrosoftYaHei; font-family: MicrosoftYaHei-Bold, MicrosoftYaHei;
...@@ -692,10 +693,8 @@ const datas = [ ...@@ -692,10 +693,8 @@ const datas = [
.lt_middle_src_data { .lt_middle_src_data {
border-radius: 8px; border-radius: 8px;
width: 100%; width: 100%;
height: 360px; height: 320px;
.el-table { padding-top: 35px;
height: 360px;
}
.Bizhong { .Bizhong {
.cell { .cell {
color: #ff0039; color: #ff0039;
...@@ -761,7 +760,10 @@ const datas = [ ...@@ -761,7 +760,10 @@ const datas = [
margin-top: 12px; margin-top: 12px;
overflow-y: auto; overflow-y: auto;
width: 100%; width: 100%;
height: 360px; height: 390px;
.finger_print_number_active {
background: #055fe7;
}
} }
} }
...@@ -797,8 +799,12 @@ const datas = [ ...@@ -797,8 +799,12 @@ const datas = [
font-size: 12px; font-size: 12px;
font-family: MicrosoftYaHei; font-family: MicrosoftYaHei;
color: #055fe7; color: #055fe7;
span {
cursor: pointer;
}
.ico { .ico {
cursor: pointer;
transform: rotate(0deg); transform: rotate(0deg);
margin-left: 5px; margin-left: 5px;
width: 10px; width: 10px;
...@@ -806,6 +812,7 @@ const datas = [ ...@@ -806,6 +812,7 @@ const datas = [
display: flex; display: flex;
img { img {
cursor: pointer;
object-fit: cover; object-fit: cover;
width: 100%; width: 100%;
height: 100%; height: 100%;
......
src/views/rgrd/rgLL.vue
...@@ -384,12 +384,12 @@ export default { ...@@ -384,12 +384,12 @@ export default {
}, },
}) })
.then((response) => { .then((response) => {
if(response.data.code == 0){ if (response.data.code == 0) {
// 跟新列表数据 // 跟新列表数据
self.$bus.emit("updateFinderSource"); self.$bus.emit("updateFinderSource");
this.$message.success("比中成功！"); this.$message.success("比中成功！");
}else{ } else {
this.$message.error(response.data.message) this.$message.error(response.data.message);
} }
}) })
.catch((err) => { .catch((err) => {
...@@ -486,7 +486,6 @@ export default { ...@@ -486,7 +486,6 @@ export default {
this.xh = sessionStorage.getItem("srcseqno"); this.xh = sessionStorage.getItem("srcseqno");
this.rybh = sessionStorage.getItem("destbarcode"); this.rybh = sessionStorage.getItem("destbarcode");
this.judgeZw(Number(sessionStorage.getItem("destseqno"))); this.judgeZw(Number(sessionStorage.getItem("destseqno")));
this.isShowbzDialogBg = true; this.isShowbzDialogBg = true;
this.isShowbzDialog = true; this.isShowbzDialog = true;
}, },
...@@ -497,26 +496,8 @@ export default { ...@@ -497,26 +496,8 @@ export default {
*/ */
Rdwc() { Rdwc() {
//console.log("认定完成"); //console.log("认定完成");
let qqid = sessionStorage.getItem("qqid") || ""; this.$message.success("认定完成");
// 认定之前的操作 // this.confirmrdwc();
this.$axios({
method: "post",
url: "/api/matchcand/affirm/confirm",
data: {
qqid,
},
loading: false,
}).then((res) => {
//console.log(res);
if (!res.data.ret) {
this.isShowbzDialogBg = true;
// this.isShowrdwcDialogBg = true;
this.isShowrdwcDialog = true;
} else {
// 执行认定完成
this.confirmrdwc();
}
});
}, },
/** /**
* @description: 更具code判断指位 * @description: 更具code判断指位
......
src/views/rgrd/rgLT.vue
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
<div class="bzvalue">{{ xh }}</div> <div class="bzvalue">{{ xh }}</div>
</div> </div>
<div class="bzitem"> <div class="bzitem">
<div class="bzname">指位：</div> <div class="bzname">指/掌位：</div>
<div class="bzvalue">{{ zw }}</div> <div class="bzvalue">{{ zw }}</div>
</div> </div>
</div> </div>
...@@ -181,7 +181,7 @@ export default { ...@@ -181,7 +181,7 @@ export default {
//console.log("源qid====>", this.qid); //console.log("源qid====>", this.qid);
this.userInfo = JSON.parse(localStorage.getItem('userInfo')) this.userInfo = JSON.parse(localStorage.getItem('userInfo'))
console.log(this.userInfo); console.log(this.userInfo);
if(this.userInfo) { if (this.userInfo) {
this.bzr = this.userInfo.name this.bzr = this.userInfo.name
this.bzdw = this.userInfo.unitName this.bzdw = this.userInfo.unitName
this.dwdm = this.userInfo.unitCode this.dwdm = this.userInfo.unitCode
...@@ -281,8 +281,8 @@ export default { ...@@ -281,8 +281,8 @@ export default {
confirmbz () { confirmbz () {
let self = this; let self = this;
let srcseqno = Number(sessionStorage.getItem("srcseqno")); let srcseqno = Number(sessionStorage.getItem("srcseqno"));
// let destseqno = Number(sessionStorage.getItem("destseqno")); let destseqno = Number(sessionStorage.getItem("destseqno"));
let destseqno = this.xh // let destseqno = this.xh
let srcbarcode = sessionStorage.getItem("srcbarcode") || ""; let srcbarcode = sessionStorage.getItem("srcbarcode") || "";
let destbarcode = sessionStorage.getItem("destbarcode") || ""; let destbarcode = sessionStorage.getItem("destbarcode") || "";
let qqid = Number(sessionStorage.getItem("qqid")); let qqid = Number(sessionStorage.getItem("qqid"));
...@@ -294,6 +294,11 @@ export default { ...@@ -294,6 +294,11 @@ export default {
let unitCode = this.dwdm let unitCode = this.dwdm
let affirmtime = new Date(this.bzsj) let affirmtime = new Date(this.bzsj)
let affirmDescribe = this.textarea let affirmDescribe = this.textarea
if (!destbarcode) {
this.$message.error("信息不全,无法比中！");
return;
}
// 2：正查 // 2：正查
let queryType = 2; let queryType = 2;
this.$axios({ this.$axios({
...@@ -391,8 +396,12 @@ export default { ...@@ -391,8 +396,12 @@ export default {
* @return {*} * @return {*}
*/ */
async Bz () { async Bz () {
if(this.bzData == null) return; if(this.bzData == null) {
if(this.bzData.affirmstatus == '2' || this.bzData.affirmstatus == '3'){ this.$message.error("信息不全无法比中！");
return
};
if (this.bzData.affirmstatus == '2' || this.bzData.affirmstatus == '3') {
this.$message.error("已经比中过的数据无法再次比中！");
return return
} }
// this.getUserInfo2(); // this.getUserInfo2();
...@@ -418,26 +427,7 @@ export default { ...@@ -418,26 +427,7 @@ export default {
*/ */
Rdwc () { Rdwc () {
//console.log("认定完成"); //console.log("认定完成");
let qqid = sessionStorage.getItem("qqid") || ""; this.$message.success('认定完成')
// 认定之前的操作
this.$axios({
method: "post",
url: "/api/matchcand/affirm/confirm",
data: {
qqid
},
loading: false
}).then(res => {
//console.log(res);
if (!res.data.ret) {
this.isShowrdwcDialogBg = true;
this.isShowrdwcDialog = true;
} else {
// 执行认定完成
this.confirmrdwc();
}
});
}, },
/** /**
* @description: 更具code判断指位 * @description: 更具code判断指位
...@@ -507,6 +497,18 @@ export default { ...@@ -507,6 +497,18 @@ export default {
case 20: case 20:
this.zw = "平面-左小"; this.zw = "平面-左小";
break; break;
case 31:
this.zw = "右半掌";
break;
case 32:
this.zw = "左半掌";
break;
case 33:
this.zw = "右侧掌";
break;
case 34:
this.zw = "右半掌";
break;
} }
} }
}, },
......
src/views/rgrd/rgTL.vue
...@@ -305,6 +305,11 @@ export default { ...@@ -305,6 +305,11 @@ export default {
let affirmtime = new Date(this.bzsj); let affirmtime = new Date(this.bzsj);
let affirmDescribe = this.textarea; let affirmDescribe = this.textarea;
if (!destbarcode) {
this.$message.error("信息不全,无法比中！");
return;
}
// 1：倒查 // 1：倒查
let queryType = 1; let queryType = 1;
this.$axios({ this.$axios({
...@@ -372,8 +377,12 @@ export default { ...@@ -372,8 +377,12 @@ export default {
* @return {*} * @return {*}
*/ */
async Bz() { async Bz() {
if (this.bzData == null) return; if (this.bzData == null) {
this.$message.error("信息不全无法比中！");
return;
}
if (this.bzData.affirmstatus == "2" || this.bzData.affirmstatus == "3") { if (this.bzData.affirmstatus == "2" || this.bzData.affirmstatus == "3") {
this.$message.error("已经比中过的数据无法再次比中！");
return; return;
} }
//console.info("比中"); //console.info("比中");
...@@ -397,28 +406,7 @@ export default { ...@@ -397,28 +406,7 @@ export default {
this.isShowbzDialog = true; this.isShowbzDialog = true;
}, },
Rdwc() { Rdwc() {
//console.info("认定完成"); this.$message.success('认定完成')
//console.log("认定完成");
let qqid = sessionStorage.getItem("qqid") || "";
// 认定之前的操作
this.$axios({
method: "post",
url: "/api/matchcand/affirm/confirm",
data: {
qqid,
},
loading: false,
}).then((res) => {
//console.log(res);
if (!res.data.ret) {
this.isShowrdwcDialogBg = true;
this.isShowrdwcDialog = true;
} else {
// 执行认定完成
this.confirmrdwc();
}
});
}, },
hideDialog() { hideDialog() {
this.dialog = true; this.dialog = true;
......
src/views/rgrd/rgTT.vue
...@@ -1191,7 +1191,6 @@ export default { ...@@ -1191,7 +1191,6 @@ export default {
} else { } else {
this.souceDel = false; this.souceDel = false;
} }
me.getMatchcandList(me.currentQqid); me.getMatchcandList(me.currentQqid);
this.getSourceRollFingerPrintDetail( this.getSourceRollFingerPrintDetail(
res.data.ret[0].barcode, res.data.ret[0].barcode,
...@@ -1219,10 +1218,13 @@ export default { ...@@ -1219,10 +1218,13 @@ export default {
.then((res) => { .then((res) => {
me.loadingIndex--; me.loadingIndex--;
if (res.data.code == 0) { if (res.data.code == 0) {
debugger;
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.sourcebarcode = res.data.ret[0].barcode;
//console.log(222); me.currentQqid = res.data.ret[0].qqid;
me.sourceObj = res.data.ret[0];
me.$set(me.sourcedatas[0], "clickLog", 1);
if (res.data.ret[0].removeFlag == "1") { if (res.data.ret[0].removeFlag == "1") {
this.souceDel = true; this.souceDel = true;
this.souceDelText = this.$moment( this.souceDelText = this.$moment(
...@@ -1364,14 +1366,14 @@ export default { ...@@ -1364,14 +1366,14 @@ export default {
if (response.data.code == 0) { if (response.data.code == 0) {
//console.info("目标plan", response.data.ret); //console.info("目标plan", response.data.ret);
response.data.ret.forEach((element, index) => { response.data.ret.forEach((element, index) => {
// 目标 左手 平面 // 目标 左手 滚动
self.destFingersLeftL.forEach((item) => { self.destFingersLeftR.forEach((item) => {
if (item.code == element.seq) { if (item.code == element.seq) {
item.img = element.image; item.img = element.image;
} }
}); });
// 目标 右手 平面 // 目标 右手 滚动
self.destFingersRightL.forEach((item) => { self.destFingersRightR.forEach((item) => {
if (item.code == element.seq) { if (item.code == element.seq) {
item.img = element.image; item.img = element.image;
} }
...@@ -1401,13 +1403,13 @@ export default { ...@@ -1401,13 +1403,13 @@ export default {
//console.info("目标roll", response.data.ret); //console.info("目标roll", response.data.ret);
response.data.ret.forEach((element, index) => { response.data.ret.forEach((element, index) => {
// 目标 左手 滚动 // 目标 左手 滚动
self.destFingersLeftR.forEach((item) => { self.destFingersLeftL.forEach((item) => {
if (item.code == element.seq) { if (item.code == element.seq) {
item.img = element.image; item.img = element.image;
} }
}); });
// 目标 右手 滚动 // 目标 右手 滚动
self.destFingersRightR.forEach((item) => { self.destFingersRightL.forEach((item) => {
if (item.code == element.seq) { if (item.code == element.seq) {
item.img = element.image; item.img = element.image;
} }
...@@ -1519,27 +1521,7 @@ export default { ...@@ -1519,27 +1521,7 @@ export default {
}, },
// 认定完成 // 认定完成
Rdwc() { Rdwc() {
if (this.sourcedatas.length <= 1) { this.$message.success('认定完成')
this.confirmrdwc();
return;
}
//console.info("认定完成");
this.loadingIndex++;
// 认定之前的操作
this.$axios
.post("/api/matchcand/affirm/confirm", { qqid: this.currentQqid })
.then((res) => {
this.loadingIndex--;
//console.log(res);
if (!res.data.ret) {
this.isShowbzDialogBg = true;
this.isShowrdwcDialogBg = true;
this.isShowrdwcDialog = true;
} else {
// 执行认定完成
this.confirmrdwc();
}
});
}, },
// 确认认定完成 // 确认认定完成
confirmrdwc() { confirmrdwc() {
......
vue.config.js
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-09-07 09:57:48 * @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-12-22 11:59:46 * @LastEditTime: 2021-12-22 14:23:53
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js * @FilePath: \指纹系统\founder_vue\vue.config.js
...@@ -90,16 +90,16 @@ module.exports = { ...@@ -90,16 +90,16 @@ module.exports = {
proxy: { proxy: {
"/api": { "/api": {
// target: "http://192.168.0.137:8080/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/ // target: "http://192.168.0.137:8080/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/
target: "http://192.168.128.166:8099/", // 张 认定 // target: "http://192.168.128.166:8099/", // 张 认定
// target: "http://192.168.128.114:8099", // 湖南-马 // target: "http://192.168.128.114:8099", // 湖南-马
// target: "http://192.168.128.116:8099", // 湖南-王 // target: "http://192.168.128.116:8099", // 湖南-王
// target: "http://192.168.128.112:8099", // 湖南-张呈光 // target: "http://192.168.128.102:8099", // 湖南-张呈光
// target: "http://172.18.116.73:8099/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/ ma // target: "http://172.18.116.73:8099/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/ ma
// target: "http://127.0.0.1:8099", // target: "http://127.0.0.1:8099",
// target: "http://47.92.225.109:5602", // target: "http://47.92.225.109:5602",
// target: "http://www.meetfood.cn:2390", // 湖南-线上 // target: "http://www.meetfood.cn:2390", // 湖南-线上
// target:"http://zwpt.xzclub.top:9333/", // target:"http://zwpt.xzclub.top:9333/",
// target: "http://192.168.128.102:8099", // 江 target: "http://192.168.128.102:8099", // 江
ws: true, ws: true,
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
......
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