Skip to content

F
founder_vue
Commit 60c3488e by liyuhang19990520
Options

11

parents 8e8bc563 b075637b
Showing with 121 additions and 64 deletions
src/components/ImageEd.scss
......@@ -182,7 +182,6 @@ div {
box-sizing: border-box;
width: 30px;
height: 16px;
}
}
.line_right {
......@@ -516,7 +515,6 @@ div {
box-sizing: border-box;
width: 30px;
height: 16px;
}
}
.circle_right {
......@@ -1328,15 +1326,19 @@ div {
justify-content: center;
align-items: center;
}
/deep/.tui-image-editor-canvas-container {
max-height: 520px !important;
max-width: 520px !important;
}
/deep/.lower-canvas,
/deep/.upper-canvas {
max-height: 520px !important;
max-width: 520px !important;
height: 100%;
width: auto !important;
display: flex !important;
justify-content: center !important;
align-items: center !important;
// display: flex !important;
// justify-content: center !important;
// align-items: center !important;
}
}
}
......@@ -1419,6 +1421,20 @@ div {
justify-content: center;
align-items: center;
}
/deep/.tui-image-editor-canvas-container {
max-height: 520px !important;
max-width: 520px !important;
}
/deep/.lower-canvas,
/deep/.upper-canvas {
max-height: 520px !important;
max-width: 520px !important;
height: 100%;
width: auto !important;
// display: flex !important;
// justify-content: center !important;
// align-items: center !important;
}
}
}
}
......@@ -1490,29 +1506,29 @@ div {
// left: 10px;
// background: #edc;
// }
.circleOptions /deep/{
.circle_size{
margin-top: 16px!important;
.circleOptions /deep/ {
.circle_size {
margin-top: 16px !important;
}
.circle_color{
margin-top: 16px!important;
margin-bottom: 16px!important;
.circle_color {
margin-top: 16px !important;
margin-bottom: 16px !important;
}
.mr_size_active{
.item_top{
border: 1px solid #055FE7!important;
.mr_size_active {
.item_top {
border: 1px solid #055fe7 !important;
}
}
}
.el-switch /deep/{
width: 40px!important;
.el-switch__core{
width: 100%!important;
border-radius: 5px!important;
&::after{
border-radius: 4px!important;
.el-switch /deep/ {
width: 40px !important;
.el-switch__core {
width: 100% !important;
border-radius: 5px !important;
&::after {
border-radius: 4px !important;
width: 16px;
background-color: #DCDFE9;
background-color: #dcdfe9;
border-left: 7px;
border-right: 7px;
box-sizing: border-box;
......
src/components/ImageEd.vue
<!--
* @Author: your name
* @Date: 2021-09-09 09:28:46
* @LastEditTime: 2021-11-13 13:05:18
* @LastEditTime: 2021-11-15 10:07:43
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\cxyrd\LTz.vue
......@@ -471,6 +471,8 @@ export default {
name: "ImageEd",
data () {
return {
canvasWidth: 520,
canvasHeight: 520,
sourceImage: null,
targetImage: null,
mouseEnlarge: false,
......@@ -666,6 +668,12 @@ export default {
// LTSrc,
// LTCandidate,
},
created () {
let w1 = 1920
let w2 = window.innerWidth
this.canvasWidth = this.canvasWidth * w2 / w1
this.canvasHeight = this.canvasHeight * w2 / w1
},
mounted () {
// console.log($('#targetImage'))
// console.log($('#targetImage').attr('src'));
......@@ -735,8 +743,8 @@ export default {
// });
imageEditor = new tui.ImageEditor('.tui-image-editor', {
cssMaxWidth: 520,
cssMaxHeight: 520,
cssMaxWidth: self.canvasWidth,
cssMaxHeight: self.canvasHeight,
selectionStyle: {
cornerSize: 20,
rotatingPointOffset: 70,
......@@ -750,8 +758,8 @@ export default {
});
imageEditor2 = new tui.ImageEditor('.tui-image-editor2', {
cssMaxWidth: 520,
cssMaxHeight: 520,
cssMaxWidth: self.canvasWidth,
cssMaxHeight: self.canvasHeight,
selectionStyle: {
cornerSize: 20,
rotatingPointOffset: 70,
......@@ -934,7 +942,7 @@ export default {
if (objectProps.type == 'line') {
self.lines.push(objectProps)
self.historys.push('直线')
}else if(objectProps.type == 'path'){
} else if (objectProps.type == 'path') {
self.path.push(objectProps)
self.historys.push('曲线')
}
......@@ -1015,7 +1023,7 @@ export default {
if (objectProps.type == 'line') {
self.lines2.push(objectProps)
self.historys2.push('直线')
}else if(objectProps.type == 'path'){
} else if (objectProps.type == 'path') {
self.path2.push(objectProps)
self.historys2.push('曲线')
}
......@@ -1086,7 +1094,7 @@ export default {
if (self.type == 'source' && !imageEditor.isEmptyUndoStack()) {
imageEditor.discardSelection();
imageEditor.undo();
} else if(!imageEditor2.isEmptyUndoStack()){
} else if (!imageEditor2.isEmptyUndoStack()) {
imageEditor2.discardSelection();
imageEditor2.undo();
}
......@@ -1097,7 +1105,7 @@ export default {
if (self.type == 'source' && !imageEditor.isEmptyRedoStack()) {
imageEditor.discardSelection();
imageEditor.redo();
} else if(!imageEditor2.isEmptyRedoStack()){
} else if (!imageEditor2.isEmptyRedoStack()) {
imageEditor2.discardSelection();
imageEditor2.redo();
}
......@@ -1835,7 +1843,7 @@ export default {
* @param {*}
* @return {*}
*/
xpcChange() {
xpcChange () {
console.log(this.imageEditor._graphics)
// const canvas = new fabric.Canvas('c');
// console.log(canvas)
......@@ -1978,6 +1986,7 @@ export default {
console.log(result);
});
self.historys.push('亮度')
self.historys.push('对比度')
} else {
this.imageEditor2.applyFilter('brightness', {
brightness: parseInt(self.inputBrightnessRange2, 10) / 255,
......@@ -1985,6 +1994,7 @@ export default {
console.log(result);
});
self.historys2.push('亮度')
self.historys2.push('对比度')
}
} else {
this.optionsBrightness = false
......@@ -1992,10 +2002,16 @@ export default {
this.imageEditor.removeFilter('brightness');
let index = self.historys.indexOf('亮度')
self.historys.splice(index, 1)
this.imageEditor.removeFilter('contrast');
let index2 = self.historys.indexOf('对比度')
self.historys.splice(index2, 1)
} else {
this.imageEditor2.removeFilter('brightness');
let index = self.historys2.indexOf('亮度')
self.historys2.splice(index, 1)
this.imageEditor2.removeFilter('contrast');
let index2 = self.historys2.indexOf('对比度')
self.historys2.splice(index2, 1)
}
}
},
......@@ -4800,8 +4816,8 @@ export default {
}
},
watch: {
isActive(val){
if(val == false){
isActive (val) {
if (val == false) {
this.isShowSizeSynchro = false;
}
},
......@@ -5042,11 +5058,19 @@ export default {
},
// 对比度
inputContrastRange (newValue, oldValue) {
if (this.type === 'source') {
this.imageEditor.applyFilter('Contrast', {
contrast: parseInt(newValue, 10) / 255,
}).then(function (result) {
console.log(result);
});
} else {
this.imageEditor2.applyFilter('Contrast', {
contrast: parseInt(newValue, 10) / 255,
}).then(function (result) {
console.log(result);
});
}
},
isHideMarkPoint (newValue, oldValue) {
let self = this
......
src/views/AllPersonnelBase/modules/fcx.vue
......@@ -716,6 +716,8 @@ export default {
let arr = response.data.ret
for (let i = 0; i < arr.length; i++) {
cityOptions.push(arr[i].hpseqno)
this.checkedCities = cityOptions
this.checkAll = true
}
console.info("指位返回列表===>", arr);
} else {
......@@ -781,6 +783,7 @@ export default {
},
// 指位单选
handleCheckAllChange (val) {
console.log(val, 11111)
this.checkedCities = val ? cityOptions : [];
this.isIndeterminate = false;
},
......
src/views/Editor/modules/imageEd.vue
<!--
* @Author: your name
* @Date: 2021-10-22 11:36:10
* @LastEditTime: 2021-11-13 15:01:29
* @LastEditTime: 2021-11-14 23:27:33
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue
......@@ -303,6 +303,8 @@ import "@/icons/direction.svg";
export default {
data () {
return {
tzdDrawing_left: 0,
tzdDrawing_top: 0,
zwType: '指纹',
xsType: 'yuantu',
canvasWidth: 640,
......@@ -1035,7 +1037,7 @@ export default {
imageEditor.rotate(30);
self.historys.push('旋转')
let canvasImage = imageEditor._graphics.getCanvasImage()
$('.tzdDrawing').css('transform', `rotate(${canvasImage.angle}deg)`);
$('.tzdDrawing').css('transform', `translate(${Number(self.tzdDrawing_left)}px,${Number(self.tzdDrawing_top)}px) rotate(${canvasImage.angle}deg) scale(${self.zoomLevel})`);
// 每次旋转时，位置都会改变，需要重新定位
if (self.move_left && self.move_top) {
......@@ -1054,7 +1056,7 @@ export default {
self.isRightRotate = true
imageEditor.rotate(-30);
let canvasImage = imageEditor._graphics.getCanvasImage()
$('.tzdDrawing').css('transform', `rotate(${canvasImage.angle}deg)`)
$('.tzdDrawing').css('transform', `translate(${Number(self.tzdDrawing_left)}px,${Number(self.tzdDrawing_top)}px) rotate(${canvasImage.angle}deg) scale(${self.zoomLevel})`)
self.historys.push('旋转')
// 每次旋转时，位置都会改变，需要重新定位
......@@ -1075,7 +1077,7 @@ export default {
self.startPlace = self.inputRotationRange;
// 特征点的图层也要跟着转
$('.tzdDrawing').css("transform", `rotate(${self.inputRotationRange}deg)`)
$('.tzdDrawing').css("transform", `translate(${Number(self.tzdDrawing_left)}px,${Number(self.tzdDrawing_top)}px) rotate(${self.inputRotationRange}deg) scale(${self.zoomLevel})`)
};
$(document).on('mousemove', changeAngle);
......@@ -1091,7 +1093,7 @@ export default {
self.startPlace = self.inputRotationRange;
self.historys.push('旋转')
// 特征点的图层也要跟着转
$('.tzdDrawing').css("transform", `rotate(${self.inputRotationRange}deg)`)
$('.tzdDrawing').css("transform", `rotate(${self.inputRotationRange}deg) scale(${self.zoomLevel})`)
});
// 划线事件
......@@ -1502,13 +1504,18 @@ export default {
}, true)
// console.log(imageEditor._graphics.getImageProperties());
// console.log(imageEditor._graphics.getCanvasImage());
let canvasImage = imageEditor._graphics.getCanvasImage()
// $('.tzdDrawing').css('left', `${originleft + (x2 - x1)}px`)
// $('.tzdDrawing').css('top', `${origintop + (y2 - y1)}px`)
// $('.tzdDrawing').css('transform', `translate(${x2 - x1}px,${y2 - y1}px)`)
// TODO
$('.tzdDrawing').css('transform', `translate(${Number(self.tzdDrawingLeft) + (x2 - x1)}px,${Number(self.tzdDrawingTop) + (y2 - y1)}px) scale(${self.zoomLevel})`)
self.tzdDrawing_top = Number(self.tzdDrawingTop) + (y2 - y1)
self.tzdDrawing_left = Number(self.tzdDrawingLeft) + (x2 - x1)
$('.tzdDrawing_2').css('transform', `translate(${Number(self.tzdDrawingLeft) + (x2 - x1)}px,${Number(self.tzdDrawingTop) + (y2 - y1)}px) scale(${self.zoomLevel})`)
self.move_left = originleft + ((x2 - x1) * self.newWidth / self.canvasWidth / self.zoomLevel)
......@@ -1530,7 +1537,8 @@ export default {
zoomLevel: self.zoomLevel
})
// document.querySelector('.tzdDrawing').style.transformOrigin = `${originPointer.x}px ${originPointer.y}px`;
$('.tzdDrawing').css('transform', `scale(${self.zoomLevel})`)
let canvasImage = self.imageEditor._graphics.getCanvasImage();
$('.tzdDrawing').css('transform', `rotate(${canvasImage.angle}deg) translate(${Number(self.tzdDrawing_left)}px,${Number(self.tzdDrawing_top)}px) scale(${self.zoomLevel})`)
$(".tzdDrawing_2").css("transform", `scale(${self.zoomLevel})`);
// document.querySelector('.tzdDrawing').style.transformOrigin = "260px 260px";
// console.log(`${originPointer.y}px,${originPointer.x}px`);
......@@ -1550,7 +1558,8 @@ export default {
// $('.tzdDom').css('z-index', `9999`)
// $('.tzdDrawing').css('transform-origin', `${originPointer.y}px,${originPointer.x}px`)
// document.querySelector('.tzdDrawing').style.transformOrigin = `${originPointer.x}px ${originPointer.y}px`;
$('.tzdDrawing').css('transform', `scale(${self.zoomLevel})`)
let canvasImage = self.imageEditor._graphics.getCanvasImage();
$('.tzdDrawing').css('transform', `rotate(${canvasImage.angle}deg) translate(${Number(self.tzdDrawing_left)}px,${Number(self.tzdDrawing_top)}px) scale(${self.zoomLevel})`)
$(".tzdDrawing_2").css("transform", `scale(${self.zoomLevel})`);
// document.querySelector('.tzdDrawing').style.transformOrigin = "260px 260px";
......@@ -1621,6 +1630,7 @@ export default {
self.tzdDrawingLeft = $('.tzdDrawing').css("transform").replace(/[^0-9\-,]/g, '').split(',')[4]
self.tzdDrawingTop = $('.tzdDrawing').css("transform").replace(/[^0-9\-,]/g, '').split(',')[5]
}
// $('.tzdDrawing').css('transform', `rotate(${canvasImage.angle}deg) translate(${Number(self.tzdDrawing_left)}px,${Number(self.tzdDrawing_top)}px) scale(${self.zoomLevel})`)
self.startHand = false
self.mouseEnlarge = false
// console.log(e);
......@@ -2089,6 +2099,8 @@ export default {
//重置位置变量
self.move_left = 0;
self.move_top = 0;
self.tzdDrawing_left = 0
self.tzdDrawing_top = 0
self.zoomLevel = 1;
self.imageEditor.resetFlip().then(function (status) {
console.log('flipX: ', status.flipX);
......@@ -3507,9 +3519,7 @@ export default {
this.imageEditor.rotate(deg)
let canvasImage = this.imageEditor._graphics.getCanvasImage()
this.startPlace = newValue;
$('.tzdDrawing').css('transform', `rotate(${canvasImage.angle}deg)`)
// 特征点的图层也要跟着转
$('.tzdDrawing').css("transform", `rotate(${newValue}deg)`)
$('.tzdDrawing').css('transform', `rotate(${canvasImage.angle}deg) scale(${self.zoomLevel})`)
},
inputRemoveWhiteRange (newValue, oldValue) {
this.imageEditor.applyFilter('removeColor', {
......
src/views/Editor/modules/ryzwbjLeft.vue
<!--
* @Author: your name
* @Date: 2021-10-22 09:42:07
* @LastEditTime: 2021-11-13 11:21:36
* @LastEditTime: 2021-11-15 10:37:25
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\ryzwbjLeft.vue
......@@ -20,8 +20,8 @@
</div>
<div class="left-right-hand" v-if="zwSelect==='滚动指纹'">
<el-tabs v-model="activeRollHand" @tab-click="handleRollClick">
<el-tab-pane label="左手" name="left" class="left-hand">
<div class="fingerDom" v-for="(item) in rollFingersLeft" :key="item.code" @click="rollFingersLeftChange(item)">
<el-tab-pane label="右手" name="right" class="left-hand">
<div class="fingerDom" v-for="(item) in rollFingersRight" :key="item.code" @click="rollFingersLeftChange(item)">
<div v-if="item.image" class="fingerPic" :class="{fingerPicActive: activerollFinger===item.code}">
<div class="finger-number">{{item.code>9?item.code:'0'+item.code}}</div>
<img class="finger-pic" :src="'data:image/jpeg;base64,'+item.image" />
......@@ -34,8 +34,8 @@
<div class="finger-name">{{item.name}}</div>
</div>
</el-tab-pane>
<el-tab-pane label="右手" name="right" class="left-hand">
<div class="fingerDom" v-for="(item) in rollFingersRight" :key="item.code" @click="rollFingersLeftChange(item)">
<el-tab-pane label="左手" name="left" class="left-hand">
<div class="fingerDom" v-for="(item) in rollFingersLeft" :key="item.code" @click="rollFingersLeftChange(item)">
<div v-if="item.image" class="fingerPic" :class="{fingerPicActive: activerollFinger===item.code}">
<div class="finger-number">{{item.code>9?item.code:'0'+item.code}}</div>
<img class="finger-pic" :src="'data:image/jpeg;base64,'+item.image" />
......@@ -52,8 +52,8 @@
</div>
<div class="left-right-hand" v-else-if="zwSelect==='平面指纹'">
<el-tabs v-model="activePainHand" @tab-click="handlePainClick">
<el-tab-pane label="左手" name="left" class="left-hand">
<div class="fingerDom" v-for="(item) in painFingersLeft" :key="item.code" @click="rollFingersLeftChange(item)">
<el-tab-pane label="右手" name="right" class="left-hand">
<div class="fingerDom" v-for="(item) in painFingersRight" :key="item.code" @click="rollFingersLeftChange(item)">
<div v-if="item.image" class="fingerPic" :class="{fingerPicActive: activerollFinger===item.code}">
<div class="finger-number">{{item.code}}</div>
<img class="finger-pic" :src="'data:image/jpeg;base64,'+item.image" />
......@@ -66,8 +66,8 @@
<div class="finger-name">{{item.name}}</div>
</div>
</el-tab-pane>
<el-tab-pane label="右手" name="right" class="left-hand">
<div class="fingerDom" v-for="(item) in painFingersRight" :key="item.code" @click="rollFingersLeftChange(item)">
<el-tab-pane label="左手" name="left" class="left-hand">
<div class="fingerDom" v-for="(item) in painFingersLeft" :key="item.code" @click="rollFingersLeftChange(item)">
<div v-if="item.image" class="fingerPic" :class="{fingerPicActive: activerollFinger===item.code}">
<div class="finger-number">{{item.code}}</div>
<img class="finger-pic" :src="'data:image/jpeg;base64,'+item.image" />
......@@ -102,8 +102,8 @@ export default {
// 人员编号
id: '',
zwSelect: '滚动指纹',
activeRollHand: 'left',
activePainHand: 'left',
activeRollHand: 'right',
activePainHand: 'right',
activerollFinger: '6',
rollFingersLeft: [
{
......@@ -231,6 +231,7 @@ export default {
await this.getPainFingers()
await this.getRollFingers()
await this.findFinger()
if (self.finger && self.finger.code) {
this.activerollFinger = self.finger.code
self.preSeq = this.activerollFinger
// 默认选中第一个出现的指纹
......@@ -241,6 +242,7 @@ export default {
// 滚动
self.getRollFingerOrigin(self.finger.code)
}
}
// setTimeout(() => {
// console.log(this.finger);
......@@ -403,6 +405,7 @@ export default {
}
self.PainFingerFlag = true
} else {
debugger
// 没有平面指纹，不能切换tabl栏
self.PainFingerFlag = false
}
......
src/views/cxyrd/TT.vue
......@@ -851,9 +851,7 @@ export default {
this.currentQqid = this.sourcedatas[i - 1].qqid;
this.sourcebarcode = this.sourcedatas[i - 1].barcode;
this.activeIndex3 -= 1;
} else {
this.$message.error("已经是第一条数据了");
}
this.fingerLoading = true;
// 指纹图清空
this.clearsource();
......@@ -864,7 +862,9 @@ export default {
this.getSourcePlainFingerPrintDetail(this.sourcebarcode);
// 获取候选列表
this.getMatchcandList();
} else {
this.$message.error("已经是第一条数据了");
}
console.info(this.currentQqid);
console.info(this.sourcebarcode);
},
......@@ -875,9 +875,7 @@ export default {
this.currentQqid = this.sourcedatas[i + 1].qqid;
this.sourcebarcode = this.sourcedatas[i + 1].barcode;
this.activeIndex3 += 1;
} else {
this.$message.error("已经是最后一条数据了");
}
this.fingerLoading = true;
// 指纹图清空
this.clearsource();
......@@ -888,6 +886,9 @@ export default {
this.getSourcePlainFingerPrintDetail(this.sourcebarcode);
// 获取候选列表
this.getMatchcandList();
} else {
this.$message.error("已经是最后一条数据了");
}
console.info(this.currentQqid);
console.info(this.sourcebarcode);
},
......
vue.config.js
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-11-15 10:49:44
* @LastEditTime: 2021-11-15 13:38:00
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js
......@@ -92,7 +92,7 @@ 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.110: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",
......
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