Skip to content

罗鑫霖 / vion-tools

Go to a project
Commit b4580f6c by 李乾广
Options

修改bug

1 parent ea7a75af
Inline Side-by-side
Showing 3 changed files with 40 additions and 19 deletions
src/views/SnapshotCluster/ClusterResult/ClusterResult.vue
...@@ -249,6 +249,7 @@ export default { ...@@ -249,6 +249,7 @@ export default {
queryForm.zone_id = searchCondition.value.zone_id; queryForm.zone_id = searchCondition.value.zone_id;
queryForm.gate_id = searchCondition.value.gate_id; queryForm.gate_id = searchCondition.value.gate_id;
queryForm.direction = searchCondition.value.direction; queryForm.direction = searchCondition.value.direction;
queryForm.childAdult = searchCondition.value.childAdult;
queryForm.picType = searchCondition.value.picType; queryForm.picType = searchCondition.value.picType;
queryForm.date = searchCondition.value.date; queryForm.date = searchCondition.value.date;
// queryForm.startTime = searchCondition.value.startTime; // queryForm.startTime = searchCondition.value.startTime;
...@@ -452,6 +453,7 @@ export default { ...@@ -452,6 +453,7 @@ export default {
direction: rawData.direction, direction: rawData.direction,
picType: rawData.picType, picType: rawData.picType,
personType: rawData.personType, personType: rawData.personType,
childAdult: rawData.childAdult,
date: rawData.date, date: rawData.date,
minPic: rawData.minPic, minPic: rawData.minPic,
maxPic: rawData.maxPic, maxPic: rawData.maxPic,
...@@ -459,7 +461,12 @@ export default { ...@@ -459,7 +461,12 @@ export default {
endTime: rawData.endTime, 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( clusterResultApi.getClusterResultList(data).then(
(r) => { (r) => {
isLoading.value = false isLoading.value = false
......
src/views/SnapshotCluster/SnapshotRecord/SnapshotRecord.vue
...@@ -219,6 +219,7 @@ export default { ...@@ -219,6 +219,7 @@ export default {
queryForm.zone_id = searchCondition.value.zone_id; queryForm.zone_id = searchCondition.value.zone_id;
queryForm.gate_id = searchCondition.value.gate_id; queryForm.gate_id = searchCondition.value.gate_id;
queryForm.direction = searchCondition.value.direction; queryForm.direction = searchCondition.value.direction;
queryForm.childAdult = searchCondition.value.childAdult;
queryForm.picType = searchCondition.value.picType; queryForm.picType = searchCondition.value.picType;
queryForm.date = searchCondition.value.date; queryForm.date = searchCondition.value.date;
// queryForm.startTime = searchCondition.value.startTime; // queryForm.startTime = searchCondition.value.startTime;
...@@ -285,7 +286,7 @@ export default { ...@@ -285,7 +286,7 @@ export default {
} }
const getZoneList = function(val) { const getZoneList = function(val) {
queryForm.zone_id = [] // queryForm.zone_id = []
zoneList.value = [] zoneList.value = []
snapshotRecordApi.getZoneList( snapshotRecordApi.getZoneList(
{ {
...@@ -414,12 +415,18 @@ export default { ...@@ -414,12 +415,18 @@ export default {
direction: rawData.direction, direction: rawData.direction,
picType: rawData.picType, picType: rawData.picType,
personType: rawData.personType, personType: rawData.personType,
childAdult: rawData.childAdult,
date: rawData.date, date: rawData.date,
startTime:rawData.startTime, startTime:rawData.startTime,
endTime:rawData.endTime, 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( snapshotRecordApi.getSnapshotRecordList(data).then(
(r) => { (r) => {
isLoading.value = false isLoading.value = false
......
src/views/SnapshotCluster/batchesResult/batchesResult.vue
...@@ -206,26 +206,33 @@ ...@@ -206,26 +206,33 @@
startTime: rawData.startTime, startTime: rawData.startTime,
endTime: rawData.endTime, 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( batchesResultApi.getBatchesResultList(data).then(
(r) => { (r) => {
isLoading.value = false isLoading.value = false
sortDataList(r.data.pageData) if(r.data&&r.data.pageData) {
r.data.pageData.forEach((itemPerson) => { sortDataList(r.data.pageData)
itemPerson.checked = false r.data.pageData.forEach((itemPerson) => {
itemPerson.expand = false itemPerson.checked = false
itemPerson.personRecordList.forEach((item) => { itemPerson.expand = false
if (item.faceRecognitionVo&&item.faceRecognitionVo.picture_url) { itemPerson.personRecordList.forEach((item) => {
item.faceRecognitionVo.picture_url = window._baseImgUrl + item.faceRecognitionVo.picture_url 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 (item.faceRecognitionVo&&item.faceRecognitionVo.features_url) {
} item.faceRecognitionVo.features_url = window._baseImgUrl + item.faceRecognitionVo.features_url
}
})
}) })
}) dataList.value = r.data.pageData
dataList.value = r.data.pageData console.log(dataList.value)
console.log(dataList.value) total.value = r.data.total
total.value = r.data.total }
document.getElementsByClassName('resultContent')[0].scrollTop = 0 document.getElementsByClassName('resultContent')[0].scrollTop = 0
} }
) )
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!