Skip to content

罗鑫霖 / vion-tools

Go to a project
Commit 130e58c9 by 李乾广
Options

修改bug，增加收银事件类型

1 parent b08ea82a
Inline Side-by-side
Showing 3 changed files with 50 additions and 13 deletions
src/views/FeatureComparisonVerification/FeatureComparisonVerification.vue
...@@ -536,7 +536,10 @@ ...@@ -536,7 +536,10 @@
pic_type:rawData.picType, pic_type:rawData.picType,
countdate:formatDate(rawData.date), countdate:formatDate(rawData.date),
pic_id:boxObj.value.id, pic_id:boxObj.value.id,
person_unid:boxObj.value.person_unid,
ip:window._baseImgUrl, ip:window._baseImgUrl,
startTime: formatDate(rawData.date) + ' 00:00:00',
endTime: formatDate(rawData.date) + ' 23:59:59',
customScore:threshold.value?threshold.value:75 customScore:threshold.value?threshold.value:75
} }
comparisonList.value = [] comparisonList.value = []
...@@ -544,15 +547,21 @@ ...@@ -544,15 +547,21 @@
isLoadingComparison.value = false isLoadingComparison.value = false
if (isArray(r.data)) { if (isArray(r.data)) {
if(r.data.length>0){ if(r.data.length>0){
let personList = []
r.data.forEach((item) => { r.data.forEach((item) => {
if (item.features_url) { if (item.personList&&isArray(item.personList)) {
item.features_url = window._baseImgUrl + item.features_url item.personList.forEach((one) => {
if (one.features_url) {
one.features_url = window._baseImgUrl + one.features_url
} }
if (item.picture_url) { if (one.picture_url) {
item.picture_url = window._baseImgUrl + item.picture_url one.picture_url = window._baseImgUrl + one.picture_url
} }
}) })
comparisonList.value = r.data personList = personList.concat(item.personList)
}
})
comparisonList.value = personList
} }
} }
} }
...@@ -666,9 +675,11 @@ ...@@ -666,9 +675,11 @@
type: 'success' type: 'success'
} }
) )
comparisonList.value.forEach(item=>{ comparisonList.value.forEach((item,index)=>{
if(item.unid==data.unid){ if(item.unid==data.unid){
item.person_unid = boxObj.value.person_unid featureList.value.push(item)
comparisonList.value.splice(index,1)
// item.person_unid = boxObj.value.person_unid
} }
}) })
} }
......
src/views/SnapshotCluster/ClusterResult/ClusterResult.vue
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
</a-select> </a-select>
</a-form-item> </a-form-item>
<a-form-item label="方向：" style="padding: 5px 0"> <a-form-item label="事件类型：" style="padding: 5px 0">
<a-select v-model:value="queryForm.direction" <a-select v-model:value="queryForm.direction"
mode="multiple" mode="multiple"
:maxTagCount="1" :maxTagCount="1"
...@@ -63,6 +63,7 @@ ...@@ -63,6 +63,7 @@
<a-select-option :value="-1">出</a-select-option> <a-select-option :value="-1">出</a-select-option>
<a-select-option :value="0">横穿</a-select-option> <a-select-option :value="0">横穿</a-select-option>
<a-select-option :value="2">过店</a-select-option> <a-select-option :value="2">过店</a-select-option>
<a-select-option :value="9">收银</a-select-option>
</a-select> </a-select>
</a-form-item> </a-form-item>
<a-form-item label="抓拍类型：" style="padding: 5px 0"> <a-form-item label="抓拍类型：" style="padding: 5px 0">
...@@ -184,9 +185,9 @@ ...@@ -184,9 +185,9 @@
class="single-image"> class="single-image">
</el-image> </el-image>
<div>时间:{{ item.counttime }}</div> <div>时间:{{ item.counttime }}</div>
<div>人员类型:{{ item.person_type==1?'店员':(item.person_type==0?'顾客':'未知') }}({{ item.childAdult==1?'成人':(item.childAdult==0?'儿童':'未知') }})</div> <div>人员类型:{{ personTypeStr(item.person_type)}}({{ item.childAdult==1?'成人':(item.childAdult==0?'儿童':'未知') }})</div>
<div>性别:{{ formatGender(item.gender) }}({{item.age}})</div> <div>性别:{{ formatGender(item.gender) }}({{item.age}})</div>
<div class="direction" :class="'direction'+item.direction">方向:{{ formatDirection(item.direction) }}</div> <div class="direction" :class="'direction'+item.direction">事件类型:{{ formatDirection(item.direction) }}</div>
<div>地点:{{ item.gate_name }}</div> <div>地点:{{ item.gate_name }}</div>
</div> </div>
</el-col> </el-col>
...@@ -559,6 +560,9 @@ export default { ...@@ -559,6 +560,9 @@ export default {
} }
) )
} }
const personTypeStr = function(val){
return (personTypeList.value.filter(v => v.value == val)[0] || {label:'--'}).label
}
const formatGender = function(number){ const formatGender = function(number){
switch (number) switch (number)
{ {
...@@ -592,6 +596,14 @@ export default { ...@@ -592,6 +596,14 @@ export default {
{ {
return '出' return '出'
} }
case 9:
{
return '收银'
}
case 2:
{
return '过店'
}
case 0: case 0:
{ {
return '横穿' return '横穿'
...@@ -1028,6 +1040,7 @@ export default { ...@@ -1028,6 +1040,7 @@ export default {
clerkComparativeFun, clerkComparativeFun,
personnelComparativeFun, personnelComparativeFun,
singleComparativeFun, singleComparativeFun,
personTypeStr,
formatGender, formatGender,
downloadTrajectoryFile, downloadTrajectoryFile,
clickSearch, clickSearch,
......
src/views/SnapshotCluster/SnapshotRecord/SnapshotRecord.vue
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
> >
</a-select> </a-select>
</a-form-item> </a-form-item>
<a-form-item label="方向：" style="padding: 5px 0"> <a-form-item label="事件类型：" style="padding: 5px 0">
<a-select v-model:value="queryForm.direction" <a-select v-model:value="queryForm.direction"
mode="multiple" mode="multiple"
:maxTagCount="1" :maxTagCount="1"
...@@ -61,6 +61,7 @@ ...@@ -61,6 +61,7 @@
<a-select-option :value="-1">出</a-select-option> <a-select-option :value="-1">出</a-select-option>
<a-select-option :value="0">横穿</a-select-option> <a-select-option :value="0">横穿</a-select-option>
<a-select-option :value="2">过店</a-select-option> <a-select-option :value="2">过店</a-select-option>
<a-select-option :value="9">收银</a-select-option>
</a-select> </a-select>
</a-form-item> </a-form-item>
<a-form-item label="抓拍类型：" style="padding: 5px 0"> <a-form-item label="抓拍类型：" style="padding: 5px 0">
...@@ -143,7 +144,7 @@ ...@@ -143,7 +144,7 @@
> >
</el-image> </el-image>
<div>时间:{{ item.counttime }}</div> <div>时间:{{ item.counttime }}</div>
<div>人员类型:{{ item.person_type==1?'店员':(item.person_type==0?'顾客':'未知')}}({{ item.childAdult==1?'成人':(item.childAdult==0?'儿童':'未知') }})</div> <div>人员类型:{{ personTypeStr(item.person_type)}}({{ item.childAdult==1?'成人':(item.childAdult==0?'儿童':'未知') }})</div>
<div> <div>
<span>性别:{{ formatGender(item.gender) }}({{item.age}})</span> <span>性别:{{ formatGender(item.gender) }}({{item.age}})</span>
<a-popover v-if="item.personLabel" trigger="click"> <a-popover v-if="item.personLabel" trigger="click">
...@@ -178,7 +179,7 @@ ...@@ -178,7 +179,7 @@
<span style="margin-right: 10px;" class="downBtn downBtn1">标签</span> <span style="margin-right: 10px;" class="downBtn downBtn1">标签</span>
</a-popover> </a-popover>
</div> </div>
<div class="direction" :class="'direction'+item.direction">方向:{{ formatDirection(item.direction) }}</div> <div class="direction" :class="'direction'+item.direction">事件类型:{{ formatDirection(item.direction) }}</div>
<div>地点:{{ item.gate_name }}</div> <div>地点:{{ item.gate_name }}</div>
</div> </div>
</el-col> </el-col>
...@@ -524,6 +525,9 @@ export default { ...@@ -524,6 +525,9 @@ export default {
} }
) )
} }
const personTypeStr = function(val){
return (personTypeList.value.filter(v => v.value == val)[0] || {label:'--'}).label
}
const formatGender = function(number){ const formatGender = function(number){
switch (number) switch (number)
{ {
...@@ -557,6 +561,14 @@ export default { ...@@ -557,6 +561,14 @@ export default {
{ {
return '出' return '出'
} }
case 9:
{
return '收银'
}
case 2:
{
return '过店'
}
case 0: case 0:
{ {
return '横穿' return '横穿'
...@@ -973,6 +985,7 @@ export default { ...@@ -973,6 +985,7 @@ export default {
handleClick, handleClick,
comparativeFun, comparativeFun,
batchesResultFun, batchesResultFun,
personTypeStr,
formatGender, formatGender,
clickSearch, clickSearch,
// ref // ref
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!