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 177 additions and 177 deletions
src/views/cxyrd/TT.vue
......@@ -121,7 +121,11 @@
{{ scope.$index + 1 }}
</div>
</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
class="del"
slot-scope="scope"
......@@ -1405,13 +1409,13 @@ export default {
//console.info("目标plan", response.data.ret);
response.data.ret.forEach((element, index) => {
// 目标 左手 平面
self.destFingersLeftL.forEach((item) => {
self.destFingersLeftR.forEach((item) => {
if (item.code == element.seq) {
item.img = element.image;
}
});
// 目标 右手 平面
self.destFingersRightL.forEach((item) => {
self.destFingersRightR.forEach((item) => {
if (item.code == element.seq) {
item.img = element.image;
}
......@@ -1441,13 +1445,13 @@ export default {
//console.info("目标roll", response.data.ret);
response.data.ret.forEach((element, index) => {
// 目标 左手 滚动
self.destFingersLeftR.forEach((item) => {
self.destFingersLeftL.forEach((item) => {
if (item.code == element.seq) {
item.img = element.image;
}
});
// 目标 右手 滚动
self.destFingersRightR.forEach((item) => {
self.destFingersRightL.forEach((item) => {
if (item.code == element.seq) {
item.img = element.image;
}
......
src/views/cxyrd/modules/LLCandidate.vue
......@@ -67,20 +67,22 @@
</el-table-column>
<el-table-column prop="destseqno" label="序号" :width="!roleArr.includes('C-1-7')?'auto':width3">
<template slot-scope="scope">
<span v-if="scope.row.removeFlag === 1">
<del>{{
scope.$index + 1 >= 9
? scope.$index + 1
: "0" + (scope.$index + 1)
}}</del>
</span>
<span v-else>
{{
scope.$index + 1 >= 9
? scope.$index + 1
: "0" + (scope.$index + 1)
}}
</span>
<div v-if="scope.row.destseqno">
<span v-if="scope.row.removeFlag === 1">
<del>{{
scope.row.destseqno > 9
? scope.row.destseqno
: "0" + scope.row.destseqno
}}</del>
</span>
<span v-else>
{{
scope.row.destseqno > 9
? scope.row.destseqno
: "0" + scope.row.destseqno
}}
</span>
</div>
</template>
</el-table-column>
<el-table-column
......
src/views/cxyrd/modules/Recognition_dialog.vue
......@@ -112,26 +112,64 @@ export default {
},
})
.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") {
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") {
self.$router.pushToTab("/rgTL");
} else if (
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") {
self.$router.pushToTab("/rgLT");
} else if (
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") {
self.$router.pushToTab("/rgLL");
} else if (
form.originCodeType == "1" &&
form.targetCodeType == "1"
) {
self.$router.pushToTab({
path: "/rgLL",
query: {
qid: result.qid,
qqid: result.qqid,
type: "son",
},
});
}
self.dialogVisible = false
} else{
this.$message.error(res.data.message)
self.dialogVisible = false;
} else {
this.$message.error(res.data.message);
}
});
}
});
},
......
src/views/rgrd/modules/LLCandidate.vue
......@@ -37,20 +37,22 @@
>
<el-table-column prop="destseqno" label="序号" :width="width3">
<template slot-scope="scope">
<span v-if="scope.row.removeFlag === 1">
<del>{{
scope.$index + 1 >= 9
? scope.$index + 1
: "0" + (scope.$index + 1)
}}</del>
</span>
<span v-else>
{{
scope.$index + 1 >= 9
? scope.$index + 1
: "0" + (scope.$index + 1)
}}
</span>
<div>
<span v-if="scope.row.removeFlag === 1">
<del>{{
scope.row.destseqno > 9
? scope.row.destseqno
: "0" + scope.row.destseqno
}}</del>
</span>
<span v-else>
{{
scope.row.destseqno > 9
? scope.row.destseqno
: "0" + scope.row.destseqno
}}
</span>
</div>
</template>
</el-table-column>
<el-table-column
......@@ -60,13 +62,15 @@
v-if="roleArr.includes('C-1-7')"
>
<template slot-scope="scope">
<!-- 被删除-->
<span v-if="scope.row.removeFlag === 1">
<del>{{ scope.row.destbarcode }}</del>
</span>
<span v-else>
{{ scope.row.destbarcode }}
</span>
<div v-if="scope.$index == 0">
<!-- 被删除-->
<span v-if="scope.row.removeFlag === 1">
<del>{{ scope.row.destbarcode }}</del>
</span>
<span v-else>
{{ scope.row.destbarcode }}
</span>
</div>
</template>
</el-table-column>
</el-table>
......@@ -1052,13 +1056,13 @@ export default {
sessionStorage.setItem("destseqno", val.destseqno);
self.$store.commit("loading/setLoading", true);
///////////////////////////////
if (self.fingerShowType == "指纹") {
if (val.destseqno <= 99) {
//案件指纹
this.$axios
.post("/api/org/case/barcode/seqNo", {
barcode: val.destbarcode,
seqno: val.destseqno,
qqid: val.qqid,
qqid: sessionStorage.getItem("qqid"),
})
.then((response) => {
self.$bus.emit(
......@@ -1071,7 +1075,7 @@ export default {
self.$store.commit("loading/setLoading", false);
}, 500);
} else {
//案件指纹
//案件掌纹
this.$axios
.post("/api/org/case/palm/barcode/seq", {
barcode: val.destbarcode,
......@@ -1089,14 +1093,6 @@ export default {
self.$store.commit("loading/setLoading", false);
}, 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 {
this.$bus.emit("changImageEditTarget", "xxx");
}
......
src/views/rgrd/modules/LLSrc.vue
......@@ -74,6 +74,7 @@
fingerRB: item.affirmstatus == 3,
}"
v-for="(item, index) in enumerate"
v-show="item.image"
@click="changeStyle(index, item)"
:key="index"
>
......@@ -89,7 +90,9 @@
>
{{ Number(item.seq + 1) &lt; 11 ? ("0" + Number(item.seq)) : Number(item.seq) }}
</div>
<img :src="'data:image/jpeg;base64,' + item.image" />
<img
:src="'data:image/jpeg;base64,' + item.image"
/>
<div class="finger-tips">
<!-- 认定完成 -->
<div class="affirmstatus1" v-if="item.affirmstatus == 1">
......@@ -363,9 +366,11 @@ export default {
// 发送请求
self.$store.commit("loading/setLoading", true);
this.$axios
.post(`/api/query/matchcand/dest/${self.qqid}/${imageInfo.seq}`, {
srcbarcode: sessionStorage.getItem("srcbarcode"),
})
.post(
`/api/queryIdentification/matchcand/dest?qqid=${
self.qqid
}&barcode=${sessionStorage.getItem("srcbarcode")}`
)
.then((response) => {
//console.log(response);
self.$bus.emit("initCandidate", response.data.ret);
......@@ -511,9 +516,11 @@ export default {
// 发送请求
self.$store.commit("loading/setLoading", true);
this.$axios
.post(`/api/query/matchcand/dest/${self.qqid}/${imageInfo.seq}`, {
srcbarcode: sessionStorage.getItem("srcbarcode"),
})
.post(
`/api/queryIdentification/matchcand/dest?qqid=${
self.qqid
}&barcode=${sessionStorage.getItem("srcbarcode")}`
)
.then((response) => {
//console.log(response);
self.$bus.emit("initCandidate", response.data.ret);
......
src/views/rgrd/rgLL.vue
......@@ -384,12 +384,12 @@ export default {
},
})
.then((response) => {
if(response.data.code == 0){
if (response.data.code == 0) {
// 跟新列表数据
self.$bus.emit("updateFinderSource");
this.$message.success("比中成功！");
}else{
this.$message.error(response.data.message)
} else {
this.$message.error(response.data.message);
}
})
.catch((err) => {
......@@ -486,7 +486,6 @@ export default {
this.xh = sessionStorage.getItem("srcseqno");
this.rybh = sessionStorage.getItem("destbarcode");
this.judgeZw(Number(sessionStorage.getItem("destseqno")));
this.isShowbzDialogBg = true;
this.isShowbzDialog = true;
},
......@@ -497,26 +496,8 @@ export default {
*/
Rdwc() {
//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.isShowbzDialogBg = true;
// this.isShowrdwcDialogBg = true;
this.isShowrdwcDialog = true;
} else {
// 执行认定完成
this.confirmrdwc();
}
});
this.$message.success("认定完成");
// this.confirmrdwc();
},
/**
* @description: 更具code判断指位
......
src/views/rgrd/rgLT.vue
......@@ -69,7 +69,7 @@
<div class="bzvalue">{{ xh }}</div>
</div>
<div class="bzitem">
<div class="bzname">指位：</div>
<div class="bzname">指/掌位：</div>
<div class="bzvalue">{{ zw }}</div>
</div>
</div>
......@@ -181,13 +181,13 @@ export default {
//console.log("源qid====>", this.qid);
this.userInfo = JSON.parse(localStorage.getItem('userInfo'))
console.log(this.userInfo);
if(this.userInfo) {
if (this.userInfo) {
this.bzr = this.userInfo.name
this.bzdw = this.userInfo.unitName
this.dwdm = this.userInfo.unitCode
this.bzrsfzh = this.userInfo.idCard
this.phone = this.userInfo.phoneNumber
}
}
},
mounted () {
let self = this
......@@ -281,8 +281,8 @@ export default {
confirmbz () {
let self = this;
let srcseqno = Number(sessionStorage.getItem("srcseqno"));
// let destseqno = Number(sessionStorage.getItem("destseqno"));
let destseqno = this.xh
let destseqno = Number(sessionStorage.getItem("destseqno"));
// let destseqno = this.xh
let srcbarcode = sessionStorage.getItem("srcbarcode") || "";
let destbarcode = sessionStorage.getItem("destbarcode") || "";
let qqid = Number(sessionStorage.getItem("qqid"));
......@@ -294,6 +294,11 @@ export default {
let unitCode = this.dwdm
let affirmtime = new Date(this.bzsj)
let affirmDescribe = this.textarea
if (!destbarcode) {
this.$message.error("信息不全,无法比中！");
return;
}
// 2：正查
let queryType = 2;
this.$axios({
......@@ -391,8 +396,12 @@ export default {
* @return {*}
*/
async Bz () {
if(this.bzData == null) return;
if(this.bzData.affirmstatus == '2' || this.bzData.affirmstatus == '3'){
if(this.bzData == null) {
this.$message.error("信息不全无法比中！");
return
};
if (this.bzData.affirmstatus == '2' || this.bzData.affirmstatus == '3') {
this.$message.error("已经比中过的数据无法再次比中！");
return
}
// this.getUserInfo2();
......@@ -418,26 +427,7 @@ export default {
*/
Rdwc () {
//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();
}
});
this.$message.success('认定完成')
},
/**
* @description: 更具code判断指位
......@@ -507,6 +497,18 @@ export default {
case 20:
this.zw = "平面-左小";
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 {
let affirmtime = new Date(this.bzsj);
let affirmDescribe = this.textarea;
if (!destbarcode) {
this.$message.error("信息不全,无法比中！");
return;
}
// 1：倒查
let queryType = 1;
this.$axios({
......@@ -372,8 +377,12 @@ export default {
* @return {*}
*/
async Bz() {
if (this.bzData == null) return;
if (this.bzData == null) {
this.$message.error("信息不全无法比中！");
return;
}
if (this.bzData.affirmstatus == "2" || this.bzData.affirmstatus == "3") {
this.$message.error("已经比中过的数据无法再次比中！");
return;
}
//console.info("比中");
......@@ -397,28 +406,7 @@ export default {
this.isShowbzDialog = true;
},
Rdwc() {
//console.info("认定完成");
//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();
}
});
this.$message.success('认定完成')
},
hideDialog() {
this.dialog = true;
......
src/views/rgrd/rgTT.vue
......@@ -1191,7 +1191,6 @@ export default {
} else {
this.souceDel = false;
}
me.getMatchcandList(me.currentQqid);
this.getSourceRollFingerPrintDetail(
res.data.ret[0].barcode,
......@@ -1219,10 +1218,13 @@ export default {
.then((res) => {
me.loadingIndex--;
if (res.data.code == 0) {
debugger;
me.sourcedatas = res.data.ret;
me.sourcedatasLength = res.data.ret.length;
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") {
this.souceDel = true;
this.souceDelText = this.$moment(
......@@ -1364,14 +1366,14 @@ export default {
if (response.data.code == 0) {
//console.info("目标plan", response.data.ret);
response.data.ret.forEach((element, index) => {
// 目标 左手 平面
self.destFingersLeftL.forEach((item) => {
// 目标 左手 滚动
self.destFingersLeftR.forEach((item) => {
if (item.code == element.seq) {
item.img = element.image;
}
});
// 目标 右手 平面
self.destFingersRightL.forEach((item) => {
// 目标 右手 滚动
self.destFingersRightR.forEach((item) => {
if (item.code == element.seq) {
item.img = element.image;
}
......@@ -1401,13 +1403,13 @@ export default {
//console.info("目标roll", response.data.ret);
response.data.ret.forEach((element, index) => {
// 目标 左手 滚动
self.destFingersLeftR.forEach((item) => {
self.destFingersLeftL.forEach((item) => {
if (item.code == element.seq) {
item.img = element.image;
}
});
// 目标 右手 滚动
self.destFingersRightR.forEach((item) => {
self.destFingersRightL.forEach((item) => {
if (item.code == element.seq) {
item.img = element.image;
}
......@@ -1519,27 +1521,7 @@ export default {
},
// 认定完成
Rdwc() {
if (this.sourcedatas.length <= 1) {
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();
}
});
this.$message.success('认定完成')
},
// 确认认定完成
confirmrdwc() {
......
vue.config.js
/*
* @Author: your name
* @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
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js
......@@ -90,16 +90,16 @@ module.exports = {
proxy: {
"/api": {
// 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.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://127.0.0.1:8099",
// target: "http://47.92.225.109:5602",
// target: "http://www.meetfood.cn:2390", // 湖南-线上
// target:"http://zwpt.xzclub.top:9333/",
// target: "http://192.168.128.102:8099", // 江
target: "http://192.168.128.102:8099", // 江
ws: true,
changeOrigin: true,
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