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 ec62dd40
authored
Jan 19, 2024
by
李乾广
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
修改bug
1 parent
3ca4c554
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
50 additions
and
33 deletions
src/views/SnapshotCluster/batchesResult/batchesResult.vue
src/views/TestDriveHospitality/ClusterResult/ClusterResult.vue
src/views/TestDriveHospitality/SnapshotRecord/SnapshotRecord.vue
src/views/SnapshotCluster/batchesResult/batchesResult.vue
View file @
ec62dd4
...
...
@@ -36,8 +36,8 @@
<span
class=
"iconExpand"
v-show=
"person.expand"
>
▼
</span>
<span
class=
"expandWord"
@
click=
'expandChange(person)'
>
{{
person
.
expand
?
'收起'
:
'展开'
}}
</span>
<el-checkbox
class=
"checkBox"
v-model=
"person.checked"
@
change=
'checkChange(person)'
></el-checkbox>
批次id
:
{{
' '
+
person
.
groupUnid
}}
<span
style=
"margin-left: 20px;"
>
图片数量
:
{{
person
.
personRecordList
.
length
}}
</span>
批次id
:
{{
' '
+
person
.
groupUnid
}}
<span
style=
"margin-left: 20px;"
>
图片数量
:
{{
person
.
personRecordList
.
length
}}
</span>
</div>
<el-row
v-for=
"row in getPagedList(person.personRecordList, 8)"
>
<el-col
:span=
"3"
v-for=
"item in row"
>
...
...
@@ -45,12 +45,12 @@
<el-image
:src=
"item.faceRecognitionVo.picture_url"
:fit=
"'fill'"
class=
"single-image"
>
</el-image>
<div
style=
"padding-left: 5px;padding-right: 5px;"
>
<div
style=
"width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;"
>
unid
:
{{
item
.
faceRecognitionVo
.
unid
||
'--'
}}
</div>
<div
style=
"width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;"
>
personid
:
{{
item
.
faceRecognitionVo
.
person_unid
||
'--'
}}
</div>
<div>
时间
:
{{
item
.
faceRecognitionVo
.
counttime
}}
</div>
<div>
类型
:
{{
item
.
faceRecognitionVo
.
person_type
==
1
?
'店员'
:(
item
.
faceRecognitionVo
.
person_type
==
0
?
'顾客'
:
'未知'
)
}}
(
{{
item
.
faceRecognitionVo
.
childAdult
==
1
?
'成人'
:(
item
.
faceRecognitionVo
.
childAdult
==
0
?
'儿童'
:
'未知'
)
}}
)
</div>
<div>
性别
:
{{
formatGender
(
item
.
faceRecognitionVo
.
gender
)
}}
(
{{
item
.
age
}}
)
</div>
<div>
地点
:
{{
item
.
faceRecognitionVo
.
gate_name
}}
</div>
<div
style=
"width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;"
>
unid
:
{{
item
.
faceRecognitionVo
.
unid
||
'--'
}}
</div>
<div
style=
"width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;"
>
personid
:
{{
item
.
faceRecognitionVo
.
person_unid
||
'--'
}}
</div>
<div>
时间
:
{{
item
.
faceRecognitionVo
.
counttime
}}
</div>
<div>
类型
:
{{
item
.
faceRecognitionVo
.
person_type
==
1
?
'店员'
:(
item
.
faceRecognitionVo
.
person_type
==
0
?
'顾客'
:
'未知'
)
}}
(
{{
item
.
faceRecognitionVo
.
childAdult
==
1
?
'成人'
:(
item
.
faceRecognitionVo
.
childAdult
==
0
?
'儿童'
:
'未知'
)
}}
)
</div>
<div>
性别
:
{{
formatGender
(
item
.
faceRecognitionVo
.
gender
)
}}
(
{{
item
.
age
}}
)
</div>
<div>
地点
:
{{
item
.
faceRecognitionVo
.
gate_name
}}
</div>
</div>
</div>
</el-col>
...
...
@@ -109,10 +109,11 @@
const
searchCondition
=
ref
({})
if
(
window
.
localStorage
.
getItem
(
'searchCondition'
))
{
searchCondition
.
value
=
JSON
.
parse
(
window
.
localStorage
.
getItem
(
'searchCondition'
));
//
queryForm.startTime = searchCondition.value.startTime;
//
queryForm.endTime = searchCondition.value.endTime;
queryForm
.
startTime
=
searchCondition
.
value
.
startTime
;
queryForm
.
endTime
=
searchCondition
.
value
.
endTime
;
queryForm
.
minNum
=
searchCondition
.
value
.
minNum
||
0
;
queryForm
.
maxNum
=
searchCondition
.
value
.
maxNum
||
100000
;
queryForm
.
date
=
searchCondition
.
value
.
date
;
}
const
onPageNumChange
=
function
(
num
)
{
pageNum
.
value
=
num
...
...
src/views/TestDriveHospitality/ClusterResult/ClusterResult.vue
View file @
ec62dd4
...
...
@@ -50,19 +50,19 @@
<div
class=
"classBox"
>
<div>
<div
class=
"boxInfo"
>
<span>
记录id
:
{{
person
.
personUnid
}}
</span>
<span
style=
"margin-left: 20px;"
>
开始接待时间
:
{{
person
.
startTime
}}
</span>
<span
style=
"margin-left: 20px;"
>
结束接待时间
:
{{
person
.
endTime
}}
</span>
<span
style=
"margin-left: 20px;"
>
接待时长
:
{{
person
.
duration
}}
</span>
<span>
记录id
:
{{
person
.
personUnid
}}
</span>
<span
style=
"margin-left: 20px;"
>
开始接待时间
:
{{
person
.
startTime
}}
</span>
<span
style=
"margin-left: 20px;"
>
结束接待时间
:
{{
person
.
endTime
}}
</span>
<span
style=
"margin-left: 20px;"
>
接待时长
:
{{
person
.
durationStr
}}
</span>
</div>
<el-row
v-for=
"row in getPagedList(person.customerList, 8)"
>
<el-col
:span=
"3"
v-for=
"item in row"
>
<div
style=
"margin: 0 5px"
@
click=
"handleClick(item)"
:class=
"currentItemId==item.id?'actived':''"
>
<el-image
:src=
"item.picture_url"
:fit=
"'fill'"
class=
"single-image"
></el-image>
<div
>
unid:
{{
item
.
unid
}}
</div>
<div>
时间
:
{{
item
.
counttime
}}
</div>
<div>
性别
:
{{
formatGender
(
item
.
gender
)
}}
(
{{
item
.
age
}}
)
</div>
<div>
地点
:
{{
item
.
gate_name
}}
</div>
<div
style=
"width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;"
>
unid:
{{
item
.
unid
}}
</div>
<div>
时间
:
{{
item
.
counttime
}}
</div>
<div>
性别
:
{{
formatGender
(
item
.
gender
)
}}
(
{{
item
.
age
}}
)
</div>
<div>
地点
:
{{
item
.
gate_name
}}
</div>
</div>
</el-col>
</el-row>
...
...
@@ -125,9 +125,13 @@
const
searchCondition
=
ref
({})
if
(
window
.
localStorage
.
getItem
(
'searchCondition'
))
{
searchCondition
.
value
=
JSON
.
parse
(
window
.
localStorage
.
getItem
(
'searchCondition'
));
queryForm
.
account_id
=
searchCondition
.
value
.
account_id
;
queryForm
.
plaza_id
=
searchCondition
.
value
.
plaza_id
;
queryForm
.
zone_id
=
searchCondition
.
value
.
zone_id
;
queryForm
.
gate_id
=
searchCondition
.
value
.
gate_id
;
queryForm
.
date
=
searchCondition
.
value
.
date
;
//
queryForm.startTime = searchCondition.value.startTime;
//
queryForm.endTime = searchCondition.value.endTime;
queryForm
.
startTime
=
searchCondition
.
value
.
startTime
;
queryForm
.
endTime
=
searchCondition
.
value
.
endTime
;
}
const
onPageNumChange
=
function
(
num
)
{
pageNum
.
value
=
num
...
...
@@ -280,8 +284,8 @@
zone_id
:
rawData
.
zone_id
,
gate_id
:
rawData
.
gate_id
,
date
:
rawData
.
date
,
startTime
:
formatDate
(
rawData
.
date
)
+
' '
+
formatTime
(
rawData
.
startTime
)
,
endTime
:
formatDate
(
rawData
.
date
)
+
' '
+
formatTime
(
rawData
.
endTime
)
,
startTime
:
rawData
.
startTime
,
endTime
:
rawData
.
endTime
,
})
window
.
localStorage
.
setItem
(
'searchCondition'
,
JSON
.
stringify
(
storageData
))
clusterResultApi
.
getClusterResultList
(
data
).
then
(
...
...
@@ -289,6 +293,14 @@
isLoading
.
value
=
false
sortDataList
(
r
.
data
.
pageData
)
r
.
data
.
pageData
.
forEach
((
itemPerson
)
=>
{
let
durationH
=
(
itemPerson
.
duration
/
1000
/
3600
)
<
1
?
0
:
parseInt
(
itemPerson
.
duration
/
1000
/
3600
);
let
durationM
=
((
itemPerson
.
duration
-
(
durationH
*
3600000
))
/
1000
/
60
)
<
1
?
0
:
parseInt
((
itemPerson
.
duration
-
(
durationH
*
3600000
))
/
1000
/
60
);
let
durationS
=
(
itemPerson
.
duration
-
(
durationH
*
3600000
)
-
(
durationM
*
60000
))
/
1000
durationH
=
durationH
>=
10
?
durationH
:
'0'
+
durationH
durationM
=
durationM
>=
10
?
durationM
:
'0'
+
durationM
durationS
=
durationS
>=
10
?
durationS
:
'0'
+
durationS
console
.
log
(
durationH
+
':'
+
durationM
+
':'
+
durationS
)
itemPerson
.
durationStr
=
durationH
+
':'
+
durationM
+
':'
+
durationS
itemPerson
.
customerList
.
forEach
((
item
)
=>
{
if
(
item
.
features_url
)
{
item
.
features_url
=
window
.
_baseImgUrl
+
item
.
features_url
...
...
@@ -463,12 +475,13 @@
.boxInfo
{
line-height
:
28px
;
margin-bottom
:
10px
;
padding-left
:
4px
;
}
.classBox
{
margin
:
10px
0
;
border
:
solid
1px
black
;
height
:
4
85
px
;
height
:
4
40
px
;
overflow-y
:
hidden
;
}
...
...
src/views/TestDriveHospitality/SnapshotRecord/SnapshotRecord.vue
View file @
ec62dd4
...
...
@@ -48,14 +48,13 @@
<div
class=
"resultContent"
:style=
"
{'height':contentHeight+'px'}">
<el-row
v-for=
"row in pagedTableDataList"
>
<el-col
:span=
"3"
v-for=
"item in row"
>
<div
style=
"margin: 0 5px;cursor: pointer;"
@
click=
"handleClick(item)"
:class=
"currentItemId==item.id?'actived':''"
>
<div
style=
"margin: 0 5px;cursor: pointer;"
@
click=
"handleClick(item)"
:class=
"currentItemId==item.id?'actived':''"
>
<el-image
:src=
"item.picture_url"
:fit=
"'fill'"
class=
"single-image"
>
</el-image>
<div
>
unid:
{{
item
.
unid
}}
</div>
<div>
时间
:
{{
item
.
counttime
}}
</div>
<div>
性别
:
{{
formatGender
(
item
.
gender
)
}}
(
{{
item
.
age
}}
)
</div>
<div>
地点
:
{{
item
.
gate_name
}}
</div>
<div
style=
"width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;"
>
unid:
{{
item
.
unid
}}
</div>
<div>
时间
:
{{
item
.
counttime
}}
</div>
<div>
性别
:
{{
formatGender
(
item
.
gender
)
}}
(
{{
item
.
age
}}
)
</div>
<div>
地点
:
{{
item
.
gate_name
}}
</div>
</div>
</el-col>
</el-row>
...
...
@@ -130,9 +129,13 @@
const
searchCondition
=
ref
({})
if
(
window
.
localStorage
.
getItem
(
'searchCondition'
))
{
searchCondition
.
value
=
JSON
.
parse
(
window
.
localStorage
.
getItem
(
'searchCondition'
));
queryForm
.
account_id
=
searchCondition
.
value
.
account_id
;
queryForm
.
plaza_id
=
searchCondition
.
value
.
plaza_id
;
queryForm
.
zone_id
=
searchCondition
.
value
.
zone_id
;
queryForm
.
gate_id
=
searchCondition
.
value
.
gate_id
;
queryForm
.
date
=
searchCondition
.
value
.
date
;
//
queryForm.startTime = searchCondition.value.startTime;
//
queryForm.endTime = searchCondition.value.endTime;
queryForm
.
startTime
=
searchCondition
.
value
.
startTime
;
queryForm
.
endTime
=
searchCondition
.
value
.
endTime
;
}
const
onPageNumChange
=
function
(
num
)
{
pageNum
.
value
=
num
...
...
@@ -285,8 +288,8 @@
zone_id
:
rawData
.
zone_id
,
gate_id
:
rawData
.
gate_id
,
date
:
rawData
.
date
,
startTime
:
formatDate
(
rawData
.
date
)
+
' '
+
formatTime
(
rawData
.
startTime
)
,
endTime
:
formatDate
(
rawData
.
date
)
+
' '
+
formatTime
(
rawData
.
endTime
)
,
startTime
:
rawData
.
startTime
,
endTime
:
rawData
.
endTime
,
})
window
.
localStorage
.
setItem
(
'searchCondition'
,
JSON
.
stringify
(
storageData
))
snapshotRecordApi
.
getSnapshotRecordList
(
data
).
then
(
...
...
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