Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
Toggle navigation
This project
Loading...
Sign in
罗鑫霖
/
vion-tools
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit e37ff087
authored
Sep 20, 2022
by
李君
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
优化
1 parent
da553829
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
51 additions
and
16 deletions
src/Request/PublicAxiosInstance.js
src/views/ComparisonCapturedPictures/ComparisonCapturedPictures.vue
src/views/FeatureComparisonVerification/FeatureComparisonVerification.vue
src/Request/PublicAxiosInstance.js
View file @
e37ff08
...
...
@@ -14,8 +14,7 @@ const axiosInstance = axios.create(
// 请求拦截器
axiosInstance
.
interceptors
.
request
.
use
(
config
=>
{
// Cookies.set('atoken','718de41a-617b-4cc8-a6ae-ca3acce9b62e')
// Cookies.set('atoken','ff2abb3b-667c-4d0f-b9f9-7121a229a416')
if
(
!
Cookies
.
get
(
'atoken'
)){
ElMessage
({
message
:
`登录过期,请重新登录`
,
...
...
src/views/ComparisonCapturedPictures/ComparisonCapturedPictures.vue
View file @
e37ff08
...
...
@@ -301,7 +301,6 @@
}
const
getGateList
=
function
(
val
)
{
queryForm
.
gate_id
=
[]
gateList
.
value
=
[]
snapshotRecordApi
.
getGateList
({
account_id
:
queryForm
.
account_id
.
toString
(),
...
...
src/views/FeatureComparisonVerification/FeatureComparisonVerification.vue
View file @
e37ff08
...
...
@@ -83,11 +83,14 @@
</div>
</a-col>
<a-col
:span=
"10"
class=
'imgBox1'
>
<p
v-if=
'featureList.length>0'
style=
"margin-left: 15px;"
>
<div
class=
"imgBox1_top1"
>
<p
v-if=
"featureList.length>0"
style=
"margin-left: 15px;"
>
<a-button
type=
"primary"
style=
"float: right;"
@
click=
"fullScreen('imgBox1_top1')"
>
{{
!
isFull
?
'全屏'
:
'退出'
}}
</a-button>
<span>
{{
featureList
[
0
].
person_unid
}}
</span>
<span
style=
"float: right
;"
>
共
{{
featureList
.
length
}}
张
</span>
<span
style=
"float: right;margin-right: 15px
;"
>
共
{{
featureList
.
length
}}
张
</span>
</p>
<el-row
class=
"imgBox1_top"
:gutter=
"10"
v-loading=
"isLoadingFeature"
>
<el-row
class=
"imgBox1_top"
:gutter=
"10"
v-loading=
"isLoadingFeature"
:style=
"
{'max-height':!isFull?'500px':'90%'}">
<el-col
:span=
"6"
class=
"itemBox"
v-for=
"item in featureList"
>
<el-image
:src=
"item.picture_url"
:fit=
"'fill'"
class=
"single-image"
>
</el-image>
...
...
@@ -101,6 +104,7 @@
</el-col>
<a-empty
v-if=
'featureList.length==0'
style=
'margin: 0 auto;'
></a-empty>
</el-row>
</div>
<div
class=
"imgBox2_top"
>
<div
class=
"btns"
>
<p
v-if=
'comparisonList.length>0'
style=
"margin-left: 15px;float: left"
>
...
...
@@ -110,8 +114,9 @@
阈值:
<el-input-number
class=
"thresholdInput"
size=
"small"
:controls=
'false'
:min=
"1"
:max=
"100"
v-model=
"threshold"
></el-input-number>
<a-button
type=
"primary"
@
click=
"reComparison"
>
重新比对
</a-button>
<a-button
type=
"primary"
@
click=
"reComparisonFeature"
>
重提特征比对
</a-button>
<a-button
type=
"primary"
@
click=
"fullScreen('imgBox2_top')"
>
{{
!
isFull
?
'全屏'
:
'退出'
}}
</a-button>
</div>
<el-row
:gutter=
"10"
v-loading=
"isLoadingComparison"
class=
'imgBox2'
>
<el-row
:gutter=
"10"
v-loading=
"isLoadingComparison"
class=
'imgBox2'
:style=
"
{'max-height':!isFull?'500px':'90%'}"
>
<el-col
:span=
"6"
class=
"itemBox"
v-for=
"item in comparisonList"
>
<el-image
:src=
"item.picture_url"
:fit=
"'fill'"
class=
"single-image"
>
</el-image>
...
...
@@ -179,6 +184,7 @@
const
boxObj
=
ref
({})
const
currentItemId
=
ref
()
const
isLoadingFeature
=
ref
(
false
)
const
isFull
=
ref
(
false
)
const
threshold
=
ref
(
75
)
const
pagedTableDataList
=
computed
(
()
=>
{
...
...
@@ -567,7 +573,9 @@
event
.
stopPropagation
()
featureApi
.
updateImage
({
'personUnid'
:
item
.
unid
,
'id'
:
item
.
id
'id'
:
item
.
id
,
'unid'
:
item
.
unid
,
'countdate'
:
item
.
counttime
?
item
.
counttime
:
''
,
}).
then
((
r
)
=>
{
if
(
r
.
msg_code
==
200
){
ElMessage
(
...
...
@@ -584,7 +592,9 @@
event
.
stopPropagation
()
featureApi
.
updateImage
({
'personUnid'
:
boxObj
.
value
.
person_unid
,
'id'
:
item
.
id
'id'
:
item
.
id
,
'unid'
:
item
.
unid
,
'countdate'
:
item
.
counttime
?
item
.
counttime
:
''
,
}).
then
((
r
)
=>
{
if
(
r
.
msg_code
==
200
){
ElMessage
(
...
...
@@ -599,7 +609,28 @@
})
}
__main
()
const
fullScreen
=
function
(
className
){
var
de
=
document
.
getElementsByClassName
(
className
)[
0
];
if
(
isFull
.
value
){
if
(
document
.
exitFullscreen
)
{
document
.
exitFullscreen
();
}
else
if
(
document
.
mozCancelFullScreen
)
{
document
.
mozCancelFullScreen
();
}
else
if
(
document
.
webkitExitFullscreen
)
{
document
.
webkitExitFullscreen
();
}
}
else
{
if
(
de
.
requestFullscreen
)
{
de
.
requestFullscreen
();
}
else
if
(
de
.
mozRequestFullScreen
)
{
de
.
mozRequestFullScreen
();
}
else
if
(
de
.
webkitRequestFullScreen
)
{
de
.
webkitRequestFullScreen
();
}
}
isFull
.
value
=
!
isFull
.
value
}
// const
return
{
// scalar
isLoading
,
...
...
@@ -611,6 +642,7 @@
currentItemId
,
centerDialogVisible
,
otherPictureUrl
,
isFull
,
// sequence
accountList
,
plazaList
,
...
...
@@ -637,7 +669,8 @@
downloadFile
,
openImage
,
deleteImage
,
addImage
addImage
,
fullScreen
}
}
}
...
...
@@ -697,17 +730,17 @@
}
.imgBox2
{
min-height
:
400px
;
max-height
:
500px
;
//
max-height
:
500px
;
overflow-y
:
auto
;
}
.imgBox1_top
{
width
:
100%
;
min-height
:
400px
;
max-height
:
500px
;
//
max-height
:
500px
;
overflow-y
:
auto
;
border-bottom
:
10px
solid
#efefef
;
}
.imgBox2_top
{
border-top
:
10px
solid
#efefef
;
.btns{
text-align
:
right
;
margin-top
:
10px
;
...
...
@@ -715,6 +748,7 @@
}
button
{
margin-right
:
10px
;
padding
:
4px
7px
;
}
}
.colItem
{
...
...
@@ -748,7 +782,10 @@
border
:
1px
solid
#1890ff
;
}
.thresholdInput
{
width
:
100px
;
margin-right
:
15px
;
width
:
60px
;
//
margin-right
:
15px
;
/deep/.el-input__inner{
text-align
:
left
;
}
}
</
style
>
Write
Preview
Markdown
is supported
Attach a file
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 post a comment