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
4a7e195e
Commit
4a7e195e
authored
Dec 13, 2021
by
李萌萌
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev_zwpt' of
http://47.92.108.28/changchao/founder_vue
into dev_zwpt
parents
6982225c
cca13487
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
109 additions
and
66 deletions
+109
-66
src/views/Editor/modules/imageEdAJ.scss
+39
-18
src/views/Editor/modules/imageEdAJ.vue
+40
-43
src/views/bzxxgl/bzxxfh.vue
+4
-1
src/views/bzxxgl/fhxxLT.vue
+0
-0
src/views/bzxxgl/fhxxTL.vue
+23
-1
vue.config.js
+3
-3
No files found.
src/views/Editor/modules/imageEdAJ.scss
View file @
4a7e195e
...
...
@@ -875,11 +875,17 @@ $canvasWidth: var(--canvasWidth, 640px);
align-items: center;
// justify-content: center;
.small-drawing2 {
position: absolute;
width: 180px;
height: 180px;
position: relative;
}
img {
position: absolute;
left: 0;
right: 0;
top: 0;
bottom: 0;
margin: auto;
width: $canvasWidth;
height: $canvasHeight;
}
...
...
@@ -937,23 +943,38 @@ $canvasWidth: var(--canvasWidth, 640px);
.body-container {
position: relative;
width: 6
4
0px;
height: 6
4
0px;
width: 6
7
0px;
height: 6
7
0px;
background: #ffffff;
display: flex;
filter: "
FlipV
";
justify-content: center;
align-items: center;
.tui-image-editor {
width: 640px !important;
height: 640px !important;
width: 670px !important;
height: 670px !important;
position: relative;
border: 1px solid #055FE7;
border-top: 1px solid #E02020;
}
/deep/ .tui-image-editor-canvas-container,
/deep/ .tui-image-editor-canvas-container {
height: 100% !important;
width: 100% !important;
max-height: 670px !important;
max-width: 670px !important;
position: relative;
}
/deep/ .lower-canvas,
/deep/ .upper-canvas {
max-height: 640px !important;
max-width: 640px !important;
position: absolute;
left: 0;
right: 0;
bottom: 0;
top:0;
margin: auto;
max-height: 670px !important;
max-width: 670px !important;
height: $canvasHeight !important;
width: $canvasWidth !important;
// height: auto !important;
...
...
@@ -1034,8 +1055,8 @@ $canvasWidth: var(--canvasWidth, 640px);
}
.tzdDrawing {
width: 6
4
0px;
height: 6
4
0px;
width: 6
7
0px;
height: 6
7
0px;
position: absolute;
background: transparent;
overflow: hidden;
...
...
@@ -1046,16 +1067,16 @@ $canvasWidth: var(--canvasWidth, 640px);
}
.tzdDrawing_2 {
width: 6
4
0px;
height: 6
4
0px;
width: 6
7
0px;
height: 6
7
0px;
position: absolute;
background: transparent;
transform-origin: 320px 320px;
}
.irregular {
width: 6
4
0px;
height: 6
4
0px;
width: 6
7
0px;
height: 6
7
0px;
position: absolute;
background: transparent;
overflow: hidden;
...
...
@@ -1063,15 +1084,15 @@ $canvasWidth: var(--canvasWidth, 640px);
}
.rule_line {
width: 6
4
0px;
height: 6
4
0px;
width: 6
7
0px;
height: 6
7
0px;
position: absolute;
}
/deep/ .canvas-container {
position: absolute !important;
width: 6
4
0px !important;
height: 6
4
0px !important;
width: 6
7
0px !important;
height: 6
7
0px !important;
z-index: 9;
}
}
...
...
src/views/Editor/modules/imageEdAJ.vue
View file @
4a7e195e
<!--
* @Author: your name
* @Date: 2021-10-22 11:36:10
* @LastEditTime: 2021-12-13 1
6:07:03
* @LastEditTime: 2021-12-13 1
7:01:56
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue
...
...
@@ -499,7 +499,8 @@
</div>
</div>
</div>
<div
class=
"mask"
v-show=
"startEditImage"
></div>
<!--
<div
class=
"mask"
v-show=
"startEditImage"
></div>
-->
<div
class=
"mask"
v-show=
"isHideImageExport"
></div>
<!--
<div
class=
"mask"
v-show=
"false"
></div>
-->
</div>
<div
class=
"options-bottom"
>
...
...
@@ -583,8 +584,6 @@
<div
class=
"brightness"
>
<div
class=
"title"
>
亮度
</div>
<div
class=
"content"
>
<!--
<input
class=
"range-narrow"
id=
"input-range-brightness-value"
type=
"range"
min=
"-255"
:value=
"inputBrightnessRange"
max=
"255"
/>
-->
<el-slider
v-model
.
number=
"inputBrightnessRange"
id=
"input-range-brightness-value"
:min=
"-255"
:max=
"255"
></el-slider>
<input
class=
"qb_v"
type=
"text"
v-model
.
number=
"inputBrightnessRange"
/>
</div>
...
...
@@ -593,14 +592,12 @@
<div
class=
"contrast-ratio"
>
<div
class=
"title"
>
对比度
</div>
<div
class=
"content"
>
<!--
<input
class=
"range-narrow"
id=
"input-range-contrast-value"
type=
"range"
min=
"0"
:value=
"inputContrastRange"
max=
"255"
/>
-->
<el-slider
v-model
.
number=
"inputContrastRange"
id=
"input-range-contrast-value"
:min=
"-255"
:max=
"255"
></el-slider>
<input
class=
"qb_v"
type=
"text"
v-model
.
number=
"inputContrastRange"
/>
</div>
</div>
<
div
class=
"mask"
v-show=
"startEditImage"
></div
>
<
!--
<div
class=
"mask"
v-show=
"false"
></div>
--
>
<
!--
<div
class=
"mask"
v-show=
"startEditImage"
></div>
--
>
<
div
class=
"mask"
v-show=
"isHideImageExport"
></div
>
</div>
</div>
</div>
...
...
@@ -685,8 +682,8 @@ export default {
isTpdr_flag
:
false
,
// 小操作区的图片路径
smallSrc
:
null
,
canvasWidth
:
6
4
0
,
canvasHeight
:
6
4
0
,
canvasWidth
:
6
7
0
,
canvasHeight
:
6
7
0
,
// 宽/高取最长边
maxCanvasHeightOrWidth
:
0
,
ylbw_flag
:
true
,
...
...
@@ -936,8 +933,8 @@ export default {
autoTzdArr
:
[],
// 是否显示旋转绿线
isdirection
:
false
,
newHeight
:
6
4
0
,
newWidth
:
6
4
0
,
newHeight
:
6
7
0
,
newWidth
:
6
7
0
,
// tzdDrawing 的移动距离
tzdDrawingLeft
:
0
,
tzdDrawingTop
:
0
,
...
...
@@ -1794,7 +1791,7 @@ export default {
})
console
.
log
(
fingerPosition
);
console
.
log
(
sessionStorage
.
getItem
(
'fingerPosition_'
+
self
.
seq
));
if
(
sessionStorage
.
getItem
(
'fingerPosition_'
+
self
.
seq
)
!=
null
&&
sessionStorage
.
getItem
(
'fingerPosition_'
+
self
.
seq
)
!=
''
)
{
if
(
sessionStorage
.
getItem
(
'fingerPosition_'
+
self
.
seq
)
!=
null
&&
sessionStorage
.
getItem
(
'fingerPosition_'
+
self
.
seq
)
!=
''
&&
sessionStorage
.
getItem
(
'fingerPosition_'
+
self
.
seq
)
!=
'""'
)
{
if
(
JSON
.
parse
(
sessionStorage
.
getItem
(
'fingerPosition_'
+
self
.
seq
))
!=
''
)
{
let
fingerPostions
=
JSON
.
parse
(
sessionStorage
.
getItem
(
'fingerPosition_'
+
self
.
seq
)).
split
(
','
)
fingerPostions
.
forEach
(
item
=>
{
...
...
@@ -2101,7 +2098,7 @@ export default {
console
.
log
(
result
);
self
.
newHeight
=
result
.
newHeight
;
self
.
newWidth
=
result
.
newWidth
;
console
.
log
((
512
*
6
4
0
)
/
self
.
newHeight
);
console
.
log
((
512
*
6
7
0
)
/
self
.
newHeight
);
if
(
self
.
newHeight
>=
self
.
newWidth
)
{
console
.
log
(
$
(
".upper-canvas"
)[
0
]);
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--canvasHeight'
,
'100%'
);
...
...
@@ -2138,11 +2135,11 @@ export default {
$
(
".blc_small"
).
css
(
"width"
,
(((
512
*
self
.
canvasHeight
)
/
self
.
newHeight
)
*
180
)
/
6
4
0
+
"px"
(((
512
*
self
.
canvasHeight
)
/
self
.
newHeight
)
*
180
)
/
6
7
0
+
"px"
);
$
(
".blc_small"
).
css
(
"height"
,
(((
512
*
self
.
canvasHeight
)
/
self
.
newHeight
)
*
180
)
/
6
4
0
+
"px"
(((
512
*
self
.
canvasHeight
)
/
self
.
newHeight
)
*
180
)
/
6
7
0
+
"px"
);
self
.
isTpdr_flag
=
true
imageEditor
.
clearUndoStack
();
...
...
@@ -2163,17 +2160,17 @@ export default {
},
true
)
self
.
changeTzdDrawing
()
Fcanvas
.
absolutePan
({
x
:
0
,
y
:
0
});
//
Fcanvas.absolutePan({
//
x: 0,
//
y: 0
//
});
//计算缩放中心
let
zoomPoint
=
new
fabric_irregular
.
Point
(
Fcanvas
.
width
/
2
,
Fcanvas
.
height
/
2
);
//开始缩放
Fcanvas
.
zoomToPoint
(
zoomPoint
,
1
);
//
Fcanvas.zoomToPoint(zoomPoint, 1);
$
(
".small-drawing-img"
).
css
(
"transform"
,
"rotate(0deg)"
)
}).
catch
(
err
=>
{
...
...
@@ -2597,16 +2594,16 @@ export default {
((
y2
-
y1
)
*
self
.
newHeight
)
/
self
.
canvasHeight
/
self
.
zoomLevel
;
// 平移
Fcanvas
.
absolutePan
({
x
:
-
(
originleft
+
((
x2
-
x1
)
*
self
.
newWidth
)
/
self
.
canvasWidth
/
self
.
zoomLevel
),
y
:
-
(
origintop
+
((
y2
-
y1
)
*
self
.
newHeight
)
/
self
.
canvasHeight
/
self
.
zoomLevel
)
});
//
Fcanvas.absolutePan({
//
x: -(
//
originleft +
//
((x2 - x1) * self.newWidth) / self.canvasWidth / self.zoomLevel
//
),
//
y: -(
//
origintop +
//
((y2 - y1) * self.newHeight) / self.canvasHeight / self.zoomLevel
//
)
//
});
// console.log(imageEditor._graphics.getImageProperties());
// console.log(imageEditor._graphics.getCanvasImage());
...
...
@@ -2648,7 +2645,7 @@ export default {
Fcanvas
.
height
/
2
);
//开始缩放
Fcanvas
.
zoomToPoint
(
zoomPoint
,
self
.
zoomLevel
);
//
Fcanvas.zoomToPoint(zoomPoint, self.zoomLevel);
console
.
log
(
Fcanvas
);
// $(".canvas-container").css('transform', `scale(${self.zoomLevel})`)
// Fcanvas.setZoom(self.zoomLevel);
...
...
@@ -2698,7 +2695,7 @@ export default {
Fcanvas
.
height
/
2
);
//开始缩放
Fcanvas
.
zoomToPoint
(
zoomPoint
,
self
.
zoomLevel
);
//
Fcanvas.zoomToPoint(zoomPoint, self.zoomLevel);
// $(".canvas-container").css('transform', `scale(${self.zoomLevel})`)
// Fcanvas.setZoom(self.zoomLevel);
...
...
@@ -3899,11 +3896,11 @@ export default {
// 修改小框的尺寸
$
(
".blc_small"
).
css
(
"width"
,
((
3
/
5
)
*
this
.
canvasHeight
*
180
)
/
6
4
0
+
"px"
((
3
/
5
)
*
this
.
canvasHeight
*
180
)
/
6
7
0
+
"px"
);
$
(
".blc_small"
).
css
(
"height"
,
((
3
/
5
)
*
this
.
canvasHeight
*
180
)
/
6
4
0
+
"px"
((
3
/
5
)
*
this
.
canvasHeight
*
180
)
/
6
7
0
+
"px"
);
self
.
imageEditor
.
_graphics
.
setImageProperties
(
{
...
...
@@ -4087,11 +4084,11 @@ export default {
// 修改小框的尺寸
$
(
".blc_small"
).
css
(
"width"
,
((
3
/
5
)
*
this
.
canvasHeight
*
180
)
/
6
4
0
+
"px"
((
3
/
5
)
*
this
.
canvasHeight
*
180
)
/
6
7
0
+
"px"
);
$
(
".blc_small"
).
css
(
"height"
,
((
3
/
5
)
*
this
.
canvasHeight
*
180
)
/
6
4
0
+
"px"
((
3
/
5
)
*
this
.
canvasHeight
*
180
)
/
6
7
0
+
"px"
);
self
.
imageEditor
.
_graphics
.
setImageProperties
(
{
...
...
@@ -4181,11 +4178,11 @@ export default {
$
(
".blc_small"
).
css
(
"width"
,
((
3
/
5
)
*
this
.
canvasHeight
*
180
)
/
6
4
0
/
this
.
bb
+
"px"
((
3
/
5
)
*
this
.
canvasHeight
*
180
)
/
6
7
0
/
this
.
bb
+
"px"
);
$
(
".blc_small"
).
css
(
"height"
,
((
3
/
5
)
*
this
.
canvasHeight
*
180
)
/
6
4
0
/
this
.
bb
+
"px"
((
3
/
5
)
*
this
.
canvasHeight
*
180
)
/
6
7
0
/
this
.
bb
+
"px"
);
}
else
{
// 掌纹
...
...
@@ -4218,11 +4215,11 @@ export default {
$
(
".blc_small"
).
css
(
"width"
,
(
this
.
canvasHeight
*
180
)
/
6
4
0
/
this
.
frame_max_bb
+
"px"
(
this
.
canvasHeight
*
180
)
/
6
7
0
/
this
.
frame_max_bb
+
"px"
);
$
(
".blc_small"
).
css
(
"height"
,
(
this
.
canvasHeight
*
180
)
/
6
4
0
/
this
.
frame_max_bb
+
"px"
(
this
.
canvasHeight
*
180
)
/
6
7
0
/
this
.
frame_max_bb
+
"px"
);
}
...
...
@@ -4508,8 +4505,8 @@ export default {
}
// 同步改变小指纹框的大小
let
originalWidth
=
(
self
.
canvasHeight
*
180
)
/
6
4
0
/
self
.
frame_max_bb
let
originalHeight
=
(
self
.
canvasHeight
*
180
)
/
6
4
0
/
self
.
frame_max_bb
let
originalWidth
=
(
self
.
canvasHeight
*
180
)
/
6
7
0
/
self
.
frame_max_bb
let
originalHeight
=
(
self
.
canvasHeight
*
180
)
/
6
7
0
/
self
.
frame_max_bb
let
changeWidth
=
Number
(
$
(
"#blc"
).
css
(
"width"
).
substring
(
0
,
$
(
"#blc"
).
css
(
"width"
).
length
-
2
))
let
changeHeight
=
Number
(
$
(
"#blc"
).
css
(
"height"
).
substring
(
0
,
$
(
"#blc"
).
css
(
"height"
).
length
-
2
))
// console.log(originalWidth*changeWidth / this.canvasWidth);
...
...
src/views/bzxxgl/bzxxfh.vue
View file @
4a7e195e
<!--
* @Author: your name
* @Date: 2021-12-01 15:25:22
* @LastEditTime: 2021-12-1
1 10:28:19
* @LastEditTime: 2021-12-1
3 14:35:24
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \指纹系统\founder_vue\src\views\AllPersonnelBase\bzxxfh.vue
...
...
@@ -411,6 +411,9 @@ export default {
// 正查
let
routeUrl
=
this
.
$router
.
resolve
({
path
:
"fhxxLT/"
+
rowData
.
id
,
query
:
{
rowData
:
JSON
.
stringify
(
rowData
)
}
});
window
.
open
(
routeUrl
.
href
,
"_blank"
);
}
else
if
(
rowData
.
querytype
==
'3'
)
{
...
...
src/views/bzxxgl/fhxxLT.vue
View file @
4a7e195e
This diff is collapsed.
Click to expand it.
src/views/bzxxgl/fhxxTL.vue
View file @
4a7e195e
<!--
* @Author: your name
* @Date: 2021-12-03 15:35:26
* @LastEditTime: 2021-12-
08 11:31:16
* @LastEditTime: 2021-12-
13 12:02:39
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \指纹系统\founder_vue\src\views\bzxxgl\fhxxLT.vue
...
...
@@ -204,6 +204,28 @@ export default {
components
:
{
ImageEd
,
},
methods
:
{
getData
()
{
let
self
=
this
this
.
$axios
({
method
:
'post'
,
url
:
'/api/hit/lthit/info'
,
data
:
{
id
:
self
.
id
,
queryType
:
1
},
loading
:
true
}).
then
(
res
=>
{
console
.
log
(
res
);
if
(
res
.
data
.
code
===
0
)
{
this
.
allData
=
res
.
data
.
ret
console
.
log
(
this
.
allData
);
}
}).
catch
(
err
=>
{
console
.
log
(
err
);
})
}
},
}
</
script
>
...
...
vue.config.js
View file @
4a7e195e
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-12-13 1
1:03:46
* @LastEditTime: 2021-12-13 1
4:51:11
* @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://192.168.128.166:8099/", // 张 认定
// target: "http://192.168.128.124:8099/", // 湖南-张
target
:
"http://192.168.128.114:8099"
,
// 湖南-马
//
target: "http://192.168.128.114:8099", // 湖南-马
// target: "http://192.168.128.116:8099", // 湖南-王
// target: "http://192.168.128.118:8764", // 湖南-张呈光
// target: "http://172.18.116.73:8099/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/ ma
...
...
@@ -100,7 +100,7 @@ module.exports = {
// target: "http://47.92.225.109:5602",
// target: "http://www.meetfood.cn:2390", // 湖南-线上
// target:"http://zwpt.xzclub.top:9333/",
//
target: "http://192.168.128.115:8099", // 江
target
:
"http://192.168.128.115:8099"
,
// 江
ws
:
true
,
changeOrigin
:
true
,
...
...
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