Commit 361479b5 by 李乾广

修改bug

1 parent 053e4122
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
:maxTagCount="1" :maxTagCount="1"
style="width: 240px"> style="width: 240px">
<a-select-option <a-select-option
v-for="item in childAdultOptions" v-for="item in childAdultAgeOptions"
:key="item.value" :key="item.value"
:value="item.value" :value="item.value"
>{{item.label}}</a-select-option> >{{item.label}}</a-select-option>
...@@ -601,13 +601,18 @@ export default { ...@@ -601,13 +601,18 @@ export default {
const personTypeStr = function(val){ const personTypeStr = function(val){
return (personTypeList.value.filter(v => v.value == val)[0] || {label:'--'}).label return (personTypeList.value.filter(v => v.value == val)[0] || {label:'--'}).label
} }
const childAdultAgeOptions = ref([
{ value: 0, label: '婴儿' },
{ value: 1, label: '儿童' },
{ value: 2, label: '少年' },
{ value: 3, label: '青年' },
{ value: 4, label: '中午' },
{ value: 5, label: '老年' },
{ value: -1, label: '未知' },
])
const childAdultOptions = ref([ const childAdultOptions = ref([
{ value: 0, label: '婴儿' }, { value: 0, label: '儿童' },
{ value: 1, label: '儿童' }, { value: 1, label: '成人' },
{ value: 2, label: '少年' },
{ value: 3, label: '青年' },
{ value: 4, label: '中午' },
{ value: 5, label: '老年' },
{ value: -1, label: '未知' }, { value: -1, label: '未知' },
]) ])
const formatChildAdult = function(val) { const formatChildAdult = function(val) {
...@@ -1169,6 +1174,7 @@ export default { ...@@ -1169,6 +1174,7 @@ export default {
mutipleOperationText, mutipleOperationText,
deleteRealPersonRecord, deleteRealPersonRecord,
addShopkeeper, addShopkeeper,
childAdultAgeOptions,
childAdultOptions, childAdultOptions,
formatChildAdult formatChildAdult
} }
......
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
:maxTagCount="1" :maxTagCount="1"
style="width: 240px"> style="width: 240px">
<a-select-option <a-select-option
v-for="item in childAdultOptions" v-for="item in childAdultAgeOptions"
:key="item.value" :key="item.value"
:value="item.value" :value="item.value"
>{{item.label}}</a-select-option> >{{item.label}}</a-select-option>
...@@ -165,30 +165,30 @@ ...@@ -165,30 +165,30 @@
<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">
<template #content> <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.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>{{item.personLabel.hairColor}}</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>{{item.personLabel.hat}}</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>{{item.personLabel.hatColor}}</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>{{item.personLabel.glasses}}</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>{{item.personLabel.mask}}</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>{{item.personLabel.earring}}</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.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.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.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.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.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.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.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>{{item.personLabel.necklace}}</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>{{item.personLabel.watch}}</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>{{item.personLabel.bracelet}}</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>{{item.personLabel.phone}}</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.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.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.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.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.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> <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> </template>
...@@ -549,13 +549,18 @@ export default { ...@@ -549,13 +549,18 @@ export default {
const personTypeStr = function(val){ const personTypeStr = function(val){
return (personTypeList.value.filter(v => v.value == val)[0] || {label:'--'}).label return (personTypeList.value.filter(v => v.value == val)[0] || {label:'--'}).label
} }
const childAdultAgeOptions = ref([
{ value: 0, label: '婴儿' },
{ value: 1, label: '儿童' },
{ value: 2, label: '少年' },
{ value: 3, label: '青年' },
{ value: 4, label: '中午' },
{ value: 5, label: '老年' },
{ value: -1, label: '未知' },
])
const childAdultOptions = ref([ const childAdultOptions = ref([
{ value: 0, label: '婴儿' }, { value: 0, label: '儿童' },
{ value: 1, label: '儿童' }, { value: 1, label: '成人' },
{ value: 2, label: '少年' },
{ value: 3, label: '青年' },
{ value: 4, label: '中午' },
{ value: 5, label: '老年' },
{ value: -1, label: '未知' }, { value: -1, label: '未知' },
]) ])
const formatChildAdult = function(val) { const formatChildAdult = function(val) {
...@@ -617,6 +622,292 @@ export default { ...@@ -617,6 +622,292 @@ 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){ const jacketTypeStr = function(number){
switch (number) switch (number)
{ {
...@@ -678,49 +969,65 @@ export default { ...@@ -678,49 +969,65 @@ export default {
const jacketColorStr = function(number){ const jacketColorStr = function(number){
switch (number) switch (number)
{ {
case 0: case -1:
{ {
return '其他' return '无'
} }
case 1: case 0:
{ {
return '黑' return '看不清'
} }
case 2: case 1:
{ {
return '白' return '黑'
} }
case 2:
{
return '白'
}
case 3: case 3:
{ {
return '灰' return '灰'
} }
case 4: case 4:
{ {
return '红' return '粉'
} }
case 5: case 5:
{ {
return '黄' return '米'
} }
case 6: case 6:
{ {
return '蓝' return '蓝'
} }
case 7: case 7:
{ {
return '绿' return '绿'
} }
case 8: case 8:
{ {
return '紫' return '紫'
} }
case 9: case 9:
{ {
return '花(条纹)' return '花(条纹)'
} }
case 10: case 10:
{ {
return '拼色' return '拼色'
}
case 11:
{
return '红'
}
case 12:
{
return '黄橙'
}
case 13:
{
return '咖棕'
} }
default: default:
{ {
...@@ -775,7 +1082,15 @@ export default { ...@@ -775,7 +1082,15 @@ export default {
} }
case 3: case 3:
{ {
return '其他套装' return '其他套装'
}
case 4:
{
return '快递'
}
case 5:
{
return '外卖'
} }
default: default:
{ {
...@@ -833,6 +1148,51 @@ export default { ...@@ -833,6 +1148,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){ const shoppingBagTypeStr = function(number){
switch (number) switch (number)
{ {
...@@ -1029,15 +1389,27 @@ export default { ...@@ -1029,15 +1389,27 @@ export default {
imgModelRef, imgModelRef,
singleComparativeFun, singleComparativeFun,
singleImgComparisonRef, singleImgComparisonRef,
hairStyleStr,
hatStr,
glassesStr,
maskStr,
earringStr,
necklaceStr,
clothingBrandStr,
watchStr,
braceletStr,
phoneStr,
jacketTypeStr, jacketTypeStr,
jacketColorStr, jacketColorStr,
bottomsTypeStr, bottomsTypeStr,
suitTypeStr, suitTypeStr,
rucksackTypeStr, rucksackTypeStr,
handbagTypeStr, handbagTypeStr,
shoeTypeStr,
shoppingBagTypeStr, shoppingBagTypeStr,
formatChildAdult, formatChildAdult,
childAdultAgeOptions,
childAdultOptions, childAdultOptions,
} }
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!