Skip to content

罗鑫霖 / vion-tools

Go to a project
Commit 7b122e80 by 李乾广
Options

修改bug

1 parent 7e5f5b88
Inline Side-by-side
Showing 4 changed files with 15 additions and 12 deletions
src/views/ComparisonCapturedPictures/DetailDialogComparisonNew.vue
...@@ -170,7 +170,7 @@ export default { ...@@ -170,7 +170,7 @@ export default {
} }
const clickItem = function(data){ const clickItem = function(data){
clusterResultApi.getBodyPoint({'feature_url':data.features_url}).then((r) => { clusterResultApi.getBodyPoint({'feature_url':data.features_url}).then((r) => {
imgModelRef.value.initDialog(data.picture_url,r.data); imgModelRef.value.initDialog(data.unid, data.picture_url, r.data);
}) })
} }
return { return {
......
src/views/SnapshotCluster/ClusterResult/ClusterResult.vue
...@@ -234,8 +234,8 @@ export default { ...@@ -234,8 +234,8 @@ export default {
picType: 2, picType: 2,
personType: [1, 0], personType: [1, 0],
date: moment(moment().format('YYYY-MM-DD'), 'YYYY-MM-DD'), date: moment(moment().format('YYYY-MM-DD'), 'YYYY-MM-DD'),
startTime: moment('00:00:00', 'HH:mm:ss'), startTime: '00:00:00',
endTime: moment('23:59:59', 'HH:mm:ss'), endTime: '23:59:59',
minPic: 0, minPic: 0,
maxPic: 100, maxPic: 100,
childAdult:[], childAdult:[],
...@@ -250,8 +250,8 @@ export default { ...@@ -250,8 +250,8 @@ export default {
queryForm.direction = searchCondition.value.direction; queryForm.direction = searchCondition.value.direction;
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;
queryForm.endTime = searchCondition.value.endTime; // queryForm.endTime = searchCondition.value.endTime;
queryForm.minPic = searchCondition.value.minPic||0; queryForm.minPic = searchCondition.value.minPic||0;
queryForm.maxPic = searchCondition.value.maxPic||100; queryForm.maxPic = searchCondition.value.maxPic||100;
} }
...@@ -454,8 +454,8 @@ export default { ...@@ -454,8 +454,8 @@ export default {
date: rawData.date, date: rawData.date,
minPic: rawData.minPic, minPic: rawData.minPic,
maxPic: rawData.maxPic, maxPic: rawData.maxPic,
startTime: formatDate(rawData.date) + ' ' + rawData.startTime, startTime: rawData.startTime,
endTime: formatDate(rawData.date) + ' ' + rawData.endTime, endTime: rawData.endTime,
} }
) )
window.localStorage.setItem('searchCondition',JSON.stringify(storageData)) window.localStorage.setItem('searchCondition',JSON.stringify(storageData))
......
src/views/SnapshotCluster/SnapshotRecord/SnapshotRecord.vue
...@@ -206,8 +206,8 @@ export default { ...@@ -206,8 +206,8 @@ export default {
picType: 2, picType: 2,
personType: [1, 0], personType: [1, 0],
date: moment(moment().format('YYYY-MM-DD'), 'YYYY-MM-DD'), date: moment(moment().format('YYYY-MM-DD'), 'YYYY-MM-DD'),
startTime: moment('00:00:00', 'HH:mm:ss'), startTime: '00:00:00',
endTime: moment('23:59:59', 'HH:mm:ss'), endTime: '23:59:59',
childAdult:[], childAdult:[],
} }
) )
...@@ -414,8 +414,8 @@ export default { ...@@ -414,8 +414,8 @@ export default {
picType: rawData.picType, picType: rawData.picType,
personType: rawData.personType, personType: rawData.personType,
date: rawData.date, date: rawData.date,
startTime: formatDate(rawData.date) + ' ' +rawData.startTime, startTime:rawData.startTime,
endTime: formatDate(rawData.date) + ' ' + rawData.endTime, endTime:rawData.endTime,
} }
) )
window.localStorage.setItem('searchCondition',JSON.stringify(storageData)) window.localStorage.setItem('searchCondition',JSON.stringify(storageData))
......
src/views/SnapshotCluster/singleImgComparisonDialog.vue
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<span class="num">{{comparisonList&&comparisonList.length > 0?comparisonList[0].numLength:0}}张</span> <span class="num">{{comparisonList&&comparisonList.length > 0?comparisonList[0].numLength:0}}张</span>
</p> </p>
<el-row class="imgBox1_top"> <el-row class="imgBox1_top">
<el-row :gutter="10" v-for="(one,ind) in comparisonList" style="width: 100%;"> <el-row :gutter="10" v-for="(one,ind) in comparisonList" style="width: 100%;border-radius: 5px;border:1px solid #ccc;margin: 0px 0px 5px!important;">
<div style="height: 30px;line-height: 30px;width: 100%;padding-left: 5px;margin-bottom: 5px;"> <div style="height: 30px;line-height: 30px;width: 100%;padding-left: 5px;margin-bottom: 5px;">
{{one.person_unid}} {{one.person_unid}}
<span style="float: right;padding-right: 11px;" v-if="one.personList">{{one.personList.length}}张</span> <span style="float: right;padding-right: 11px;" v-if="one.personList">{{one.personList.length}}张</span>
...@@ -171,6 +171,9 @@ ...@@ -171,6 +171,9 @@
if (one.picture_url) { if (one.picture_url) {
one.picture_url = window._baseImgUrl + one.picture_url one.picture_url = window._baseImgUrl + one.picture_url
} }
if (one.features_url) {
one.features_url = window._baseImgUrl + one.features_url
}
}) })
} }
}) })
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!