Skip to content

F
founder_vue
Commit 72f3cebe by 张超军
Options

1. 解决案件指纹编辑的特征点（特征区域）来回切换（多次）时数据改变错乱的现象。 

2. 解决正查/倒查/人员指纹编辑/案件指纹编辑下拉框点击别处收回的效果。
3. 编写案件情况操作按钮功能。
4. 修改正查/倒查/人员/案件--不再获取原图，直接将压缩图传入编辑区域。
parent c78f7aed
Showing with 119 additions and 37 deletions
src/components/ImageEd.scss
......@@ -81,6 +81,7 @@ div {
width: 20px;
height: 20px;
object-fit: contain;
cursor: pointer;
}
&:active {
background: #055fe7;
......@@ -114,6 +115,7 @@ div {
img {
width: 100%;
height: 100%;
cursor: pointer;
}
}
.size,
......@@ -145,6 +147,7 @@ div {
width: 20px;
height: 20px;
object-fit: contain;
cursor: pointer;
}
.line {
margin-right: 15px;
......@@ -153,6 +156,7 @@ div {
width: 10.25px;
height: 5.84px;
img {
cursor: pointer;
object-fit: contain;
}
}
......@@ -350,6 +354,7 @@ div {
justify-content: center;
cursor: pointer;
img {
cursor: pointer;
width: 20px;
height: 20px;
object-fit: contain;
......@@ -475,6 +480,7 @@ div {
justify-content: center;
cursor: pointer;
img {
cursor: pointer;
width: 20px;
height: 20px;
object-fit: contain;
......@@ -486,6 +492,7 @@ div {
width: 10.25px;
height: 5.84px;
img {
cursor: pointer;
object-fit: contain;
}
}
......@@ -640,6 +647,7 @@ div {
justify-content: center;
cursor: pointer;
img {
cursor: pointer;
width: 20px;
height: 20px;
object-fit: contain;
......@@ -728,6 +736,7 @@ div {
justify-content: center;
cursor: pointer;
img {
cursor: pointer;
width: 20px;
height: 20px;
object-fit: contain;
......@@ -739,6 +748,7 @@ div {
width: 10.25px;
height: 5.84px;
img {
cursor: pointer;
object-fit: contain;
}
}
......@@ -803,6 +813,7 @@ div {
width: 30px;
height: 30px;
img {
cursor: pointer;
width: 30px;
height: 30px;
object-fit: contain;
......@@ -823,6 +834,7 @@ div {
width: 30px;
height: 30px;
img {
cursor: pointer;
width: 30px;
height: 30px;
object-fit: contain;
......@@ -849,6 +861,7 @@ div {
width: 22px;
height: 22px;
img {
cursor: pointer;
object-fit: contain;
width: 22px;
height: 22px;
......@@ -872,6 +885,7 @@ div {
width: 22px;
height: 22px;
img {
cursor: pointer;
object-fit: contain;
width: 22px;
height: 22px;
......@@ -1307,6 +1321,7 @@ div {
width: 80px;
height: 80px;
img {
cursor: pointer;
object-fit: contain;
}
}
......@@ -1402,6 +1417,7 @@ div {
width: 80px;
height: 80px;
img {
cursor: pointer;
object-fit: contain;
}
}
......
src/plugins/axios.js
......@@ -69,7 +69,7 @@ _axios.interceptors.response.use(
timer = setTimeout(() => {
loading && loading.close();
loading = null
}, 1200);
}, 500);
}
if (response.data.code === 401) {
localStorage.removeItem("token"); //删除名称为“token”的信息。
......
src/views/Editor/modules/ajzwbjLeft.vue
<!--
* @Author: your name
* @Date: 2021-10-22 09:42:07
* @LastEditTime: 2021-11-15 16:11:50
* @LastEditTime: 2021-11-22 11:00:22
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\ryzwbjLeft.vue
......@@ -141,7 +141,7 @@ export default {
],
// 加载动画
loading: null,
timer: null,
timer: null
}
},
computed: {
......@@ -152,7 +152,7 @@ export default {
zyhz: state => state.zwbj.zyhz,
yxhz: state => state.zwbj.yxhz,
autoyxhz: state => state.zwbj.autoyxhz,
autozyhz: state => state.zwbj.autozyhz,
autozyhz: state => state.zwbj.autozyhz
})
},
mounted () {
......@@ -167,6 +167,17 @@ export default {
},
methods: {
/**
* 切换指纹PNG图
* @param finger
*/
changeCaseFingerPNG(finger) {
console.log(finger);
this.$store.commit('zwbj/setSeq', finger.code)
// 指纹编辑区域发送指纹数据，替换指纹图片
this.$bus.emit('ajzwbjImage', finger.image)
this.$bus.emit('ajzwbjTDZ')
},
/**
* 获取案件指纹原图
*/
getCaseOrigin (seq) {
......@@ -259,10 +270,13 @@ export default {
if (this.preSeq) {
// 保存当前的指位特征点信息
// 直接覆盖之前的数据
console.log(this.preSeq);
console.log(self.preTzdArr);
if (self.preTzdArr && self.preTzdArr.length >= 0) {
sessionStorage.setItem(this.preSeq, JSON.stringify(self.preTzdArr))
sessionStorage.setItem(`auto_tzdDom${this.preSeq}`, JSON.stringify(self.autopretzdall))
self.$store.commit('zwbj/setTzdall', null)
}
// self.$store.commit('zwbj/setTzdall', null)
// self.$store.commit('zwbj/setAutoTzdall', null)
......@@ -270,29 +284,32 @@ export default {
console.log(self.zyhz);
if (self.zyhz && self.zyhz.length >= 0) {
sessionStorage.setItem(`zyhz_${this.preSeq}`, JSON.stringify(self.zyhz))
// self.$store.commit('zwbj/setZyhz', null)
self.$store.commit('zwbj/setZyhz', null)
}
console.log(self.yxhz);
if (self.yxhz && self.yxhz.length >= 0) {
console.log(self.yxhz);
sessionStorage.setItem(`yxhz_${this.preSeq}`, JSON.stringify(self.yxhz))
// self.$store.commit('zwbj/setYxhz', null)
self.$store.commit('zwbj/setYxhz', null)
}
if (self.autoyxhz && self.autoyxhz.length >= 0) {
console.log(self.autoyxhz);
sessionStorage.setItem(`auto_yxhz_${this.preSeq}`, JSON.stringify(self.autoyxhz))
// self.$store.commit('zwbj/setAutoYxhz', null)
self.$store.commit('zwbj/setAutoYxhz', null)
}
if (self.autozyhz && self.autozyhz.length >= 0) {
console.log(self.autozyhz);
sessionStorage.setItem(`auto_zyhz_${this.preSeq}`, JSON.stringify(self.autozyhz))
// self.$store.commit('zwbj/setAutoZyhz', null)
self.$store.commit('zwbj/setAutoZyhz', null)
}
}
this.preSeq = finger.code
// 调取获取原图接口
this.getCaseOrigin(finger.code)
// this.getCaseOrigin(finger.code)
// 切换指纹PNG
this.changeCaseFingerPNG(finger)
},
/**
* @description: 滚动指纹-平面指纹-掌纹切换
......@@ -309,4 +326,4 @@ export default {
<style lang="scss" scoped>
@import "./ajzwbjLeft.scss";
</style>
\ No newline at end of file
</style>
src/views/Editor/modules/imageEd.scss
......@@ -48,6 +48,10 @@ $transOrigin: var(--transOrigin, 0px, 0px);
.item-selected {
width: 32px;
text-align: center;
cursor: pointer;
}
.item-name {
cursor: pointer;
}
}
:hover {
......@@ -601,6 +605,7 @@ $transOrigin: var(--transOrigin, 0px, 0px);
justify-content: center;
cursor: pointer;
img {
cursor: pointer;
width: 20px;
height: 20px;
object-fit: contain;
......@@ -764,7 +769,9 @@ $transOrigin: var(--transOrigin, 0px, 0px);
.rotate_icon {
width: 30px;
height: 30px;
cursor: pointer;
img {
cursor: pointer;
width: 30px;
height: 30px;
object-fit: contain;
......@@ -785,6 +792,7 @@ $transOrigin: var(--transOrigin, 0px, 0px);
width: 30px;
height: 30px;
img {
cursor: pointer;
width: 30px;
height: 30px;
object-fit: contain;
......@@ -811,6 +819,7 @@ $transOrigin: var(--transOrigin, 0px, 0px);
width: 22px;
height: 22px;
img {
cursor: pointer;
object-fit: contain;
width: 22px;
height: 22px;
......@@ -834,6 +843,7 @@ $transOrigin: var(--transOrigin, 0px, 0px);
width: 22px;
height: 22px;
img {
cursor: pointer;
object-fit: contain;
width: 22px;
height: 22px;
......@@ -858,8 +868,26 @@ $transOrigin: var(--transOrigin, 0px, 0px);
#input-rotation-range {
width: 100%;
}
/deep/ .el-slider__runway {
width: 100%;
height: 3px;
margin: 0;
background-color: #eeeeee;
}
/deep/ .el-slider__bar {
height: 3px;
background-color: #055fe7;
}
/deep/ .el-slider__button {
width: 10px;
height: 10px;
background: #ffffff;
border: 2px solid #055fe7;
margin-bottom: 2px;
}
}
.desc {
margin-top: 10px;
display: flex;
align-items: center;
justify-content: space-between;
......
src/views/Editor/modules/ryzwbjLeft.vue
......@@ -33,7 +33,7 @@
<div class="finger-number">{{item.code>9?item.code:'0'+item.code}}</div>
<img class="finger-pic" :src="'data:image/jpeg;base64,'+item.image" />
<!-- <img class="finger-pic" src="../../../assets/img/img.png" /> -->
<div class="finger-desc">原图</div>
<!-- <div class="finger-desc">原图</div>-->
</div>
<div v-else class="absence">
<img src="@/assets/img/absence.png" alt="">
......@@ -47,7 +47,7 @@
<div class="finger-number">{{item.code>9?item.code:'0'+item.code}}</div>
<img class="finger-pic" :src="'data:image/jpeg;base64,'+item.image" />
<!-- <img class="finger-pic" src="../../../assets/img/img.png" /> -->
<div class="finger-desc">原图</div>
<!-- <div class="finger-desc">原图</div>-->
</div>
<div v-else class="absence">
<img src="@/assets/img/absence.png" alt="">
......@@ -65,7 +65,7 @@
<div class="finger-number">{{item.code}}</div>
<img class="finger-pic" :src="'data:image/jpeg;base64,'+item.image" />
<!-- <img class="finger-pic" src="../../../assets/img/img.png" /> -->
<div class="finger-desc">原图</div>
<!-- <div class="finger-desc">原图</div>-->
</div>
<div v-else class="absence">
<img src="@/assets/img/absence.png" alt="">
......@@ -79,7 +79,7 @@
<div class="finger-number">{{item.code}}</div>
<img class="finger-pic" :src="'data:image/jpeg;base64,'+item.image" />
<!-- <img class="finger-pic" src="../../../assets/img/img.png" /> -->
<div class="finger-desc">原图</div>
<!-- <div class="finger-desc">原图</div>-->
</div>
<div v-else class="absence">
<img src="@/assets/img/absence.png" alt="">
......@@ -253,13 +253,14 @@ export default {
this.activerollFinger = self.finger.code
self.preSeq = this.activerollFinger
// 默认选中第一个出现的指纹
if (self.finger.code > 10) {
this.getRollOrPainFinger(self.finger)
/*if (self.finger.code > 10) {
// 平面
self.getPainFingerOrigin(self.finger.code)
} else {
// 滚动
self.getRollFingerOrigin(self.finger.code)
}
}*/
}
// setTimeout(() => {
......@@ -268,6 +269,15 @@ export default {
},
methods: {
/**
* 获取平面/滚动指纹png图片
* @param code
*/
getRollOrPainFinger(finger) {
this.$store.commit('zwbj/setSeq', finger.code)
this.$bus.emit('ryzwbjImage', finger.image)
this.$bus.emit('ryzwbjTDZ')
},
/**
* @description: 获取滚动指纹原图
* @param {*} seq
* @return {*}
......@@ -474,10 +484,20 @@ export default {
this.activerollFinger = finger.code
// 平面指纹原图
if (finger.code > 10) {
this.getPainFingerOrigin(finger.code)
// this.getPainFingerOrigin(finger.code)
this.$store.commit('zwbj/setSeq', finger.code)
// 指纹编辑区域发送指纹数据，替换指纹图片
self.$bus.emit('ryzwbjImage', finger.image)
self.$bus.emit('ryzwbjTDZ')
} else {
// 滚动指纹原图
this.getRollFingerOrigin(finger.code)
// this.getRollFingerOrigin(finger.code)
this.$store.commit('zwbj/setSeq', finger.code)
// 指纹编辑区域发送指纹数据，替换指纹图片
self.$bus.emit('ryzwbjImage', finger.image)
self.$bus.emit('ryzwbjTDZ')
}
},
/**
......
src/views/SystemManage/UserManage.vue
......@@ -692,7 +692,7 @@ export default {
console.log(valid);
if (valid) {
this.$axios
.post("/system/users", this.addFormParams)
.post("/api/security/users", this.addFormParams)
.then((res) => {
if (res.status == 201) {
setTimeout(() => {
......
src/views/cxyrd/modules/LTCandidate.vue
......@@ -1136,25 +1136,25 @@ export default {
sessionStorage.setItem("destseqno", val.destseqno);
this.loading = Loading.service({ fullscreen: true, text: '正在加载...' });
// 平面
// 平面 --- 换压缩图
if (val.destseqno > 10) {
this.$axios
.post('/api/org/plainByBarcode/barcode/seq', {
.post('/api/png/plainByBarcode/barcode', {
barcode: val.destbarcode,
seqno: val.destseqno,
qqid: val.qqid
}).then(response => {
self.$bus.emit("changImageEditTarget", response.data.ret.image);
self.$bus.emit("changImageEditTarget", response.data.ret[0].image);
})
} else {
// 滚动
// 滚动 --- 换压缩图
this.$axios
.post('/api/org/rollByBarcode/barcode/seq', {
.post('/api/png/rollByBarcode/barcode', {
barcode: val.destbarcode,
seqno: val.destseqno,
qqid: val.qqid
}).then(response => {
self.$bus.emit("changImageEditTarget", response.data.ret.image);
self.$bus.emit("changImageEditTarget", response.data.ret[0].image);
})
}
clearTimeout(self.timer)
......@@ -1354,7 +1354,7 @@ const candidates = [
.selectFinger {
z-index: 10;
position: absolute;
top: 218px;
top: 110px;
right: 60px;
width: 236px;
height: 194px;
......
src/views/cxyrd/modules/TLCandidate.vue
......@@ -94,6 +94,11 @@ export default {
}, 1200);
});
},
/**
* 切换目标数据
* @param val
* @param old
*/
handleCurrentChange(val, old) {
const CancelToken = axios.CancelToken;
const source = CancelToken.source();
......@@ -114,7 +119,7 @@ export default {
}
this.$axios
.post("/api/org/caseBybarcode/barcode/seq", {
.post("/api/png/caseBybarcode/barcode", {
barcode: val.destbarcode,
seqno: val.destseqno,
qqid: val.qqid
......
src/views/cxyrd/modules/TLSrc.vue
......@@ -766,7 +766,6 @@ export default {
if (!this.isFirstMounted) {
this.loading = Loading.service({ fullscreen: true, text: "正在加载..." });
}
this.$axios({
method: "post",
url: `/api/query/matchcand/dest/${self.qqid}/${imageInfo.code}`,
......@@ -776,12 +775,6 @@ export default {
cancelToken: source.token,
loading: false
})
// this.$axios.post(`/api/query/matchcand/dest/${self.qqid}/${imageInfo.code}`, { srcbarcode: sessionStorage.getItem('srcbarcode') }, {
// loading: false,
// cancelToken: new this.$axios.CancelToken(function executor (c) {
// self.source = c;
// })
// })
.then(response => {
console.log(response);
self.$bus.emit("initTLCandidate", response.data.ret);
......@@ -831,7 +824,6 @@ export default {
if (!this.isFirstMounted) {
this.loading = Loading.service({ fullscreen: true, text: "正在加载..." });
}
this.$axios.post(`/api/query/matchcand/dest/${self.qqid}/${imageInfo.code}`, { srcbarcode: sessionStorage.getItem("srcbarcode") }, {
loading: false,
cancelToken: source.token
......@@ -1076,6 +1068,10 @@ label {
font-family: MicrosoftYaHei;
color: #055FE7;
span {
cursor: pointer;
}
.ico {
transform: rotate(0deg);
margin-left: 5px;
......
vue.config.js
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-11-22 13:18:13
* @LastEditTime: 2021-11-18 14:54:43
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js
......@@ -115,6 +115,7 @@ module.exports = {
}
},
"/system": {
// target: "http://192.168.128.104:8765", // 湖南-王
target: "http://www.meetfood.cn:2390/system", // 湖南-王
ws: true,
changeOrigin: true,
......
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