Commit f3d19459 by 张超军

复核接口,逻辑对接

parent 556b8e1b
<!--
* @Author: your name
* @Date: 2021-12-03 15:35:26
* @LastEditTime: 2021-12-17 13:52:13
* @LastEditTime: 2021-12-17 15:15:16
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \指纹系统\founder_vue\src\views\bzxxgl\fhxxLT.vue
......@@ -171,7 +171,10 @@
<div class="fhxx-btns">
<div class="pass" @click="gotoProgress(true)">通过</div>
<div class="no-pass" @click="gotoProgress(false)">未通过</div>
<div v-show="!isFromSh" class="relieve" @click="relieveChange">解除比中关系</div>
<div v-show="!isFromSh && jcbzFlag" class="relieve" @click="relieveChange">解除比中关系</div>
<el-tooltip class="item" effect="dark" content="只有认定人才能解除比中关系" placement="top">
<div v-show="!isFromSh && !jcbzFlag" class="relieve jcbzFlag">解除比中关系</div>
</el-tooltip>
</div>
</div>
</div>
......@@ -249,6 +252,10 @@ export default {
isFromSh: false,
isSh: false,
shxx: '',
// 比中人姓名
bzrName: '',
// 是否可以解除比中关系
jcbzFlag: false
}
},
components: {
......@@ -273,6 +280,11 @@ export default {
}
this.getData()
},
mounted () {
if (localStorage.getItem('userInfo')) {
this.bzrName = JSON.parse(localStorage.getItem('userInfo')).name
}
},
methods: {
getShOrFhName () {
let _that = this
......@@ -501,6 +513,11 @@ export default {
leftBarcode: res.data.ret.ysxtAsjbh,
rightBarcode: res.data.ret.ysxtAsjbh
})
if(this.bzrName == this.allData.bzrXm) {
this.jcbzFlag = true
} else {
this.jcbzFlag = false
}
this.getLftPic()
this.getPersonPic()
}
......
<!--
* @Author: your name
* @Date: 2021-12-03 15:35:26
* @LastEditTime: 2021-12-17 13:54:46
* @LastEditTime: 2021-12-17 15:12:24
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \指纹系统\founder_vue\src\views\bzxxgl\fhxxLT.vue
......@@ -192,7 +192,10 @@
<div class="fhxx-btns">
<div class="pass" @click="gotoProgress(true)">通过</div>
<div class="no-pass" @click="gotoProgress(false)">未通过</div>
<div v-show="!isFromSh" class="relieve" @click="relieveChange">解除比中关系</div>
<div v-show="!isFromSh && jcbzFlag" class="relieve" @click="relieveChange">解除比中关系</div>
<el-tooltip class="item" effect="dark" content="只有认定人才能解除比中关系" placement="top">
<div v-show="!isFromSh && !jcbzFlag" class="relieve jcbzFlag">解除比中关系</div>
</el-tooltip>
</div>
</div>
</div>
......@@ -270,6 +273,10 @@ export default {
isFromSh: false,
isSh: false,
shxx: '',
// 比中人姓名
bzrName: '',
// 是否可以解除比中关系
jcbzFlag: false
}
},
components: {
......@@ -280,6 +287,11 @@ export default {
loading_sd: (state) => state.loading.loading_sd,
}),
},
mounted () {
if(localStorage.getItem('userInfo')) {
this.bzrName = JSON.parse(localStorage.getItem('userInfo')).name
}
},
created () {
console.log(this.$route)
this.id = this.$route.params.id
......@@ -516,6 +528,11 @@ export default {
leftBarcode: res.data.ret.ysxtAsjxgrybh,
rightBarcode: res.data.ret.ysxtAsjbh
})
if(this.bzrName == this.allData.bzrXm) {
this.jcbzFlag = true
} else {
this.jcbzFlag = false
}
this.getCasePic()
this.getPersonPic()
}
......
<!--
* @Author: your name
* @Date: 2021-12-03 15:35:26
* @LastEditTime: 2021-12-17 14:04:01
* @LastEditTime: 2021-12-17 15:12:28
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \指纹系统\founder_vue\src\views\bzxxgl\fhxxLT.vue
......@@ -375,8 +375,8 @@
</div>
</div>
</div>
<t-t-plam v-show="isPlam == true" :sonSouceDel="souceDel" @logbg="isShowbzDialogBg = true" :sonTargetDel="targetDel" :scouceCode="scouceCode" :isPlam="isPlam" :targetCode="targetCode" :plamDetail="plamDetail"></t-t-plam>
<t-t-face v-show="isFace == true" :faceDetail="faceDetail" @logbg="isShowbzDialogBg = true" :sonSouceDel="souceDel" :sonTargetDel="targetDel" :scouceCode="scouceCode" :targetCode="targetCode"></t-t-face>
<t-t-plam v-show="isPlam == true" :sonSouceDel="souceDel" @logbg="isShowbzDialogBg = true" :sonTargetDel="targetDel" :scouceCode="scouceCode" :targetCode="targetCode" :plamDetail="plamDetail"></t-t-plam>
<t-t-face v-show="isFace == true" :faceDetail="faceDetail" @logbg="isShowbzDialogBg = true" :sonSouceDel="souceDel" :sonTargetDel="targetDel" :scouceCode="scouceCode" :isFace="isFace" :targetCode="targetCode"></t-t-face>
</div>
</div>
......@@ -599,7 +599,10 @@
<div class="fhxx-btns">
<div class="pass" @click="gotoProgress(true)">通过</div>
<div class="no-pass" @click="gotoProgress(false)">未通过</div>
<div v-show="!isFromSh" class="relieve" @click="relieveChange">解除比中关系</div>
<div v-show="!isFromSh && jcbzFlag" class="relieve" @click="relieveChange">解除比中关系</div>
<el-tooltip class="item" effect="dark" content="只有认定人才能解除比中关系" placement="top">
<div v-show="!isFromSh && !jcbzFlag" class="relieve jcbzFlag">解除比中关系</div>
</el-tooltip>
</div>
</div>
</div>
......@@ -862,6 +865,10 @@ export default {
isFromSh: false,
isSh: false,
shxx: '',
// 比中人姓名
bzrName: '',
// 是否可以解除比中关系
jcbzFlag: false
}
},
computed: {
......@@ -921,6 +928,10 @@ export default {
}
})
}, 200)
if(localStorage.getItem('userInfo')) {
this.bzrName = JSON.parse(localStorage.getItem('userInfo')).name
}
},
methods: {
getShOrFhName () {
......@@ -1087,6 +1098,11 @@ export default {
destbarcode: this.allData.destYsxtAsjxgrybh
})
}
if(this.bzrName == this.allData.bzrXm) {
this.jcbzFlag = true
} else {
this.jcbzFlag = false
}
console.log(this.allData)
// 获取源滚动指纹图-源
this.getSourceRollFingerPrintDetail(this.srcbarcode)
......@@ -1335,18 +1351,21 @@ export default {
this.isFinger = true
this.isPlam = false
this.isFace = false
this.$bus.emit('fhxxTT', { isPlam: this.isPlam, isFace: this.isFace })
},
// 掌纹可见
plam () {
this.isPlam = true
this.isFinger = false
this.isFace = false
this.$bus.emit('fhxxTT', { isPlam: this.isPlam, isFace: this.isFace })
},
// 人像可见
face () {
this.isFace = true
this.isFinger = false
this.isPlam = false
this.$bus.emit('fhxxTT', { isPlam: this.isPlam, isFace: this.isFace })
},
// 展示详情
......@@ -1546,6 +1565,9 @@ export default {
}
},
},
beforeDestroy () {
this.$bus.off('fhxxTT')
},
}
</script>
......
<!--
* @Author: your name
* @Date: 2021-10-23 17:43:14
* @LastEditTime: 2021-12-17 14:20:47
* @LastEditTime: 2021-12-17 14:45:05
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\cxyrd\modules\TTPlam.vue
......@@ -123,6 +123,8 @@ export default {
{ id: "33", text: "右手侧面掌纹", list: {} },
{ id: "34", text: "左手侧面掌纹", list: {} },
],
isPlam: false,
request: false
};
},
components: {
......@@ -135,12 +137,16 @@ export default {
sonTargetDel: Boolean,
sonSouceDel: Boolean,
plamDetail: Number,
isPlam: Boolean,
},
mounted () {
let self = this
this.$nextTick(() => {
document.body.appendChild(this.$refs.isShowDetail);
});
this.$bus.on('fhxxTT', (obj) => {
self.isPlam = obj.isPlam
})
},
methods: {
change (val) {
......@@ -174,14 +180,16 @@ export default {
},
watch: {
isPlam (val) {
console.log(val);
let self = this;
if(this.request) return;
if (val) {
if(self.arr.length>0) return;
this.request = true
this.changeIndex = 0;
let self = this;
this.loadingIndex++;
self.$emit("loadingIndex", true);
this.$axios
.post("/api/png/palm/barcode", { barcode: val })
.post("/api/png/palm/barcode", { barcode: this.scouceCode })
.then((res) => {
self.loadingIndex--;
self.$emit("loadingIndex", false);
......@@ -204,7 +212,7 @@ export default {
self.$emit("loadingIndex", true);
// var val = "R4308214500002021100049";
this.$axios
.post("/api/png/palm/barcode", { barcode: val })
.post("/api/png/palm/barcode", { barcode: this.targetCode })
.then((res) => {
self.loadingIndex--;
self.$emit("loadingIndex", false);
......@@ -228,63 +236,10 @@ export default {
plamDetail (val) {
this.isShowDetail = false;
},
// scouceCode (val) {
// // var val = "R4308214500002021100049";
// console.log(this.isPlam);
// if (this.isPlam) {
// let self = this;
// this.loadingIndex++;
// self.$emit("loadingIndex", true);
// this.$axios
// .post("/api/png/palm/barcode", { barcode: val })
// .then((res) => {
// self.loadingIndex--;
// self.$emit("loadingIndex", false);
// if (res.data.code == 0 && res.data.message == "success") {
// let result = res.data.ret;
// if (result && result.length > 0) {
// self.arr.forEach((i, index) => {
// let obj = result.find((j) => j.seq == i.id);
// if (obj) {
// let newObj = self.arr[index]["list"];
// newObj.scouce = obj;
// self.$set(self.arr[index], "list", newObj);
// }
// });
// self.$forceUpdate();
// }
// }
// });
// }
// },
// targetCode (val) {
// if (this.isPlam) {
// let self = this;
// this.loadingIndex++;
// self.$emit("loadingIndex", true);
// // var val = "R4308214500002021100049";
// this.$axios
// .post("/api/png/palm/barcode", { barcode: val })
// .then((res) => {
// self.loadingIndex--;
// self.$emit("loadingIndex", false);
// if (res.data.code == 0 && res.data.message == "success") {
// let result = res.data.ret;
// if (result && result.length > 0) {
// self.arr.forEach((i, index) => {
// let obj = result.find((j) => j.seq == i.id);
// if (obj) {
// let newObj = self.arr[index]["list"];
// newObj.target = obj;
// self.$set(self.arr[index], "list", newObj);
// }
// });
// self.$forceUpdate();
// }
// }
// });
// }
// },
scouceCode (val) {
},
targetCode (val) {
},
},
};
</script>
......
......@@ -404,6 +404,20 @@
font-family: MicrosoftYaHei;
color: #ff6300;
}
.jcbzFlag {
width: 128px;
height: 40px;
background: #ECEDF1;
border-radius: 4px;
border: none;
display: flex;
justify-content: center;
align-items: center;
cursor: pointer;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #AEAFB4;
}
}
/deep/.el-textarea__inner {
font-size: 14px;
......
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