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
11c2df41
Commit
11c2df41
authored
Jan 20, 2022
by
米嘉伟
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev_zwpt' of
http://39.99.224.27:9022/changchao/founder_vue
into dev_zwpt
parents
34a04497
25fbd63d
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
122 additions
and
71 deletions
+122
-71
public/index.html
+7
-1
src/views/Editor/modules/imageEd.scss
+1
-1
src/views/Editor/modules/imageEdAJ.vue
+97
-62
src/views/Editor/modules/ryzwbjLeft.scss
+9
-5
src/views/zzwcj/fingerprint.vue
+8
-2
src/views/zzwlr/xzry.vue
+0
-0
No files found.
public/index.html
View file @
11c2df41
<!--
* @Author: your name
* @Date: 2021-12-01 09:52:17
* @LastEditTime: 2022-01-
19 13:33:43
* @LastEditTime: 2022-01-
20 09:58:14
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \指纹系统\founder_vue\public\index.html
...
...
@@ -41,6 +41,12 @@
}
img
{
-webkit-user-drag
:
none
;
-moz-user-select
:
none
;
-o-user-select
:
none
;
-khtml-user-select
:
none
;
-webkit-user-select
:
none
;
-ms-user-select
:
none
;
user-select
:
none
;
}
.el-dialog__wrapper
{
...
...
src/views/Editor/modules/imageEd.scss
View file @
11c2df41
...
...
@@ -1009,7 +1009,7 @@ $previewHeight: var(--previewHeight, 100%);
justify-content: center;
flex-wrap: wrap;
.face-item {
width: 2
0
3.2px;
width: 2
3
3.2px;
display: flex;
flex-direction: column;
justify-content: center;
...
...
src/views/Editor/modules/imageEdAJ.vue
View file @
11c2df41
...
...
@@ -300,8 +300,8 @@
</div>
<div
class=
"tjxh"
>
<span>
推荐序号
</span>
<input
v-if=
"zwType=='指纹'"
type=
"text"
v-model=
"tjxh"
onblur=
"if(value>99)value=99;if(value
<1
)
value=
1"
/>
<input
v-else
type=
"text"
v-model=
"tjxh"
onblur=
"if(value
<101
)
value=
101"
/>
<input
v-if=
"zwType=='指纹'"
type=
"text"
v-model=
"tjxh"
/>
<input
v-else
type=
"text"
v-model=
"tjxh"
/>
</div>
</div>
<div
class=
"line3"
></div>
...
...
@@ -334,7 +334,7 @@
</div>
<div
class=
"line4"
></div>
<div
class=
"btn6"
>
<div
class=
"bcrk bcrkActive"
@
click
.
stop=
"saveToKuChange"
v-if=
"bcrkActive"
>
<div
class=
"bcrk bcrkActive"
@
click
.
stop=
"saveToKuChange"
v-if=
"bcrkActive
&& is_tjxh_legal
"
>
保存入库
</div>
<div
class=
"bcrk"
v-else
>
保存入库
</div>
...
...
@@ -667,6 +667,10 @@ import MouseGesture from "./tzd_rotate.js";
export
default
{
data
()
{
return
{
// 判断手纹框是否可以移动
swk_move_flag
:
false
,
// 推荐序号是否合格
is_tjxh_legal
:
false
,
// 是否画了比例尺
isTjswk
:
false
,
isShowFcx
:
false
,
//发查询
...
...
@@ -1922,6 +1926,7 @@ export default {
}
else
{
self
.
txbj_type
=
'未处理'
}
self
.
swk_move_flag
=
false
// 缩放为1
self
.
zoomLevel
=
1
;
imageEditor
.
resetZoom
();
...
...
@@ -3755,6 +3760,12 @@ export default {
// $(".icon_rotate").css("background", "rgba(5, 95, 231, 0.05)");
// self.isRotateOptions_dr = false
// self.isActive_rotate_dr = false
})
document
.
addEventListener
(
'mouseup'
,
function
(
e
)
{
console
.
log
(
e
);
self
.
swk_move_flag
=
false
;
})
this
.
$bus
.
on
(
"zwType"
,
(
zwType
)
=>
{
...
...
@@ -5388,6 +5399,7 @@ export default {
self
.
small_y
=
0
;
console
.
log
(
"添加手纹框"
);
this
.
isSwk_flag
=
!
this
.
isSwk_flag
;
self
.
swk_move_flag
=
false
function
dragable
(
id
)
{
var
d
=
document
,
...
...
@@ -5402,45 +5414,46 @@ export default {
y
=
e
.
clientY
-
o
.
offsetTop
;
self
.
x
=
x
self
.
y
=
y
self
.
swk_move_flag
=
true
o
[
p
]
=
function
(
e
)
{
e
=
e
||
event
;
s
.
left
=
e
.
clientX
-
x
+
"px"
;
s
.
top
=
e
.
clientY
-
y
+
"px"
;
// 存下小指纹框当前的位置
self
.
small_x
=
e
.
clientX
-
x
;
self
.
small_y
=
e
.
clientY
-
y
;
if
(
self
.
isCrop
)
{
$
(
".blc"
).
css
(
"left"
,
((
e
.
clientX
-
x
)
/
$
(
".small-drawing"
).
width
())
*
$
(
".body-container"
).
width
()
+
"px"
);
$
(
".blc"
).
css
(
"top"
,
((
e
.
clientY
-
y
)
/
$
(
".small-drawing"
).
height
())
*
$
(
".body-container"
).
height
()
+
"px"
);
}
else
{
self
.
caclDzwkPos
();
return
;
const
canvasImage
=
self
.
imageEditor
.
_graphics
.
getCanvasImage
();
if
(
canvasImage
)
{
self
.
move_left
=
canvasImage
.
left
;
self
.
move_top
=
canvasImage
.
top
;
if
(
self
.
swk_move_flag
)
{
s
.
left
=
e
.
clientX
-
x
+
"px"
;
s
.
top
=
e
.
clientY
-
y
+
"px"
;
// 存下小指纹框当前的位置
self
.
small_x
=
e
.
clientX
-
x
;
self
.
small_y
=
e
.
clientY
-
y
;
if
(
self
.
isCrop
)
{
$
(
".blc"
).
css
(
"left"
,
((
e
.
clientX
-
x
)
/
$
(
".small-drawing"
).
width
())
*
$
(
".body-container"
).
width
()
+
"px"
);
$
(
".blc"
).
css
(
"top"
,
((
e
.
clientY
-
y
)
/
$
(
".small-drawing"
).
height
())
*
$
(
".body-container"
).
height
()
+
"px"
);
}
else
{
self
.
caclDzwkPos
();
return
;
const
canvasImage
=
self
.
imageEditor
.
_graphics
.
getCanvasImage
();
if
(
canvasImage
)
{
self
.
move_left
=
canvasImage
.
left
;
self
.
move_top
=
canvasImage
.
top
;
}
console
.
log
(
canvasImage
.
left
);
console
.
log
(
canvasImage
.
top
);
console
.
log
(
canvasImage
.
getCenterPoint
());
}
console
.
log
(
canvasImage
.
left
);
console
.
log
(
canvasImage
.
top
);
console
.
log
(
canvasImage
.
getCenterPoint
());
}
};
o
.
onmouseup
=
function
(
e
)
{
if
(
e
.
which
===
1
)
{
o
[
p
]
=
null
;
self
.
swk_move_flag
=
false
console
.
log
(
"x:"
+
(
e
.
clientX
-
x
),
"---- y:"
+
(
e
.
clientY
-
y
)
...
...
@@ -5482,39 +5495,44 @@ export default {
e
=
e
||
event
;
x
=
e
.
clientX
-
o
.
offsetLeft
;
y
=
e
.
clientY
-
o
.
offsetTop
;
self
.
swk_move_flag
=
true
o
[
p
]
=
function
(
e
)
{
e
=
e
||
event
;
s
.
left
=
e
.
clientX
-
x
+
"px"
;
s
.
top
=
e
.
clientY
-
y
+
"px"
;
// 存下大指纹框当前的位置
self
.
big_x
=
e
.
clientX
-
x
;
self
.
big_y
=
e
.
clientY
-
y
;
if
(
self
.
isCrop
)
{
$
(
".blc_small"
).
css
(
"left"
,
((
e
.
clientX
-
x
)
/
$
(
".body-container"
).
width
())
*
$
(
".small-drawing"
).
width
()
+
"px"
);
$
(
".blc_small"
).
css
(
"top"
,
((
e
.
clientY
-
y
)
/
$
(
".body-container"
).
width
())
*
$
(
".small-drawing"
).
width
()
+
"px"
);
}
else
{
console
.
log
((((
e
.
clientX
-
x
)
/
$
(
".body-container"
).
width
())
*
$
(
".small-drawing"
).
width
())
/
self
.
bb
+
self
.
small_x
);
console
.
log
((((
e
.
clientX
-
x
)
/
$
(
".body-container"
).
width
())
*
$
(
".small-drawing"
).
width
())
/
self
.
frame_max_bb
+
self
.
small_x
);
if
(
self
.
swk_move_flag
)
{
s
.
left
=
e
.
clientX
-
x
+
"px"
;
s
.
top
=
e
.
clientY
-
y
+
"px"
;
// 存下大指纹框当前的位置
self
.
big_x
=
e
.
clientX
-
x
;
self
.
big_y
=
e
.
clientY
-
y
;
if
(
self
.
isCrop
)
{
$
(
".blc_small"
).
css
(
"left"
,
((
e
.
clientX
-
x
)
/
$
(
".body-container"
).
width
())
*
$
(
".small-drawing"
).
width
()
+
"px"
);
$
(
".blc_small"
).
css
(
"top"
,
((
e
.
clientY
-
y
)
/
$
(
".body-container"
).
width
())
*
$
(
".small-drawing"
).
width
()
+
"px"
);
}
else
{
console
.
log
((((
e
.
clientX
-
x
)
/
$
(
".body-container"
).
width
())
*
$
(
".small-drawing"
).
width
())
/
self
.
bb
+
self
.
small_x
);
console
.
log
((((
e
.
clientX
-
x
)
/
$
(
".body-container"
).
width
())
*
$
(
".small-drawing"
).
width
())
/
self
.
frame_max_bb
+
self
.
small_x
);
self
.
caclXzwkPos
();
self
.
caclXzwkPos
();
}
const
canvasImage
=
self
.
imageEditor
.
_graphics
.
getCanvasImage
();
console
.
log
(
canvasImage
.
left
);
console
.
log
(
canvasImage
.
top
);
console
.
log
(
canvasImage
.
getCenterPoint
());
}
const
canvasImage
=
self
.
imageEditor
.
_graphics
.
getCanvasImage
();
console
.
log
(
canvasImage
.
left
);
console
.
log
(
canvasImage
.
top
);
console
.
log
(
canvasImage
.
getCenterPoint
());
};
o
.
onmouseup
=
function
(
e
)
{
self
.
swk_move_flag
=
false
o
[
p
]
=
null
;
if
(
e
.
which
===
1
)
{
// console.log('x:' + (e.clientX - x), '---- y:' + (e.clientY - y));
// console.log('x:' + (e.clientX - x) / $('.body-container').width() * $('.small-drawing').width(), '---- y:' + (e.clientY - y) / $('.body-container').width() * $('.small-drawing').width());
...
...
@@ -7273,7 +7291,7 @@ export default {
// console.log(self.circleArr_hand);
let
circleArr_hand_t
=
[];
let
circleArr_hand_t2
=
[];
if
(
self
.
circleArr_hand
)
{
self
.
circleArr_hand
.
forEach
((
item
)
=>
{
circleArr_hand_t
.
push
({
...
...
@@ -8752,6 +8770,23 @@ export default {
},
},
watch
:
{
tjxh
(
newValue
,
oldValue
)
{
if
(
this
.
zwType
==
'指纹'
)
{
if
(
newValue
<
1
||
newValue
>
99
)
{
this
.
$message
.
warning
(
'推荐序号超出限制!'
)
this
.
is_tjxh_legal
=
false
}
else
{
this
.
is_tjxh_legal
=
true
}
}
else
{
if
(
newValue
<
101
)
{
this
.
$message
.
warning
(
'推荐序号超出限制!'
)
this
.
is_tjxh_legal
=
false
}
else
{
this
.
is_tjxh_legal
=
true
}
}
},
// 监听特征点的数量
tzdnumber
:
{
handler
:
function
(
newValue
,
oldValue
)
{
...
...
src/views/Editor/modules/ryzwbjLeft.scss
View file @
11c2df41
...
...
@@ -302,15 +302,19 @@
margin-top
:
2px
;
}
.face-total
{
margin-top
:
220px
;
//
margin-top: 220px;
}
}
// 人像样式
.face
{
display
:
flex
;
align-items
:
center
;
flex-wrap
:
wrap
;
.left-right-hand.face
{
// display: flex;
// align-items: center;
// flex-wrap: wrap;
margin-top
:
16px
;
height
:
686px
;
.face-item
{
float
:
left
;
height
:
180px
;
margin-right
:
16px
;
display
:
flex
;
flex-direction
:
column
;
...
...
src/views/zzwcj/fingerprint.vue
View file @
11c2df41
...
...
@@ -604,12 +604,18 @@
<div
class=
"line-first"
>
<div
class=
"left"
>
<div
class=
"icon"
>
<img
src=
"../../assets/img/zw/info.png"
alt=
""
>
<img
v-if=
"themeType == '深色' || themeType == '浅色'"
src=
"../../assets/img/zw/info.png"
alt=
""
>
<span
v-if=
"themeType == '默认'"
style=
"color: #005fe7;"
>

</span>
</div>
<div
class=
"title"
>
{{
errTitle
}}
</div>
</div>
<div
class=
"close"
@
click=
"closeAlert"
>
<img
src=
"../../assets/img/zw/close.png"
alt=
""
>
<img
v-if=
"themeType == '深色' || themeType == '浅色'"
src=
"../../assets/img/zw/close.png"
alt=
""
>
<span
v-if=
"themeType == '默认'"
style=
"color: #005fe7;"
>

</span>
</div>
</div>
<div
class=
"line-second"
>
{{
errDescription
}}
</div>
...
...
src/views/zzwlr/xzry.vue
View file @
11c2df41
This diff is collapsed.
Click to expand it.
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