Skip to content

罗鑫霖 / vion-tools

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

修改bug

1 parent b08ea82a
Expand all
Inline Side-by-side
Showing 4 changed files with 31 additions and 11 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
} }
} }
} }
...@@ -652,7 +661,6 @@ ...@@ -652,7 +661,6 @@
} }
const addImage = function(data,event){ const addImage = function(data,event){
event.stopPropagation() event.stopPropagation()
featureApi.updateImage({ featureApi.updateImage({
'personUnid':boxObj.value.person_unid, 'personUnid':boxObj.value.person_unid,
'id':data.id, 'id':data.id,
...@@ -666,9 +674,11 @@ ...@@ -666,9 +674,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/FeatureComparisonVerification/api.js
...@@ -41,7 +41,7 @@ class FeatureResultApi { ...@@ -41,7 +41,7 @@ class FeatureResultApi {
return axiosInstance.request( return axiosInstance.request(
{ {
method: 'PUT', method: 'PUT',
url: `/faceRecognitions`, url: `/faceRecognitions/updatePersonUnid`,
data: filterEmptyValueInObject( data: filterEmptyValueInObject(
data data
) )
......
src/views/SnapshotCluster/ClusterResult/ClusterResult.vue
...@@ -90,6 +90,9 @@ ...@@ -90,6 +90,9 @@
<a-select-option :value="-1">未知</a-select-option> <a-select-option :value="-1">未知</a-select-option>
</a-select> </a-select>
</a-form-item> </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-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-date-picker v-model:value="queryForm.date" :format="'YYYY-MM-DD'" :allowClear="false" style="width: 240px"/>
</a-form-item> </a-form-item>
...@@ -184,7 +187,7 @@ ...@@ -184,7 +187,7 @@
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>
...@@ -289,6 +292,7 @@ export default { ...@@ -289,6 +292,7 @@ export default {
startTime: '00:00:00', startTime: '00:00:00',
endTime: '23:59:59', endTime: '23:59:59',
minPic: 0, minPic: 0,
personUnid:'',
maxPic: 100, maxPic: 100,
childAdult:[], childAdult:[],
} }
...@@ -501,6 +505,7 @@ export default { ...@@ -501,6 +505,7 @@ export default {
startTime: formatDate(rawData.date) + ' ' + rawData.startTime, startTime: formatDate(rawData.date) + ' ' + rawData.startTime,
endTime: formatDate(rawData.date) + ' ' + rawData.endTime, endTime: formatDate(rawData.date) + ' ' + rawData.endTime,
minPic: rawData.minPic, minPic: rawData.minPic,
personUnid: rawData.personUnid,
maxPic: rawData.maxPic, maxPic: rawData.maxPic,
page: pageNum.value - 1, page: pageNum.value - 1,
pageSize: pageSize.value, pageSize: pageSize.value,
...@@ -518,6 +523,7 @@ export default { ...@@ -518,6 +523,7 @@ export default {
picType: rawData.picType, picType: rawData.picType,
personType: rawData.personType, personType: rawData.personType,
childAdult: rawData.childAdult, childAdult: rawData.childAdult,
personUnid: rawData.personUnid,
date: rawData.date, date: rawData.date,
minPic: rawData.minPic, minPic: rawData.minPic,
maxPic: rawData.maxPic, maxPic: rawData.maxPic,
...@@ -559,6 +565,9 @@ export default { ...@@ -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){ const formatGender = function(number){
switch (number) switch (number)
{ {
...@@ -980,7 +989,7 @@ export default { ...@@ -980,7 +989,7 @@ export default {
const contentHeight = ref(0) const contentHeight = ref(0)
const __main = function() { const __main = function() {
getAccountList() getAccountList()
contentHeight.value = window.innerHeight - 280 contentHeight.value = window.innerHeight - 320
} }
__main() __main()
...@@ -1028,6 +1037,7 @@ export default { ...@@ -1028,6 +1037,7 @@ export default {
clerkComparativeFun, clerkComparativeFun,
personnelComparativeFun, personnelComparativeFun,
singleComparativeFun, singleComparativeFun,
personTypeStr,
formatGender, formatGender,
downloadTrajectoryFile, downloadTrajectoryFile,
clickSearch, clickSearch,
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!