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
db0c6997
Commit
db0c6997
authored
Oct 29, 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
232e44f9
6a672dff
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
61 additions
and
29 deletions
+61
-29
public/image-edit/js/tui-image-editor.js
+1
-0
src/views/AllPersonnelBase/qbalk.vue
+1
-1
src/views/Editor/modules/imageEd.scss
+1
-1
src/views/Editor/modules/imageEd.vue
+25
-6
src/views/cxyrd/QueryConfirm.vue
+0
-0
src/views/cxyrd/modules/LTSrc.vue
+13
-7
src/views/drFPTX/Index.vue
+20
-14
No files found.
public/image-edit/js/tui-image-editor.js
View file @
db0c6997
...
...
@@ -19033,6 +19033,7 @@ var ImageEditor = function () {
},
{
key
:
'applyFilter'
,
value
:
function
applyFilter
(
type
,
options
,
isSilent
)
{
// debugger
var
executeMethodName
=
isSilent
?
'executeSilent'
:
'execute'
;
return
this
[
executeMethodName
](
_consts
.
commandNames
.
APPLY_FILTER
,
type
,
options
);
...
...
src/views/AllPersonnelBase/qbalk.vue
View file @
db0c6997
...
...
@@ -838,7 +838,7 @@ const datas1 = [
border
:
none
;
}
width
:
296px
;
height
:
40px
;
//
height
:
40px
;
background
:
#ffffff
;
border-radius
:
4px
;
border
:
1px
solid
#e6e6e8
;
...
...
src/views/Editor/modules/imageEd.scss
View file @
db0c6997
...
...
@@ -1301,7 +1301,7 @@ $transOrigin: var(--transOrigin, 0px, 0px);
box-shadow: 4px 4px 4px 0px rgba(193, 216, 251, 0.8),
-4px -4px 4px 0px #ffffff;
border-radius: 4px;
margin-right: 1
6
px;
margin-right: 1
2
px;
margin-bottom: 16px;
&:active {
background: #055fe7;
...
...
src/views/Editor/modules/imageEd.vue
View file @
db0c6997
<!--
* @Author: your name
* @Date: 2021-10-22 11:36:10
* @LastEditTime: 2021-10-2
8 17:34:54
* @LastEditTime: 2021-10-2
9 15:47:32
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue
...
...
@@ -267,12 +267,12 @@
<input
class=
"qb_v"
type=
"text"
v-model=
"inputBrightnessRange"
>
</div>
</div>
<!--
亮
度 -->
<!--
对比
度 -->
<div
class=
"contrast-ratio"
>
<div
class=
"title"
>
对比度
</div>
<div
class=
"content"
>
<input
class=
"range-narrow"
id=
"input-range-co
lor-filter-value"
type=
"range"
min=
"0"
:value=
"inputColorFilter
Range"
max=
"255"
/>
<input
class=
"qb_v"
type=
"text"
v-model=
"inputCo
lorFilter
Range"
>
<input
class=
"range-narrow"
id=
"input-range-co
ntrast-value"
type=
"range"
min=
"0"
:value=
"inputContrast
Range"
max=
"255"
/>
<input
class=
"qb_v"
type=
"text"
v-model=
"inputCo
ntrast
Range"
>
</div>
</div>
</div>
...
...
@@ -288,6 +288,8 @@ import "@/icons/direction.svg";
export
default
{
data
()
{
return
{
// 对比度
inputContrastRange
:
0
,
// 特征点id
tzdId
:
0
,
// 特征点开启
...
...
@@ -532,6 +534,7 @@ export default {
var
$inputRangeBrightnessValue
=
$
(
'#input-range-brightness-value'
);
var
$inputCheckBlend
=
$
(
'#input-check-blend'
);
var
$inputRangeColorFilterValue
=
$
(
'#input-range-color-filter-value'
);
var
$inputRangeContrastValue
=
$
(
'#input-range-contrast-value'
)
var
$imageFilterSubMenu
=
$
(
'#image-filter-sub-menu'
);
...
...
@@ -551,7 +554,7 @@ export default {
});
this
.
imageEditor
=
imageEditor
imageEditor
.
loadImageFromURL
(
'img/
finger.bmp
'
,
'SampleImage'
).
then
(
function
(
sizeValue
)
{
imageEditor
.
loadImageFromURL
(
'img/
dogsleep.jpg
'
,
'SampleImage'
).
then
(
function
(
sizeValue
)
{
console
.
log
(
sizeValue
);
imageEditor
.
clearUndoStack
();
});
...
...
@@ -1086,7 +1089,15 @@ export default {
brightness
:
parseInt
(
this
.
value
,
10
)
/
255
,
});
});
// 对比度
$inputRangeContrastValue
.
on
(
'change'
,
function
()
{
self
.
inputContrastRange
=
this
.
value
applyOrRemoveFilter
(
true
,
'contrast'
,
{
contrast
:
this
.
value
/
255
,
});
})
this
.
$bus
.
on
(
'ryzwbjImage'
,
(
sourceImage
)
=>
{
self
.
sourceImage
=
sourceImage
imageEditor
.
loadImageFromURL
(
'data:image/jpeg;base64,'
+
sourceImage
,
'SampleImage'
).
then
(
function
(
sizeValue
)
{
...
...
@@ -2873,6 +2884,14 @@ export default {
console
.
log
(
result
);
});
},
// 对比度
inputContrastRange
(
newValue
,
oldValue
)
{
this
.
imageEditor
.
applyFilter
(
'Contrast'
,
{
contrast
:
parseInt
(
newValue
,
10
)
/
255
,
}).
then
(
function
(
result
)
{
console
.
log
(
result
);
});
},
inputColorFilterRange
(
newValue
,
oldValue
)
{
this
.
imageEditor
.
applyFilter
(
'removeColor'
,
{
distance
:
parseInt
(
newValue
,
10
)
/
255
,
...
...
src/views/cxyrd/QueryConfirm.vue
View file @
db0c6997
This diff is collapsed.
Click to expand it.
src/views/cxyrd/modules/LTSrc.vue
View file @
db0c6997
...
...
@@ -8,10 +8,10 @@
<div
class=
"lt_middle"
>
<!-- 源数据区 -->
<div
class=
"lt_middle_src_data"
>
<el-table
ref=
"singleTable"
highlight-current-row
@
current-change=
"handleCurrentChange"
:data=
"dataList"
class=
"lt_candidate_table border_radius
"
:height=
"
tableHeight"
@
row-click=
"getFirgerPrintDetail"
:row-class-name=
"tableRowClassName"
>
<el-table-column
prop=
"qqid"
label=
"查询ID"
width=
"
8
0"
></el-table-column>
<el-table-column
prop=
"barcode"
label=
"源条码号"
width=
"
190
"
></el-table-column>
<el-table-column
prop=
"fingerCount"
label=
"枚数"
width=
"
8
0"
></el-table-column>
<el-table
ref=
"singleTable"
highlight-current-row
@
current-change=
"handleCurrentChange"
:data=
"dataList"
class=
"lt_candidate_table border_radius
tableHeight"
@
row-click=
"getFirgerPrintDetail"
:row-class-name=
"tableRowClassName"
>
<el-table-column
prop=
"qqid"
label=
"查询ID"
width=
"
9
0"
></el-table-column>
<el-table-column
prop=
"barcode"
label=
"源条码号"
width=
"
auto
"
></el-table-column>
<el-table-column
prop=
"fingerCount"
label=
"枚数"
width=
"
7
0"
></el-table-column>
</el-table>
<div
class=
"lt_middle_bottom"
>
<span>
该任务共计
<b>
{{
total
}}
</b>
条查询
</span>
...
...
@@ -27,7 +27,7 @@
{{
Number
(
index
+
1
)
&
lt
;
9
?
(
'0'
+
Number
(
index
+
1
))
:
Number
(
index
+
1
)
}}
</div>
<br
/>
<img
:src=
"'data:image/jpeg;base64,'+item.image"
style=
"width:
106px;height: 106px
;"
/>
<img
:src=
"'data:image/jpeg;base64,'+item.image"
style=
"width:
6.625rem;height: 6.625rem
;"
/>
<div
class=
"finger-tips"
>
<!-- 认定完成 -->
<div
class=
"affirmstatus1"
v-if=
"item.affirmstatus==1"
>
...
...
@@ -243,10 +243,12 @@ export default {
changeTableHeight
()
{
this
.
isShowPrint
=
!
this
.
isShowPrint
if
(
!
this
.
isShowPrint
)
{
this
.
tableHeight
=
810
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--tableHeight'
,
'50.625rem'
);
// this.tableHeight = 810
this
.
options
=
'收缩'
}
else
{
this
.
tableHeight
=
368
document
.
getElementsByTagName
(
'body'
)[
0
].
style
.
setProperty
(
'--tableHeight'
,
'23rem'
);
// this.tableHeight = 368
this
.
options
=
'展开'
}
}
...
...
@@ -580,6 +582,10 @@ const datas = [
}
</
style
>
<
style
lang=
"scss"
scoped
>
$
tableHeight
:
var
(
--tableHeight
,
368px
);
.tableHeight
{
height
:
$
tableHeight
;
}
/* 设置滚动条的样式 */
::-webkit-scrollbar
{
width
:
6px
;
...
...
src/views/drFPTX/Index.vue
View file @
db0c6997
...
...
@@ -321,7 +321,7 @@
<el-dialog
style=
" margin-top:10vh"
:visible
.
sync=
"dialogVisible"
width=
"
480px
"
width=
"
30rem
"
:modal-append-to-body=
"false"
>
<div
v-if=
"showProgress"
>
...
...
@@ -329,20 +329,20 @@
type=
"circle"
:percentage=
"UploadPercent"
></el-progress>
<div
style=
"margin-top:
15px; margin-bottom:15px;font-size: 14px
;font-family: MicrosoftYaHei;color: #909090;"
>
正在解析指纹文件,点击“取消”可终止处理
</div>
<div
style=
"margin-top:
.9375rem; margin-bottom:.9375rem;font-size: .875rem
;font-family: MicrosoftYaHei;color: #909090;"
>
正在解析指纹文件,点击“取消”可终止处理
</div>
<el-button
@
click=
"abort"
>
取 消
</el-button>
</div>
<div
v-else
>
<div>
<img
style=
"width:
134px;height:134px
"
style=
"width:
8.375rem;height:8.375rem
"
src=
"../../assets/img/drFptx/success.svg"
alt=
""
>
</div>
<div
style=
"margin-top:
15px; margin-bottom:15px;font-size: 14px
;font-family: MicrosoftYaHei;color: #909090;"
>
导出成功432条,失败34条
</div>
<div
style=
"margin-top:
.9375rem; margin-bottom:.9375rem;font-size: .875rem
;font-family: MicrosoftYaHei;color: #909090;"
>
导出成功432条,失败34条
</div>
<el-button
style=
"background: #055FE7;border-radius:
4px
; border-color:#055FE7;"
style=
"background: #055FE7;border-radius:
.25rem
; border-color:#055FE7;"
type=
"primary"
@
click=
"goList"
>
查看详情
</el-button>
...
...
@@ -630,6 +630,12 @@ export default {
/
deep
/
.el-checkbox__input.is-checked
+
.el-checkbox__label
{
color
:
#333333
;
}
/
deep
/
.el-table.el-table--fit.el-table--enable-row-hover
{
height
:
501px
!important
;
}
/
deep
/
.el-table__body-wrapper.is-scrolling-none
{
height
:
499px
!important
;
}
.drFPTX
{
padding
:
25px
;
}
...
...
@@ -692,7 +698,7 @@ export default {
display
:
flex
;
align-items
:
center
;
width
:
343px
;
height
:
40px
;
//
height
:
40px
;
background
:
#ffffff
;
border-radius
:
4px
;
border
:
1px
solid
#e6e6e8
;
...
...
@@ -736,7 +742,7 @@ export default {
display
:
flex
;
.left
{
display
:
flex
;
height
:
61
0px
;
height
:
56
0px
;
width
:
1392px
;
.el-col
{
.el-table
{
...
...
@@ -798,16 +804,16 @@ export default {
}
}
.right
{
height
:
61
0px
;
height
:
56
0px
;
width
:
161px
;
.target
{
margin
:
0
auto
;
width
:
137px
;
height
:
61
0px
;
height
:
56
0px
;
border-radius
:
6px
;
border
:
1px
solid
#d1d1d1
;
.targetHead
{
width
:
13
7
px
;
width
:
13
5
px
;
height
:
56px
;
background
:
#f0f3f6
;
border-radius
:
6px
6px
0px
0px
;
...
...
@@ -837,7 +843,7 @@ export default {
display
:
flex
;
.left
{
display
:
flex
;
height
:
61
0px
;
height
:
56
0px
;
width
:
1240px
;
margin-right
:
14px
;
.el-col
{
...
...
@@ -900,7 +906,7 @@ export default {
}
}
.right
{
height
:
61
0px
;
height
:
56
0px
;
width
:
284px
;
.head
{
display
:
flex
;
...
...
@@ -922,7 +928,7 @@ export default {
}
.bottom
{
width
:
284px
;
height
:
5
55
px
;
height
:
5
00
px
;
display
:
flex
;
border-radius
:
0
0
6px
6px
;
border
:
1px
solid
#d1d1d1
;
...
...
@@ -945,7 +951,7 @@ export default {
.line
{
margin-top
:
30px
;
width
:
1px
;
height
:
4
9
0px
;
height
:
4
4
0px
;
border
:
1px
dashed
#eeeeee
;
}
.targetRight
{
...
...
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