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
92a525c3
Commit
92a525c3
authored
Dec 28, 2021
by
liyuhang19990520
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
1bd31098
a016edd4
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
71 additions
and
17 deletions
+71
-17
src/components/ImageEd.scss
+38
-3
src/components/ImageEd.vue
+21
-4
src/views/bzxxgl/fhxxTT.vue
+1
-1
src/views/bzxxgl/scss/fhxxLT.scss
+3
-3
src/views/cxyrd/modules/LTSrc.vue
+1
-0
src/views/zzwcj/fingerprint.scss
+1
-0
src/views/zzwcj/fingerprint.vue
+2
-2
vue.config.js
+4
-4
No files found.
src/components/ImageEd.scss
View file @
92a525c3
...
...
@@ -21,6 +21,9 @@ $previewHeight_source: var(--previewHeight_source, 100%);
$previewWidth_target
:
var
(
--
previewWidth_target
,
100%
);
$previewHeight_target
:
var
(
--
previewHeight_target
,
100%
);
// 颜色选择器 -- 标记点
$tuiBrushColorPickerRight
:
var
(
--
tuiBrushColorPickerRight
,
472px
);
*
{
box-sizing
:
border-box
;
}
...
...
@@ -674,7 +677,7 @@ div {
box-shadow
:
0px
6px
10px
2px
rgba
(
0
,
21
,
51
,
0
.06
);
border
:
1px
solid
#e6e6e8
;
position
:
absolute
;
right
:
472px
;
right
:
$tuiBrushColorPickerRight
;
//472px
top
:
173px
;
/
deep
/
.tui-colorpicker-container
{
width
:
137px
;
...
...
@@ -1185,7 +1188,8 @@ div {
height
:
40px
;
background
:
#ffffff
;
box-shadow
:
0px
2px
4px
0px
rgba
(
5
,
95
,
231
,
0
.3
)
,
0px
0px
4px
0px
rgba
(
5
,
95
,
231
,
0
.15
);
0px
0px
4px
0px
rgba
(
5
,
95
,
231
,
0
.15
)
,
inset
0px
0px
4px
0px
rgba
(
5
,
95
,
231
,
0
.15
);
border-radius
:
4px
;
display
:
flex
;
align-items
:
center
;
...
...
@@ -1194,6 +1198,37 @@ div {
cursor
:
pointer
;
}
}
.features1
{
img
{
width
:
23px
;
height
:
23px
;
}
}
.features2
{
img
{
width
:
26
.86px
;
height
:
27
.26px
;
}
}
.features3
,
.features4
{
img
{
width
:
24px
;
height
:
23px
;
}
}
.features5
{
img
{
width
:
32px
;
height
:
30px
;
}
}
.features6
{
img
{
width
:
28
.45px
;
height
:
20
.09px
;
}
}
.featuresActive
{
width
:
40px
;
height
:
40px
;
...
...
@@ -1271,6 +1306,7 @@ div {
.multiply
,
.blend
,
.brightness
{
border-radius
:
8px
;
z-index
:
9
;
box-sizing
:
border-box
;
position
:
absolute
;
...
...
@@ -1320,7 +1356,6 @@ div {
text-align
:
center
;
}
}
}
.blend
{
width
:
137px
!
important
;
...
...
src/components/ImageEd.vue
View file @
92a525c3
<!--
* @Author: your name
* @Date: 2021-09-09 09:28:46
* @LastEditTime: 2021-12-2
7 15:09:58
* @LastEditTime: 2021-12-2
8 14:32:15
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\cxyrd\LTz.vue
-->
...
...
@@ -111,14 +111,20 @@
</div>
</div>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"下载"
:open-delay=
"500"
>
<div
class=
"icon download"
id=
"btn-download"
>
<div
class=
"icon download"
id=
"btn-download"
@
mousedown=
"xzActive = false"
v-if=
"xzActive"
>
<img
src=
"../assets/img/zcedit/download.png"
alt=
""
>
</div>
<div
class=
"icon download"
id=
"btn-download_ys"
@
mouseup=
"xzActive = true"
v-if=
"!xzActive"
>
<img
src=
"../assets/img/zcedit/download_a.png"
alt=
""
>
</div>
</el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"截屏"
:open-delay=
"500"
>
<div
class=
"icon screenshot"
@
click
.
stop=
"screenshot"
>
<div
class=
"icon screenshot"
@
click
.
stop=
"screenshot"
@
mousedown=
"jpActive = false"
v-if=
"jpActive"
>
<img
src=
"../assets/img/zcedit/screenshot.png"
alt=
""
>
</div>
<div
class=
"icon screenshot"
@
click
.
stop=
"screenshot"
@
mouseup=
"jpActive = true"
v-if=
"!jpActive"
>
<img
src=
"../assets/img/zcedit/screenshot_a.png"
alt=
""
>
</div>
</el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"缩略图"
:open-delay=
"500"
>
<div
class=
"icon bzd"
@
click
.
stop=
"onchangePreview"
v-if=
"showType == '掌纹'"
>
...
...
@@ -268,9 +274,12 @@
</div>
</div>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"橡皮擦"
:open-delay=
"500"
>
<div
class=
"icon rubber"
@
click
.
stop=
"xpcChange"
>
<div
class=
"icon rubber"
@
click
.
stop=
"xpcChange"
@
mousedown=
"xpcActive = false"
v-if=
"xpcActive"
>
<img
src=
"../assets/img/zcedit/rubber.png"
alt=
""
>
</div>
<div
class=
"icon rubber"
v-if=
"!xpcActive"
@
mouseup=
"xpcActive = true"
>
<img
src=
"../assets/img/zcedit/rubber_a.png"
alt=
""
>
</div>
</el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"清空"
:open-delay=
"500"
>
<div
class=
"icon clear"
@
click
.
stop=
"clearChange"
>
...
...
@@ -475,6 +484,12 @@ export default {
name
:
"ImageEd"
,
data
()
{
return
{
// 截屏
jpActive
:
true
,
// 下载
xzActive
:
true
,
// 橡皮擦
xpcActive
:
true
,
// 掌纹缩略图蓝色框,鼠标抬起时设Null,停止平移
dragableDiv
:
null
,
// 判断是否是复核页面
...
...
@@ -2261,8 +2276,10 @@ export default {
if
(
this
.
routeName
==
'fhxxTL'
||
this
.
routeName
==
'fhxxLT'
||
this
.
routeName
==
'fhxxLL'
)
{
this
.
isFHxx
=
true
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--tuiBrushColorPickerRight'
,
'100px'
);
}
else
{
this
.
isFHxx
=
false
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--tuiBrushColorPickerRight'
,
'472px'
);
}
// 更换指掌纹
...
...
src/views/bzxxgl/fhxxTT.vue
View file @
92a525c3
<!--
* @Author: your name
* @Date: 2021-12-03 15:35:26
* @LastEditTime: 2021-12-28 1
0:22:46
* @LastEditTime: 2021-12-28 1
4:55:57
* @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
...
...
src/views/bzxxgl/scss/fhxxLT.scss
View file @
92a525c3
...
...
@@ -134,13 +134,14 @@
width
:
736px
;
height
:
730px
;
background
:
#f6f8fa
;
box-shadow
:
0px
1px
2px
0px
rgba
(
5
,
95
,
231
,
0
.4
)
,
0px
-1px
2px
0px
rgba
(
5
,
95
,
231
,
0
.19
);
box-shadow
:
inset
0px
1px
2px
0px
rgba
(
5
,
95
,
231
,
0
.4
)
,
0px
-1px
2px
0px
rgba
(
5
,
95
,
231
,
0
.19
);
border-radius
:
8px
;
.fhxx-title
{
font-size
:
16px
;
font-family
:
MicrosoftYaHei
;
font-weight
:
bold
;
color
:
#00b48f
;
margin-bottom
:
15px
;
}
.el-textarea
/
deep
/
{
background
:
#ffffff
;
...
...
@@ -154,11 +155,10 @@
}
.scroll-content
{
overflow-y
:
scroll
;
height
:
6
75
px
;
height
:
6
60
px
;
}
.fhxx-top-top
{
display
:
flex
;
margin-top
:
15px
;
.fhxx-top-top-left
{
.fhxx-top-top-left-title
{
display
:
flex
;
...
...
src/views/cxyrd/modules/LTSrc.vue
View file @
92a525c3
...
...
@@ -386,6 +386,7 @@ export default {
self
.
changeStyle
(
0
,
self
.
enumerate
[
0
]);
}
else
{
self
.
$bus
.
emit
(
'changImageEdit'
,
'xxx'
)
self
.
$bus
.
emit
(
'changImageEditTarget'
,
'xxx'
)
}
})
self
.
isActive
=
""
;
...
...
src/views/zzwcj/fingerprint.scss
View file @
92a525c3
...
...
@@ -2603,6 +2603,7 @@ $versionColor: var(--versionColor, #fff); // #000
margin
:
0
;
box-sizing
:
border-box
;
.el-dialog__title
{
padding-left
:
20px
;
font-size
:
16px
;
font-family
:
Microsoft
YaHei
;
font-weight
:
400
;
...
...
src/views/zzwcj/fingerprint.vue
View file @
92a525c3
...
...
@@ -571,7 +571,7 @@
</div>
<!-- 重复采集弹窗 -->
<div
class=
"repeatDialog"
>
<el-dialog
title=
"提示"
:visible
.
sync=
"repeatVisible"
width=
"
480px
"
:modal-append-to-body=
'false'
>
<el-dialog
title=
"提示"
:visible
.
sync=
"repeatVisible"
width=
"
30rem
"
:modal-append-to-body=
'false'
>
<span>
是否重新采集,点击“是”继续采集,点击“否”重采当前指位
</span>
<span
slot=
"footer"
class=
"dialog-footer"
>
<el-button
type=
"primary"
@
click=
"setRepeat"
>
是
</el-button>
...
...
@@ -8315,7 +8315,7 @@ export default {
username
:
self
.
username
}
}).
then
(
res
=>
{
//console.log(res);
//
console.log(res);
// 上传完成
// self.percentage = 100
// self.isUploadingFinish = true
...
...
vue.config.js
View file @
92a525c3
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-12-28
09:25:48
* @LastEditTime: 2021-12-28
14:48:42
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js
...
...
@@ -110,15 +110,15 @@ module.exports = {
"/api"
:
{
// 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.1
1
4:8099", // 湖南-马
// target: "http://192.168.128.1
0
4:8099", // 湖南-马
// target: "http://192.168.128.116:8099", // 湖南-王
target
:
"http://192.168.128.119: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://zwpt.xzclub.top:9333/",
// target: "http://192.168.128.103
:8099", // 江
// target:
"http://zwpt.xzclub.top:9333/",
target
:
"http://192.168.128.100
:8099"
,
// 江
ws
:
true
,
changeOrigin
:
true
,
pathRewrite
:
{
...
...
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