Skip to content

F
founder_vue
Commit a166a83f by 张超军
Options

案件指纹编辑

parent 9285c567
Showing with 222 additions and 65 deletions
public/image-edit/js/fabric-v4.2.0.js
......@@ -14140,6 +14140,7 @@ fabric.util.object.extend(fabric.StaticCanvas.prototype, /** @lends fabric.Stati
* @type Boolean
* @default
*/
// 禁止拖动
selectable: false,
/**
......
src/components/ImageEd.scss
......@@ -1126,14 +1126,18 @@ div {
display: flex;
align-items: center;
padding: 0 24px;
color: #666666;
.btn {
cursor: pointer;
background: #f6f8fa;
box-shadow: 4px 4px 4px 0px rgba(193, 216, 251, 0.8),
-4px -4px 4px 0px #ffffff;
border-radius: 4px;
padding: 9px 12px;
// padding: 9px 12px;
width: 64px;
padding: 9px 0;
margin-right: 16px;
text-align: center;
&:last-child {
margin-right: 0;
}
......@@ -1144,6 +1148,10 @@ div {
color: #ffffff;
}
}
.light_dbd {
width: 128px;
height: 40px;
}
.line {
width: 1px;
height: 40px;
......
src/components/ImageEd.vue
<!--
* @Author: your name
* @Date: 2021-09-09 09:28:46
* @LastEditTime: 2021-11-08 20:01:12
* @LastEditTime: 2021-11-09 21:14:34
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\cxyrd\LTz.vue
......@@ -401,7 +401,7 @@
<div class="btn" :class="{blendActive: isBlendActive}" @click="changeBlend">差异化</div>
<div class="btn" :class="{multiplyActive: isMultiplyActive}" @click="changeMultiply">正片叠底</div>
<div class="btn" :class="{removeWhiteActive: isRemoveWhiteActive}" @click="changeRemoveWhite">去白</div>
<div class="btn" :class="{brightnessActive: isBrightnessActive}" @click="changeBrightness">亮度/对比度</div>
<div class="btn light_dbd" :class="{brightnessActive: isBrightnessActive}" @click="changeBrightness">亮度/对比度</div>
<!-- 去白弹框 -->
<div class="remove-white" v-show="optionsRemoveWhite">
<div class="title">去白</div>
......
src/router/index.js
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-11-05 11:09:01
* @LastEditTime: 2021-11-10 14:03:14
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\router\index.js
......@@ -67,7 +67,7 @@ const router = new VueRouter({
router.beforeEach((to, from, next) => {
console.log(from);
if(from.name === 'ryzwbj') {
if(from.name === 'ryzwbj' || from.name === 'ajzwbj') {
// 清空session
sessionStorage.clear()
}
......
src/router/modules/index.js
/*
* @Author: your name
* @Date: 2021-09-07 09:58:13
* @LastEditTime: 2021-11-04 09:26:19
* @LastEditTime: 2021-11-10 09:56:20
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\router\modules\index.js
......@@ -119,7 +119,7 @@ export default [
component: () => import("@/views/Editor/ryzwbj.vue")
},
{
path: "/zwbj/ajzwbj/:id",
path: "/zwbj/ajzwbj/:id/:barcode",
name: "ajzwbj",
hidden: true,
meta: {
......
src/views/AllPersonnelBase/qbalk.vue
......@@ -734,12 +734,7 @@ export default {
*/
handleClick (row) {
console.log(row);
this.$router.push({
path: '/zwbj/ajzwbj/' + row.id,
query: {
barcode: row.barcode
}
})
this.$router.push('/zwbj/ajzwbj/' + row.id + '/' + row.ysxtAsjbh)
},
/**
* @description: 单选事件
......
src/views/Editor/modules/ajzwbjLeft.vue
<!--
* @Author: your name
* @Date: 2021-10-22 09:42:07
* @LastEditTime: 2021-11-01 20:35:57
* @LastEditTime: 2021-11-10 16:05:35
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\ryzwbjLeft.vue
......@@ -23,11 +23,12 @@
</div>
<div class="left-right-hand" v-if="zwSelect==='指纹'">
<div class="lr-hand" v-if="fingers.length>0">
<div class="fingerDom" v-for="(item,index) in fingers" :key="index" @click="FingersChange(index)">
<div class="fingerDom" v-for="(item,index) in fingers" :key="index" @click="FingersChange(index, item)">
<div class="fingerPic" :class="{fingerPicActive: activeFinger===index}">
<div class="finger-number">{{(index+1) &lt; 10 ? ('0'+(index+1)) : (index+1)}}</div>
<div class="finger-pic">
<img src="../../../assets/img/finger.png" />
<!-- <img src="../../../assets/img/finger.png" /> -->
<img :src="'data:image/jpeg;base64,'+item.image" alt="">
</div>
</div>
</div>
......@@ -39,7 +40,7 @@
</div>
</div>
<div class="finger-total">
共计<span>4枚</span>指纹
共计<span>{{fingers.length}}枚</span>指纹
</div>
</div>
<div class="left-right-hand" v-else-if="zwSelect==='掌纹'">
......@@ -48,7 +49,8 @@
<div class="fingerPic" :class="{fingerPicActive: activeHand===index}">
<div class="finger-number">{{(index+1) &lt; 10 ? ('0'+(index+1)) : (index+1)}}</div>
<div class="finger-pic">
<img src="../../../assets/img/zhangwen.png" />
<!-- <img src="../../../assets/img/zhangwen.png" /> -->
<img :src="'data:image/jpeg;base64,'+item.image" alt="">
</div>
</div>
</div>
......@@ -69,9 +71,12 @@
</template>
<script>
import { mapState } from 'vuex';
export default {
data () {
return {
// 上一次的指纹序号
preSeq: '',
// 案事件编号
barcode: '',
id: '',
......@@ -131,28 +136,116 @@ export default {
],
}
},
computed: {
...mapState({
seq: state => state.zwbj.seq,
preTzdArr: state => state.zwbj.pretzdall,
autopretzdall: state => state.zwbj.autopretzdall,
})
},
mounted () {
let self = this
console.log(this.$route);
this.barcode = this.$route.query.barcode
this.barcode = this.$route.params.barcode
this.id = this.$route.params.id
self.preSeq = this.activerollFinger
// 获取案件指纹
this.getCaseFinger()
},
methods: {
/**
* @description: 切换掌纹
* @param {*} handIndex
* @return {*}
* 获取案件指纹原图
*/
FingersChange (handIndex) {
this.activeHand = handIndex
getCaseOrigin (seq) {
this.$store.commit('zwbj/setSeq', seq)
let self = this
this.$axios({
method: 'get',
url: `/api/org/case/${self.id}/${seq}?mnt=1`,
loading: false
}).then(res => {
console.log(res);
if (res.data.code === 0) {
for (const key in res.data.ret) {
if (Object.hasOwnProperty.call(res.data.ret, key)) {
const element = res.data.ret[key];
// 指纹编辑区域发送指纹数据，替换指纹图片
self.$bus.emit('ajzwbjImage', element.image)
self.$bus.emit('ajzwbjTDZ')
}
}
}
})
},
/**
* 获取案件指纹
*/
getCaseFinger () {
let self = this
this.$axios({
method: 'get',
url: '/api/org/case/' + self.id + '?mnt=1'
}).then(res => {
// console.log(res);
if (res.data.code === 0) {
// self.fingers = res.data.ret
self.fingers = []
for (const key in res.data.ret) {
if (Object.hasOwnProperty.call(res.data.ret, key)) {
const element = res.data.ret[key];
self.fingers.push({
code: element.seq,
image: element.image
})
}
}
// console.log(self.fingers);
// 自动获取第一个
if (self.fingers.length > 0) {
this.activeFinger = 0
self.FingersChange(0, self.fingers[0])
}
} else {
self.$message.error(res.data.message)
}
}).catch(err => {
console.log(err);
})
},
// /**
// * @description: 切换掌纹
// * @param {*} handIndex
// * @return {*}
// */
// FingersChange (handIndex) {
// this.activeHand = handIndex
// },
/**
* @description: 切换指纹
* @param {*} finger
* @return {*}
*/
FingersChange (fingerIndex) {
FingersChange (fingerIndex, finger) {
console.log(fingerIndex);
this.activeFinger = fingerIndex
let self = this
if (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/setAutoTzdall', null)
}
this.preSeq = finger.code
// 调取获取原图接口
this.getCaseOrigin(finger.code)
},
/**
* @description: 滚动指纹-平面指纹-掌纹切换
......
src/views/Editor/modules/imageEd.scss
......@@ -944,6 +944,7 @@ $transOrigin: var(--transOrigin, 0px, 0px);
background: transparent;
overflow: hidden;
transform-origin: 320px 320px;
z-index: 9999;
// transform-origin: $transOrigin;
// background-color: #999;
}
......
src/views/Editor/modules/imageEdAJ.scss
......@@ -844,6 +844,7 @@ $directionRotate: var(--directionRotate, 0deg);
background: transparent;
overflow: hidden;
transform-origin: 320px 320px;
z-index: 9999;
// transform-origin: $transOrigin;
// background-color: #999;
}
......@@ -1114,6 +1115,7 @@ $directionRotate: var(--directionRotate, 0deg);
display: flex;
align-items: center;
padding: 0 16px;
position: relative;
.blcbtn {
cursor: pointer;
width: 40px;
......@@ -1131,6 +1133,35 @@ $directionRotate: var(--directionRotate, 0deg);
height: 26px;
}
}
.blcbtn-options {
z-index: 100;
position: absolute;
top: 50px;
left: 16px;
width: 286px;
height: 285px;
background: #ffffff;
box-shadow: 0px 14px 30px 0px rgba(0, 21, 51, 0.25);
border-radius: 6px;
.blcbtn-head {
display: flex;
align-items: center;
justify-content: space-between;
border-bottom: 1px solid #e6e6e8;
height: 50px;
padding: 0 24px;
.head-title {
font-size: 16px;
font-family: MicrosoftYaHei;
color: #282f3c;
}
.head-close {
cursor: pointer;
color: #b1b6c2;
font-size: 20px;
}
}
}
.txblyz {
cursor: pointer;
margin-right: 28px;
......
vue.config.js
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-11-08 20:01:14
* @LastEditTime: 2021-11-10 09:47:04
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js
......@@ -92,12 +92,12 @@ module.exports = {
// target: "http://192.168.0.137:8080/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/
// target: "http://172.18.108.2:8099/", // 张 认定
// target: "http://192.168.128.112:8099", // 湖南-张
// target: "http://192.168.128.114:8099", // 湖南-马
target: "http://192.168.128.114:8099", // 湖南-马
// target: "http://192.168.128.116: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://www.meetfood.cn:2390/", // 湖南-线上
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