修改bug

src/views/SnapshotCluster/ClusterResult/ClusterResult.vue

@@ -249,6 +249,7 @@ export default {
             queryForm.zone_id = searchCondition.value.zone_id;
             queryForm.gate_id = searchCondition.value.gate_id;
             queryForm.direction = searchCondition.value.direction;
+						queryForm.childAdult = searchCondition.value.childAdult;
             queryForm.picType = searchCondition.value.picType;
             queryForm.date = searchCondition.value.date;
             // queryForm.startTime = searchCondition.value.startTime;
@@ -452,6 +453,7 @@ export default {
                     direction: rawData.direction,
                     picType: rawData.picType,
                     personType: rawData.personType,
+										childAdult: rawData.childAdult,
                     date: rawData.date,
                     minPic: rawData.minPic,
                     maxPic: rawData.maxPic,
@@ -459,7 +461,12 @@ export default {
                     endTime: rawData.endTime,
                 }
             )
-            window.localStorage.setItem('searchCondition',JSON.stringify(storageData))
+						let searchCondition = JSON.parse(window.localStorage.getItem('searchCondition'));
+						let newSearchCondition = {
+							...searchCondition,
+							...storageData
+						}
+            window.localStorage.setItem('searchCondition',JSON.stringify(newSearchCondition))
             clusterResultApi.getClusterResultList(data).then(
                 (r) => {
                     isLoading.value = false

src/views/SnapshotCluster/SnapshotRecord/SnapshotRecord.vue

@@ -219,6 +219,7 @@ export default {
             queryForm.zone_id = searchCondition.value.zone_id;
             queryForm.gate_id = searchCondition.value.gate_id;
             queryForm.direction = searchCondition.value.direction;
+            queryForm.childAdult = searchCondition.value.childAdult;
             queryForm.picType = searchCondition.value.picType;
             queryForm.date = searchCondition.value.date;
             // queryForm.startTime = searchCondition.value.startTime;
@@ -285,7 +286,7 @@ export default {
         }
 
         const getZoneList = function(val) {
-            queryForm.zone_id = []
+            // queryForm.zone_id = []
             zoneList.value = []
             snapshotRecordApi.getZoneList(
                 {
@@ -414,12 +415,18 @@ export default {
                     direction: rawData.direction,
                     picType: rawData.picType,
                     personType: rawData.personType,
+										childAdult: rawData.childAdult,
                     date: rawData.date,
                     startTime:rawData.startTime,
                     endTime:rawData.endTime,
                 }
             )
-            window.localStorage.setItem('searchCondition',JSON.stringify(storageData))
+						let searchCondition = JSON.parse(window.localStorage.getItem('searchCondition'));
+						let newSearchCondition = {
+							...searchCondition,
+							...storageData
+						}
+						window.localStorage.setItem('searchCondition',JSON.stringify(newSearchCondition))
             snapshotRecordApi.getSnapshotRecordList(data).then(
                 (r) => {
                     isLoading.value = false

src/views/SnapshotCluster/batchesResult/batchesResult.vue

@@ -206,26 +206,33 @@
 					startTime: rawData.startTime,
 					endTime: rawData.endTime,
 				})
-				window.localStorage.setItem('searchCondition', JSON.stringify(storageData))
+				let searchCondition = JSON.parse(window.localStorage.getItem('searchCondition'));
+				let newSearchCondition = {
+					...searchCondition,
+					...storageData
+				}
+				window.localStorage.setItem('searchCondition', JSON.stringify(newSearchCondition))
 				batchesResultApi.getBatchesResultList(data).then(
 					(r) => {
 						isLoading.value = false
-						sortDataList(r.data.pageData)
-						r.data.pageData.forEach((itemPerson) => {
-							itemPerson.checked = false
-							itemPerson.expand = false
-							itemPerson.personRecordList.forEach((item) => {
-								if (item.faceRecognitionVo&&item.faceRecognitionVo.picture_url) {
-									item.faceRecognitionVo.picture_url = window._baseImgUrl + item.faceRecognitionVo.picture_url
-								}
-								if (item.faceRecognitionVo&&item.faceRecognitionVo.features_url) {
-									item.faceRecognitionVo.features_url = window._baseImgUrl + item.faceRecognitionVo.features_url
-								}
+						if(r.data&&r.data.pageData) {
+							sortDataList(r.data.pageData)
+							r.data.pageData.forEach((itemPerson) => {
+								itemPerson.checked = false
+								itemPerson.expand = false
+								itemPerson.personRecordList.forEach((item) => {
+									if (item.faceRecognitionVo&&item.faceRecognitionVo.picture_url) {
+										item.faceRecognitionVo.picture_url = window._baseImgUrl + item.faceRecognitionVo.picture_url
+									}
+									if (item.faceRecognitionVo&&item.faceRecognitionVo.features_url) {
+										item.faceRecognitionVo.features_url = window._baseImgUrl + item.faceRecognitionVo.features_url
+									}
+								})
 							})
-						})
-						dataList.value = r.data.pageData
-						console.log(dataList.value)
-						total.value = r.data.total
+							dataList.value = r.data.pageData
+							console.log(dataList.value)
+							total.value = r.data.total
+						}
 						document.getElementsByClassName('resultContent')[0].scrollTop = 0
 					}
 				)