Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
founder_vue
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
常超
founder_vue
Commits
60c3488e
Commit
60c3488e
authored
Nov 15, 2021
by
liyuhang19990520
Browse files
Options
Browse Files
Download
Plain Diff
11
parents
8e8bc563
b075637b
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
199 additions
and
131 deletions
+199
-131
src/components/ImageEd.scss
+39
-24
src/components/ImageEd.vue
+50
-26
src/views/AllPersonnelBase/modules/fcx.vue
+3
-0
src/views/Editor/modules/imageEd.vue
+20
-10
src/views/Editor/modules/ryzwbjLeft.vue
+23
-20
src/views/cxyrd/TT.vue
+22
-21
src/views/cxyrd/modules/TLSrc.vue
+40
-28
vue.config.js
+2
-2
No files found.
src/components/ImageEd.scss
View file @
60c3488e
...
...
@@ -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
#055
FE7
!
important
;
.mr_size_active
{
.item_top
{
border
:
1px
solid
#055
fe7
!
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
:
#
DCDFE
9
;
background-color
:
#
dcdfe
9
;
border-left
:
7px
;
border-right
:
7px
;
box-sizing
:
border-box
;
...
...
@@ -1520,4 +1536,4 @@ div {
border-color
:
#fff
;
}
}
}
\ No newline at end of file
}
src/components/ImageEd.vue
View file @
60c3488e
<!--
* @Author: your name
* @Date: 2021-09-09 09:28:46
* @LastEditTime: 2021-11-1
3 13:05:18
* @LastEditTime: 2021-11-1
5 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
(
'曲线'
)
}
...
...
@@ -1084,22 +1092,22 @@ export default {
$btnUndo
.
on
(
'click'
,
function
()
{
self
.
initStatus
()
if
(
self
.
type
==
'source'
&&
!
imageEditor
.
isEmptyUndoStack
())
{
imageEditor
.
discardSelection
();
imageEditor
.
undo
();
}
else
if
(
!
imageEditor2
.
isEmptyUndoStack
())
{
imageEditor2
.
discardSelection
();
imageEditor2
.
undo
();
imageEditor
.
discardSelection
();
imageEditor
.
undo
();
}
else
if
(
!
imageEditor2
.
isEmptyUndoStack
())
{
imageEditor2
.
discardSelection
();
imageEditor2
.
undo
();
}
});
// 恢复
$btnRedo
.
on
(
'click'
,
function
()
{
if
(
self
.
type
==
'source'
&&
!
imageEditor
.
isEmptyRedoStack
())
{
imageEditor
.
discardSelection
();
imageEditor
.
redo
();
}
else
if
(
!
imageEditor2
.
isEmptyRedoStack
())
{
imageEditor2
.
discardSelection
();
imageEditor2
.
redo
();
imageEditor
.
discardSelection
();
imageEditor
.
redo
();
}
else
if
(
!
imageEditor2
.
isEmptyRedoStack
())
{
imageEditor2
.
discardSelection
();
imageEditor2
.
redo
();
}
});
...
...
@@ -1834,8 +1842,8 @@ export default {
* @description: 橡皮擦
* @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
)
{
this
.
imageEditor
.
applyFilter
(
'Contrast'
,
{
contrast
:
parseInt
(
newValue
,
10
)
/
255
,
}).
then
(
function
(
result
)
{
console
.
log
(
result
);
});
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
View file @
60c3488e
...
...
@@ -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
View file @
60c3488e
<!--
* @Author: your name
* @Date: 2021-10-22 11:36:10
* @LastEditTime: 2021-11-1
3 15:01:29
* @LastEditTime: 2021-11-1
4 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
View file @
60c3488e
<!--
* @Author: your name
* @Date: 2021-10-22 09:42:07
* @LastEditTime: 2021-11-1
3 11:21:36
* @LastEditTime: 2021-11-1
5 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=
"lef
t"
class=
"left-hand"
>
<div
class=
"fingerDom"
v-for=
"(item) in rollFingers
Lef
t"
:key=
"item.code"
@
click=
"rollFingersLeftChange(item)"
>
<el-tab-pane
label=
"
右手"
name=
"righ
t"
class=
"left-hand"
>
<div
class=
"fingerDom"
v-for=
"(item) in rollFingers
Righ
t"
: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=
"righ
t"
class=
"left-hand"
>
<div
class=
"fingerDom"
v-for=
"(item) in rollFingers
Righ
t"
:key=
"item.code"
@
click=
"rollFingersLeftChange(item)"
>
<el-tab-pane
label=
"
左手"
name=
"lef
t"
class=
"left-hand"
>
<div
class=
"fingerDom"
v-for=
"(item) in rollFingers
Lef
t"
: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=
"lef
t"
class=
"left-hand"
>
<div
class=
"fingerDom"
v-for=
"(item) in painFingers
Lef
t"
:key=
"item.code"
@
click=
"rollFingersLeftChange(item)"
>
<el-tab-pane
label=
"
右手"
name=
"righ
t"
class=
"left-hand"
>
<div
class=
"fingerDom"
v-for=
"(item) in painFingers
Righ
t"
: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=
"righ
t"
class=
"left-hand"
>
<div
class=
"fingerDom"
v-for=
"(item) in painFingers
Righ
t"
:key=
"item.code"
@
click=
"rollFingersLeftChange(item)"
>
<el-tab-pane
label=
"
左手"
name=
"lef
t"
class=
"left-hand"
>
<div
class=
"fingerDom"
v-for=
"(item) in painFingers
Lef
t"
: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
:
'
lef
t'
,
activePainHand
:
'
lef
t'
,
activeRollHand
:
'
righ
t'
,
activePainHand
:
'
righ
t'
,
activerollFinger
:
'6'
,
rollFingersLeft
:
[
{
...
...
@@ -231,15 +231,17 @@ export default {
await
this
.
getPainFingers
()
await
this
.
getRollFingers
()
await
this
.
findFinger
()
this
.
activerollFinger
=
self
.
finger
.
code
self
.
preSeq
=
this
.
activerollFinger
// 默认选中第一个出现的指纹
if
(
self
.
finger
.
code
>
10
)
{
// 平面
self
.
getPainFingerOrigin
(
self
.
finger
.
code
)
}
else
{
// 滚动
self
.
getRollFingerOrigin
(
self
.
finger
.
code
)
if
(
self
.
finger
&&
self
.
finger
.
code
)
{
this
.
activerollFinger
=
self
.
finger
.
code
self
.
preSeq
=
this
.
activerollFinger
// 默认选中第一个出现的指纹
if
(
self
.
finger
.
code
>
10
)
{
// 平面
self
.
getPainFingerOrigin
(
self
.
finger
.
code
)
}
else
{
// 滚动
self
.
getRollFingerOrigin
(
self
.
finger
.
code
)
}
}
// setTimeout(() => {
...
...
@@ -403,6 +405,7 @@ export default {
}
self
.
PainFingerFlag
=
true
}
else
{
debugger
// 没有平面指纹,不能切换tabl栏
self
.
PainFingerFlag
=
false
}
...
...
src/views/cxyrd/TT.vue
View file @
60c3488e
...
...
@@ -851,20 +851,20 @@ export default {
this
.
currentQqid
=
this
.
sourcedatas
[
i
-
1
].
qqid
;
this
.
sourcebarcode
=
this
.
sourcedatas
[
i
-
1
].
barcode
;
this
.
activeIndex3
-=
1
;
this
.
fingerLoading
=
true
;
// 指纹图清空
this
.
clearsource
();
this
.
cleardest
();
// 获取源的滚动
this
.
getSourceRollFingerPrintDetail
(
this
.
sourcebarcode
);
// 获取源的平面
this
.
getSourcePlainFingerPrintDetail
(
this
.
sourcebarcode
);
// 获取候选列表
this
.
getMatchcandList
();
}
else
{
this
.
$message
.
error
(
"已经是第一条数据了"
);
}
this
.
fingerLoading
=
true
;
// 指纹图清空
this
.
clearsource
();
this
.
cleardest
();
// 获取源的滚动
this
.
getSourceRollFingerPrintDetail
(
this
.
sourcebarcode
);
// 获取源的平面
this
.
getSourcePlainFingerPrintDetail
(
this
.
sourcebarcode
);
// 获取候选列表
this
.
getMatchcandList
();
console
.
info
(
this
.
currentQqid
);
console
.
info
(
this
.
sourcebarcode
);
},
...
...
@@ -875,19 +875,20 @@ export default {
this
.
currentQqid
=
this
.
sourcedatas
[
i
+
1
].
qqid
;
this
.
sourcebarcode
=
this
.
sourcedatas
[
i
+
1
].
barcode
;
this
.
activeIndex3
+=
1
;
this
.
fingerLoading
=
true
;
// 指纹图清空
this
.
clearsource
();
this
.
cleardest
();
// 获取源的滚动
this
.
getSourceRollFingerPrintDetail
(
this
.
sourcebarcode
);
// 获取源的平面
this
.
getSourcePlainFingerPrintDetail
(
this
.
sourcebarcode
);
// 获取候选列表
this
.
getMatchcandList
();
}
else
{
this
.
$message
.
error
(
"已经是最后一条数据了"
);
}
this
.
fingerLoading
=
true
;
// 指纹图清空
this
.
clearsource
();
this
.
cleardest
();
// 获取源的滚动
this
.
getSourceRollFingerPrintDetail
(
this
.
sourcebarcode
);
// 获取源的平面
this
.
getSourcePlainFingerPrintDetail
(
this
.
sourcebarcode
);
// 获取候选列表
this
.
getMatchcandList
();
console
.
info
(
this
.
currentQqid
);
console
.
info
(
this
.
sourcebarcode
);
},
...
...
src/views/cxyrd/modules/TLSrc.vue
View file @
60c3488e
...
...
@@ -24,22 +24,21 @@
<div
class=
"finger-print"
v-show=
"isShowPrint"
>
<div
class=
"btns"
>
<div
class=
"btn"
@
click=
"switchRoll"
:class=
"
{active: fingerShowType == 'roll'}">滚动
</div>
<div
class=
"btn"
@
click=
"switchPain"
:class=
"
{active: fingerShowType == 'pain'}">平面
</div>
<div
class=
"btn"
@
click=
"switchPain"
:class=
"
{active: fingerShowType == 'pain'
, isHasData: !painFlag
}">平面
</div>
</div>
<!-- 滚动 -->
<div
class=
"fingers"
v-if=
"fingerShowType=='roll'"
>
<div
class=
"outside"
>
<label>
左手
</label>
<br
/>
<label>
右手
</label><br
/>
<div
class=
"fingersImg"
>
<div
class=
"finger"
v-for=
"(item, index) in fingers
LeftR"
:key=
"index"
:class=
"
{noFinger: !item.image, fingerLoading: !item.image
&&
fingerLoading, fingerLook: item.clickLog==1, fingerRD: item.affirmstatus==1, fingerBZ:item.affirmstatus==2, fingerRB:item.affirmstatus==3, finger_print_active: item.code === isActive}" @click="changeStyleLef
tR(index, item)">
<div
class=
"finger"
v-for=
"(item, index) in fingers
RightR"
:key=
"index"
:class=
"
{noFinger: !item.image, fingerLoading: !item.image
&&
fingerLoading, fingerLook: item.clickLog==1, fingerRD: item.affirmstatus==1, fingerBZ:item.affirmstatus==2, fingerRB:item.affirmstatus==3, finger_print_active: item.code === isActive}" @click="changeStyleRigh
tR(index, item)">
<!--
<svg-icon
v-if=
"fingerLoading"
icon-class=
"loading"
class=
"icon"
/>
-->
<img
v-if=
"fingerLoading"
src=
"@/assets/img/smallfinger.gif"
alt=
""
class=
"icon"
>
<div
v-else
>
<div
class=
"num"
:class=
"
{noFinger: !item.image}">
{{
item
.
name
}}
</div>
<!-- 有指纹图片 -->
<div
v-if=
"item.image"
>
<img
:src=
"'data:image/jpeg;base64,' + item.image"
style=
"width: 100
px;height: 100px
;"
/>
<img
:src=
"'data:image/jpeg;base64,' + item.image"
style=
"width: 100
%;height: 100%
;"
/>
<div
class=
"finger-tips"
>
<!-- 认定完成 -->
<div
class=
"affirmstatus1"
v-if=
"item.affirmstatus==1"
>
...
...
@@ -83,16 +82,17 @@
</div>
<br
/><br
/>
<div
class=
"outside"
>
<label>
右手
</label><br
/>
<label>
左手
</label>
<br
/>
<div
class=
"fingersImg"
>
<div
class=
"finger"
v-for=
"(item, index) in fingers
RightR"
:key=
"index"
:class=
"
{noFinger: !item.image, fingerLoading: !item.image
&&
fingerLoading, fingerLook: item.clickLog==1, fingerRD: item.affirmstatus==1, fingerBZ:item.affirmstatus==2, fingerRB:item.affirmstatus==3, finger_print_active: item.code === isActive}" @click="changeStyleRigh
tR(index, item)">
<div
class=
"finger"
v-for=
"(item, index) in fingers
LeftR"
:key=
"index"
:class=
"
{noFinger: !item.image, fingerLoading: !item.image
&&
fingerLoading, fingerLook: item.clickLog==1, fingerRD: item.affirmstatus==1, fingerBZ:item.affirmstatus==2, fingerRB:item.affirmstatus==3, finger_print_active: item.code === isActive}" @click="changeStyleLef
tR(index, item)">
<!--
<svg-icon
v-if=
"fingerLoading"
icon-class=
"loading"
class=
"icon"
/>
-->
<img
v-if=
"fingerLoading"
src=
"@/assets/img/smallfinger.gif"
alt=
""
class=
"icon"
>
<div
v-else
>
<div
class=
"num"
:class=
"
{noFinger: !item.image}">
{{
item
.
name
}}
</div>
<!-- 有指纹图片 -->
<div
v-if=
"item.image"
>
<img
:src=
"'data:image/jpeg;base64,' + item.image"
style=
"width: 100
px;height: 100px
;"
/>
<img
:src=
"'data:image/jpeg;base64,' + item.image"
style=
"width: 100
%;height: 100%
;"
/>
<div
class=
"finger-tips"
>
<!-- 认定完成 -->
<div
class=
"affirmstatus1"
v-if=
"item.affirmstatus==1"
>
...
...
@@ -138,17 +138,16 @@
<!-- 平面 -->
<div
class=
"fingers"
v-else
>
<div
class=
"outside"
>
<label>
左手
</label>
<br
/>
<label>
右手
</label><br
/>
<div
class=
"fingersImg"
>
<div
class=
"finger"
v-for=
"(item, index) in fingers
LeftL"
:key=
"index"
:class=
"
{noFinger: !item.image, fingerLoading: !item.image
&&
fingerLoading, fingerLook: item.clickLog==1, fingerRD: item.affirmstatus==1, fingerBZ:item.affirmstatus==2, fingerRB:item.affirmstatus==3, finger_print_active: item.code === isActive}" @click="changeStyleLef
tL(index, item)">
<div
class=
"finger"
v-for=
"(item, index) in fingers
RightL"
:key=
"index"
:class=
"
{noFinger: !item.image, fingerLoading: !item.image
&&
fingerLoading, fingerLook: item.clickLog==1, fingerRD: item.affirmstatus==1, fingerBZ:item.affirmstatus==2, fingerRB:item.affirmstatus==3, finger_print_active: item.code === isActive}" @click="changeStyleRigh
tL(index, item)">
<!--
<svg-icon
v-if=
"fingerLoading"
icon-class=
"loading"
class=
"icon"
/>
-->
<img
v-if=
"fingerLoading"
src=
"@/assets/img/smallfinger.gif"
alt=
""
class=
"icon"
>
<div
v-else
>
<div
class=
"num"
:class=
"
{noFinger: !item.image}">
{{
item
.
name
}}
</div>
<!-- 有指纹图片 -->
<div
v-if=
"item.image"
>
<img
:src=
"'data:image/jpeg;base64,' + item.image"
style=
"width: 100
px;height: 100px
;"
/>
<img
:src=
"'data:image/jpeg;base64,' + item.image"
style=
"width: 100
%;height: 100%
;"
/>
<div
class=
"finger-tips"
>
<!-- 认定完成 -->
<div
class=
"affirmstatus1"
v-if=
"item.affirmstatus==1"
>
...
...
@@ -175,7 +174,7 @@
</div>
</div>
-->
<!-- 浏览过 -->
<div
class=
"clickLog"
v-if=
"item.affirmstatus==
=
'' && item.clickLog==1"
>
<div
class=
"clickLog"
v-if=
"item.affirmstatus=='' && item.clickLog==1"
>
<div
class=
"clickLogbg"
></div>
<div
class=
"dot"
></div>
<span
class=
"txt"
>
已查看
</span>
...
...
@@ -192,16 +191,17 @@
</div>
<br
/><br
/>
<div
class=
"outside"
>
<label>
右手
</label><br
/>
<label>
左手
</label>
<br
/>
<div
class=
"fingersImg"
>
<div
class=
"finger"
v-for=
"(item, index) in fingers
RightL"
:key=
"index"
:class=
"
{noFinger: !item.image, fingerLoading: !item.image
&&
fingerLoading, fingerLook: item.clickLog==1, fingerRD: item.affirmstatus==1, fingerBZ:item.affirmstatus==2, fingerRB:item.affirmstatus==3, finger_print_active: item.code === isActive}" @click="changeStyleRigh
tL(index, item)">
<div
class=
"finger"
v-for=
"(item, index) in fingers
LeftL"
:key=
"index"
:class=
"
{noFinger: !item.image, fingerLoading: !item.image
&&
fingerLoading, fingerLook: item.clickLog==1, fingerRD: item.affirmstatus==1, fingerBZ:item.affirmstatus==2, fingerRB:item.affirmstatus==3, finger_print_active: item.code === isActive}" @click="changeStyleLef
tL(index, item)">
<!--
<svg-icon
v-if=
"fingerLoading"
icon-class=
"loading"
class=
"icon"
/>
-->
<img
v-if=
"fingerLoading"
src=
"@/assets/img/smallfinger.gif"
alt=
""
class=
"icon"
>
<div
v-else
>
<div
class=
"num"
:class=
"
{noFinger: !item.image}">
{{
item
.
name
}}
</div>
<!-- 有指纹图片 -->
<div
v-if=
"item.image"
>
<img
:src=
"'data:image/jpeg;base64,' + item.image"
style=
"width: 100
px;height: 100px
;"
/>
<img
:src=
"'data:image/jpeg;base64,' + item.image"
style=
"width: 100
%;height: 100%
;"
/>
<div
class=
"finger-tips"
>
<!-- 认定完成 -->
<div
class=
"affirmstatus1"
v-if=
"item.affirmstatus==1"
>
...
...
@@ -228,7 +228,7 @@
</div>
</div>
-->
<!-- 浏览过 -->
<div
class=
"clickLog"
v-if=
"item.affirmstatus=='' && item.clickLog==1"
>
<div
class=
"clickLog"
v-if=
"item.affirmstatus==
=
'' && item.clickLog==1"
>
<div
class=
"clickLogbg"
></div>
<div
class=
"dot"
></div>
<span
class=
"txt"
>
已查看
</span>
...
...
@@ -243,6 +243,7 @@
</div>
</div>
</div>
</div>
<div
class=
"bottom"
>
<span>
该查询ID共计
<b>
{{
fingerTotal
}}
</b>
枚指纹
</span>
...
...
@@ -324,7 +325,9 @@ export default {
{
name
:
'小'
,
code
:
15
,
image
:
null
},
],
// 指纹图片加载
fingerLoading
:
true
fingerLoading
:
true
,
// 平面的tab栏是否可以点击
painFlag
:
true
};
},
mounted
()
{
...
...
@@ -373,6 +376,7 @@ export default {
* @return {*}
*/
switchPain
()
{
if
(
!
this
.
painFlag
)
return
;
this
.
fingerShowType
=
'pain'
},
/**
...
...
@@ -464,6 +468,7 @@ export default {
self
.
fingerTotalPain
=
fingerPain
.
data
.
ret
.
length
});
}
else
{
// 平面没有指纹
self
.
fingersLeftL
.
forEach
(
itemL
=>
{
// itemL.img = null
self
.
$set
(
itemL
,
'image'
,
null
)
...
...
@@ -476,6 +481,8 @@ export default {
self
.
$set
(
itemL
,
'clickLog'
,
''
)
self
.
$set
(
itemL
,
'affirmstatus'
,
''
)
})
// 平面不可点击
self
.
painFlag
=
false
}
...
...
@@ -608,8 +615,7 @@ export default {
async
findFinger
()
{
let
self
=
this
self
.
finger
=
null
console
.
log
(
self
.
fingersLeftR
);
self
.
fingersLeftR
.
some
((
item
,
index
)
=>
{
self
.
fingersRightR
.
some
((
item
,
index
)
=>
{
if
(
item
.
image
!=
null
)
{
self
.
finger
=
item
return
true
...
...
@@ -617,7 +623,8 @@ export default {
})
console
.
log
(
self
.
finger
);
if
(
self
.
finger
)
return
self
.
finger
self
.
fingersRightR
.
some
((
item
,
index
)
=>
{
console
.
log
(
self
.
fingersLeftR
);
self
.
fingersLeftR
.
some
((
item
,
index
)
=>
{
if
(
item
.
image
!=
null
)
{
self
.
finger
=
item
return
true
...
...
@@ -625,7 +632,8 @@ export default {
})
console
.
log
(
self
.
finger
);
if
(
self
.
finger
)
return
self
.
finger
self
.
fingersLeftL
.
some
((
item
,
index
)
=>
{
if
(
self
.
finger
)
return
self
.
finger
self
.
fingersRightL
.
some
((
item
,
index
)
=>
{
if
(
item
.
image
!=
null
)
{
self
.
finger
=
item
return
true
...
...
@@ -633,14 +641,14 @@ export default {
})
console
.
log
(
self
.
finger
);
if
(
self
.
finger
)
return
self
.
finger
self
.
fingers
Righ
tL
.
some
((
item
,
index
)
=>
{
self
.
fingers
Lef
tL
.
some
((
item
,
index
)
=>
{
if
(
item
.
image
!=
null
)
{
self
.
finger
=
item
return
true
}
})
console
.
log
(
self
.
finger
);
if
(
self
.
finger
)
return
self
.
finger
return
self
.
finger
},
// 获取选择的任务详情
...
...
@@ -655,7 +663,7 @@ export default {
changeTableHeight
()
{
this
.
isShowPrint
=
!
this
.
isShowPrint
;
if
(
!
this
.
isShowPrint
)
{
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--tableHeight'
,
'48.75rem'
);
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--tableHeight'
,
'48.75rem'
);
// this.tableHeight = 810
this
.
options
=
'折叠'
$
(
'.ico'
).
css
(
'transform'
,
'rotate(180deg)'
)
...
...
@@ -914,6 +922,10 @@ label {
color
:
#ffffff
;
}
}
.isHasData
{
background-color
:
#ECEDF1
;
color
:
#AEAFB4
;
}
}
.fingers
{
background
:
#f6f8fa
;
...
...
@@ -974,7 +986,7 @@ label {
width
:
100%
;
height
:
100%
;
position
:
absolute
;
background
:
linear-gradient
(
180deg
,
rgba
(
255
,
255
,
255
,
0
)
0
%
,
#000000
100%
);
background
:
linear-gradient
(
180deg
,
rgba
(
255
,
255
,
255
,
0
)
-35
%
,
#000000
100%
);
opacity
:
0.66
;
}
.dot
{
...
...
@@ -1010,7 +1022,7 @@ label {
width
:
100%
;
height
:
100%
;
position
:
absolute
;
background
:
linear-gradient
(
180deg
,
rgba
(
255
,
255
,
255
,
0
)
0
%
,
#000000
100%
);
background
:
linear-gradient
(
180deg
,
rgba
(
255
,
255
,
255
,
0
)
-35
%
,
#000000
100%
);
opacity
:
0.66
;
}
.icon
{
...
...
@@ -1037,7 +1049,7 @@ label {
width
:
100%
;
height
:
100%
;
position
:
absolute
;
background
:
linear-gradient
(
180deg
,
rgba
(
255
,
255
,
255
,
0
)
0
%
,
#000000
100%
);
background
:
linear-gradient
(
180deg
,
rgba
(
255
,
255
,
255
,
0
)
-35
%
,
#000000
100%
);
opacity
:
0.66
;
}
.dot
{
...
...
vue.config.js
View file @
60c3488e
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-11-15 1
0:49:44
* @LastEditTime: 2021-11-15 1
3: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",
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment