修改bug

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){
-                               r.data.forEach((item) => {
-                                   if (item.features_url) {
-                                       item.features_url = window._baseImgUrl + item.features_url
-                                   }
-                                   if (item.picture_url) {
-                                       item.picture_url = window._baseImgUrl + item.picture_url
-                                   }
-                               })
-                               comparisonList.value = r.data
+														 let personList = []
+														 r.data.forEach((item) => {
+															 if (item.personList&&isArray(item.personList)) {
+															     item.personList.forEach((one) => {
+															         if (one.features_url) {
+															             one.features_url = window._baseImgUrl + one.features_url
+															         }
+															         if (one.picture_url) {
+															             one.picture_url = window._baseImgUrl + one.picture_url
+															         }
+															     })
+															 		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,