Skip to content

罗鑫霖 / vion-tools

Go to a project
Commit 0f13d816 by 李乾广
Options

修改bug

1 parent b08ea82a
Inline Side-by-side
Showing 4 changed files with 420 additions and 29 deletions
src/views/FeatureComparisonVerification/FeatureComparisonVerification.vue
......@@ -536,7 +536,10 @@
pic_type:rawData.picType,
countdate:formatDate(rawData.date),
pic_id:boxObj.value.id,
person_unid:boxObj.value.person_unid,
ip:window._baseImgUrl,
startTime: formatDate(rawData.date) + ' 00:00:00',
endTime: formatDate(rawData.date) + ' 23:59:59',
customScore:threshold.value?threshold.value:75
}
comparisonList.value = []
......@@ -544,15 +547,21 @@
isLoadingComparison.value = false
if (isArray(r.data)) {
if(r.data.length>0){
let personList = []
r.data.forEach((item) => {
if (item.features_url) {
item.features_url = window._baseImgUrl + item.features_url
if (item.personList&&isArray(item.personList)) {
item.personList.forEach((one) => {
if (one.features_url) {
one.features_url = window._baseImgUrl + one.features_url
}
if (item.picture_url) {
item.picture_url = window._baseImgUrl + item.picture_url
if (one.picture_url) {
one.picture_url = window._baseImgUrl + one.picture_url
}
})
comparisonList.value = r.data
personList = personList.concat(item.personList)
}
})
comparisonList.value = personList
}
}
}
......@@ -652,7 +661,6 @@
}
const addImage = function(data,event){
event.stopPropagation()
featureApi.updateImage({
'personUnid':boxObj.value.person_unid,
'id':data.id,
......@@ -666,9 +674,11 @@
type: 'success'
}
)
comparisonList.value.forEach(item=>{
comparisonList.value.forEach((item,index)=>{
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/FeatureComparisonVerification/api.js
......@@ -41,7 +41,7 @@ class FeatureResultApi {
return axiosInstance.request(
{
method: 'PUT',
url: `/faceRecognitions`,
url: `/faceRecognitions/updatePersonUnid`,
data: filterEmptyValueInObject(
data
)
......
src/views/SnapshotCluster/ClusterResult/ClusterResult.vue
......@@ -90,6 +90,9 @@
<a-select-option :value="-1">未知</a-select-option>
</a-select>
</a-form-item>
<a-form-item label="人ID：" style="padding: 5px 0">
<a-input v-model:value="queryForm.personUnid" style="width: 240px"/>
</a-form-item>
<a-form-item label="选择日期：" style="padding: 5px 0">
<a-date-picker v-model:value="queryForm.date" :format="'YYYY-MM-DD'" :allowClear="false" style="width: 240px"/>
</a-form-item>
......@@ -184,7 +187,7 @@
class="single-image">
</el-image>
<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 class="direction" :class="'direction'+item.direction">方向:{{ formatDirection(item.direction) }}</div>
<div>地点:{{ item.gate_name }}</div>
......@@ -289,6 +292,7 @@ export default {
startTime: '00:00:00',
endTime: '23:59:59',
minPic: 0,
personUnid:'',
maxPic: 100,
childAdult:[],
}
......@@ -501,6 +505,7 @@ export default {
startTime: formatDate(rawData.date) + ' ' + rawData.startTime,
endTime: formatDate(rawData.date) + ' ' + rawData.endTime,
minPic: rawData.minPic,
personUnid: rawData.personUnid,
maxPic: rawData.maxPic,
page: pageNum.value - 1,
pageSize: pageSize.value,
......@@ -518,6 +523,7 @@ export default {
picType: rawData.picType,
personType: rawData.personType,
childAdult: rawData.childAdult,
personUnid: rawData.personUnid,
date: rawData.date,
minPic: rawData.minPic,
maxPic: rawData.maxPic,
......@@ -559,6 +565,9 @@ export default {
}
)
}
const personTypeStr = function(val){
return (personTypeList.value.filter(v => v.value == val)[0] || {label:'--'}).label
}
const formatGender = function(number){
switch (number)
{
......@@ -980,7 +989,7 @@ export default {
const contentHeight = ref(0)
const __main = function() {
getAccountList()
contentHeight.value = window.innerHeight - 280
contentHeight.value = window.innerHeight - 320
}
__main()
......@@ -1028,6 +1037,7 @@ export default {
clerkComparativeFun,
personnelComparativeFun,
singleComparativeFun,
personTypeStr,
formatGender,
downloadTrajectoryFile,
clickSearch,
......
src/views/SnapshotCluster/SnapshotRecord/SnapshotRecord.vue
......@@ -143,35 +143,35 @@
>
</el-image>
<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>
<span>性别:{{ formatGender(item.gender) }}({{item.age}})</span>
<a-popover v-if="item.personLabel" trigger="click">
<template #content>
<div class="person-tag-one" v-if="item.personLabel.hairStyle!==null&&item.personLabel.hairStyle!==undefined"><span>发型：</span><span>{{item.personLabel.hairStyle}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.hairColor!==null&&item.personLabel.hairColor!==undefined"><span>发色：</span><span>{{item.personLabel.hairColor}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.hat!==null&&item.personLabel.hat!==undefined"><span>帽子：</span><span>{{item.personLabel.hat}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.hatColor!==null&&item.personLabel.hatColor!==undefined"><span>帽子颜色：</span><span>{{item.personLabel.hatColor}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.glasses!==null&&item.personLabel.glasses!==undefined"><span>眼镜：</span><span>{{item.personLabel.glasses}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.mask!==null&&item.personLabel.mask!==undefined"><span>口罩：</span><span>{{item.personLabel.mask}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.earring!==null&&item.personLabel.earring!==undefined"><span>耳饰：</span><span>{{item.personLabel.earring}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.hairStyle!==null&&item.personLabel.hairStyle!==undefined"><span>发型：</span><span>{{hairStyleStr(item.personLabel.hairStyle)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.hairColor!==null&&item.personLabel.hairColor!==undefined"><span>发色：</span><span>{{jacketColorStr(item.personLabel.hairColor)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.hat!==null&&item.personLabel.hat!==undefined"><span>帽子：</span><span>{{hatStr(item.personLabel.hat)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.hatColor!==null&&item.personLabel.hatColor!==undefined"><span>帽子颜色：</span><span>{{jacketColorStr(item.personLabel.hatColor)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.glasses!==null&&item.personLabel.glasses!==undefined"><span>眼镜：</span><span>{{glassesStr(item.personLabel.glasses)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.mask!==null&&item.personLabel.mask!==undefined"><span>口罩：</span><span>{{maskStr(item.personLabel.mask)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.earring!==null&&item.personLabel.earring!==undefined"><span>耳饰：</span><span>{{earringStr(item.personLabel.earring)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.jacketType!==null&&item.personLabel.jacketType!==undefined"><span>上装种类：</span><span>{{jacketTypeStr(item.personLabel.jacketType)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.jacketColor!==null&&item.personLabel.jacketColor!==undefined"><span>上装颜色：</span><span>{{jacketColorStr(item.personLabel.jacketColor)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.bottomsType!==null&&item.personLabel.bottomsType!==undefined"><span>下装种类：</span><span>{{bottomsTypeStr(item.personLabel.bottomsType)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.bottomsColor!==null&&item.personLabel.bottomsColor!==undefined"><span>下装颜色：</span><span>{{jacketColorStr(item.personLabel.bottomsColor)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.suitType!==null&&item.personLabel.suitType!==undefined"><span>套装种类：</span><span>{{suitTypeStr(item.personLabel.suitType)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.suitColor!==null&&item.personLabel.suitColor!==undefined"><span>套装颜色：</span><span>{{jacketColorStr(item.personLabel.suitColor)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.clothingBrand!==null&&item.personLabel.clothingBrand!==undefined"><span>文字与LOGO：</span><span>{{item.personLabel.clothingBrand}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.necklace!==null&&item.personLabel.necklace!==undefined"><span>佩戴项链：</span><span>{{item.personLabel.necklace}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.watch!==null&&item.personLabel.watch!==undefined"><span>佩戴手表：</span><span>{{item.personLabel.watch}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.bracelet!==null&&item.personLabel.bracelet!==undefined"><span>佩戴手链：</span><span>{{item.personLabel.bracelet}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.phone!==null&&item.personLabel.phone!==undefined"><span>手持手机：</span><span>{{item.personLabel.phone}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.clothingBrand!==null&&item.personLabel.clothingBrand!==undefined"><span>文字与LOGO：</span><span>{{clothingBrandStr(item.personLabel.clothingBrand)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.necklace!==null&&item.personLabel.necklace!==undefined"><span>佩戴项链：</span><span>{{necklaceStr(item.personLabel.necklace)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.watch!==null&&item.personLabel.watch!==undefined"><span>佩戴手表：</span><span>{{watchStr(item.personLabel.watch)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.bracelet!==null&&item.personLabel.bracelet!==undefined"><span>佩戴手链：</span><span>{{braceletStr(item.personLabel.bracelet)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.phone!==null&&item.personLabel.phone!==undefined"><span>手持手机：</span><span>{{phoneStr(item.personLabel.phone)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.shoeType!==null&&item.personLabel.shoeType!==undefined"><span>鞋子类型：</span><span>{{shoeTypeStr(item.personLabel.shoeType)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.shoeColor!==null&&item.personLabel.shoeColor!==undefined"><span>鞋子颜色：</span><span>{{jacketColorStr(item.personLabel.shoeColor)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.rucksackType!==null&&item.personLabel.rucksackType!==undefined"><span>背包类型：</span><span>{{rucksackTypeStr(item.personLabel.rucksackType)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.rucksackColor!==null&&item.personLabel.rucksackColor!==undefined"><span>背包颜色：</span><span>{{jacketColorStr(item.personLabel.rucksackColor)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.handbagType!==null&&item.personLabel.handbagType!==undefined"><span>拎包类型：</span><span>{{handbagTypeStr(item.personLabel.handbagType)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.handbagColor!==null&&item.personLabel.handbagColor!==undefined"><span>拎包颜色：</span><span>{{jacketColorStr(item.personLabel.handbagColor)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.shoeType!==null&&item.personLabel.shoeType!==undefined"><span>鞋子类型：</span><span>{{item.personLabel.shoeType}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.shoeColor!==null&&item.personLabel.shoeColor!==undefined"><span>鞋子颜色：</span><span>{{item.personLabel.shoeColor}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.shoppingBagType!==null&&item.personLabel.shoppingBagType!==undefined"><span>提袋类型：</span><span>{{shoppingBagTypeStr(item.personLabel.shoppingBagType)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.shoppingBagColor!==null&&item.personLabel.shoppingBagColor!==undefined"><span>提袋颜色：</span><span>{{jacketColorStr(item.personLabel.shoppingBagColor)}}</span></div>
</template>
......@@ -524,6 +524,9 @@ export default {
}
)
}
const personTypeStr = function(val){
return (personTypeList.value.filter(v => v.value == val)[0] || {label:'--'}).label
}
const formatGender = function(number){
switch (number)
{
......@@ -570,6 +573,293 @@ export default {
}
//标签
const hairStyleStr = function(number){
switch (number)
{
case 0:
{
return '看不清'
}
case 1:
{
return '无头发'
}
case 2:
{
return '短发'
}
case 3:
{
return '长发'
}
default:
{
break
}
}
}
const hatStr = function(number){
switch (number)
{
case 0:
{
return '看不清'
}
case 1:
{
return '无帽子'
}
case 2:
{
return '有帽子'
}
default:
{
break
}
}
}
const glassesStr = function(number){
switch (number)
{
case 0:
{
return '看不清'
}
case 1:
{
return '无眼镜'
}
case 2:
{
return '有眼镜'
}
default:
{
break
}
}
}
const maskStr = function(number){
switch (number)
{
case 0:
{
return '看不清'
}
case 1:
{
return '不戴口罩'
}
case 2:
{
return '戴口罩'
}
default:
{
break
}
}
}
const earringStr = function(number){
switch (number)
{
case 0:
{
return '看不清'
}
case 1:
{
return '无耳饰'
}
case 2:
{
return '有耳饰'
}
default:
{
break
}
}
}
const necklaceStr = function(number){
switch (number)
{
case 0:
{
return '看不清'
}
case 1:
{
return '无项链'
}
case 2:
{
return '有项链'
}
default:
{
break
}
}
}
const clothingBrandStr = function(number){
switch (number)
{
case 0:
{
return '无Logo'
}
case 1:
{
return '耐克'
}
case 2:
{
return '阿迪达斯'
}
case 3:
{
return 'GAP'
}
case 4:
{
return 'Champion'
}
case 5:
{
return '安踏'
}
case 6:
{
return 'GUCCI'
}
case 7:
{
return 'Under Armour'
}
case 8:
{
return 'THE North Face'
}
case 9:
{
return 'New Balance'
}
case 10:
{
return 'Puma'
}
case 11:
{
return '李宁'
}
case 12:
{
return '361'
}
case 13:
{
return '鸿星尔克'
}
case 14:
{
return '特步'
}
case 15:
{
return 'Armani'
}
case 16:
{
return '斯凯奇'
}
case 17:
{
return '李维斯'
}
case 18:
{
return 'Kappa'
}
case 19:
{
return '哥伦比亚'
}
case 20:
{
return '始祖鸟'
}
default:
{
break
}
}
}
const watchStr = function(number){
switch (number)
{
case 0:
{
return '看不清'
}
case 1:
{
return '无手表'
}
case 2:
{
return '有手表'
}
default:
{
break
}
}
}
const braceletStr = function(number){
switch (number)
{
case 0:
{
return '看不清'
}
case 1:
{
return '无手链'
}
case 2:
{
return '有手链'
}
default:
{
break
}
}
}
const phoneStr = function(number){
switch (number)
{
case 0:
{
return '看不清'
}
case 1:
{
return '无手持手机'
}
case 2:
{
return '手持手机'
}
default:
{
break
}
}
}
const jacketTypeStr = function(number){
switch (number)
{
......@@ -631,9 +921,13 @@ export default {
const jacketColorStr = function(number){
switch (number)
{
case -1:
{
return '无'
}
case 0:
{
return '其他'
return '看不清'
}
case 1:
{
......@@ -649,11 +943,11 @@ export default {
}
case 4:
{
return '红'
return '粉'
}
case 5:
{
return '黄'
return '米'
}
case 6:
{
......@@ -675,6 +969,18 @@ export default {
{
return '拼色'
}
case 11:
{
return '红'
}
case 12:
{
return '黄橙'
}
case 13:
{
return '咖棕'
}
default:
{
......@@ -730,6 +1036,14 @@ export default {
{
return '其他套装'
}
case 4:
{
return '快递'
}
case 5:
{
return '外卖'
}
default:
{
break
......@@ -786,6 +1100,51 @@ export default {
}
}
}
const shoeTypeStr = function(number){
switch (number)
{
case 0:
{
return '看不清'
}
case 1:
{
return '皮鞋'
}
case 2:
{
return '运动休闲鞋'
}
case 3:
{
return '拖凉鞋'
}
case 4:
{
return '短靴'
}
case 5:
{
return '长靴'
}
case 6:
{
return '板鞋'
}
case 7:
{
return '帆布鞋'
}
case 8:
{
return '小白鞋'
}
default:
{
break
}
}
}
const shoppingBagTypeStr = function(number){
switch (number)
{
......@@ -973,6 +1332,7 @@ export default {
handleClick,
comparativeFun,
batchesResultFun,
personTypeStr,
formatGender,
clickSearch,
// ref
......@@ -981,12 +1341,23 @@ export default {
imgModelRef,
singleComparativeFun,
singleImgComparisonRef,
hairStyleStr,
hatStr,
glassesStr,
maskStr,
earringStr,
necklaceStr,
clothingBrandStr,
watchStr,
braceletStr,
phoneStr,
jacketTypeStr,
jacketColorStr,
bottomsTypeStr,
suitTypeStr,
rucksackTypeStr,
handbagTypeStr,
shoeTypeStr,
shoppingBagTypeStr
}
}
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!