Skip to content

罗鑫霖 / vion-tools

Go to a project
Commit e009cad5 by 李乾广
Options

修改bug

1 parent b4580f6c
Inline Side-by-side
Showing 12 changed files with 73 additions and 25 deletions
src/views/ComparisonCapturedPictures/ComparisonCapturedPictures.vue
......@@ -403,7 +403,12 @@
endTime: formatDate(rawData.date) + ' ' + formatTime(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))
comparsionResultApi.getPersonGroupList(data).then(
(r) => {
isLoading.value = false
......
src/views/FeatureComparisonVerification/FeatureComparisonVerification.vue
......@@ -444,7 +444,12 @@
endTime: formatDate(rawData.date) + ' ' + formatTime(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/Main/Main.vue
......@@ -154,7 +154,7 @@
</a-sub-menu>
</a-menu>
</el-aside>
<el-main>
<el-main style="padding: 10px 20px;">
<router-view :key="$route.fullPath"></router-view>
</el-main>
</el-container>
......
src/views/SnapshotCluster/ClusterResult/ClusterResult.vue
......@@ -149,7 +149,7 @@
</div>
<el-image :src="item.picture_url"
:fit="'fill'"
class="single-image" >
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>
......@@ -173,7 +173,7 @@
@showSizeChange="onPageSizeChange"
show-size-changer
show-quick-jumper
style="text-align:center"
style="text-align:center;margin-top: 10px;"
/>
</div>
</div>
......@@ -682,7 +682,7 @@ export default {
const contentHeight = ref(0)
const __main = function() {
getAccountList()
contentHeight.value = window.innerHeight - 310
contentHeight.value = window.innerHeight - 280
}
__main()
......
src/views/SnapshotCluster/SnapshotCluster.vue
<template>
<a-menu v-model:selectedKeys="currentMenu" mode="horizontal">
<a-menu-item :key="'抓拍记录'">
<a-menu-item :key="'抓拍记录'" class="snapshot-cluster-title">
抓拍记录
</a-menu-item>
<a-menu-item :key="'聚类结果'">
<a-menu-item :key="'聚类结果'" class="snapshot-cluster-title">
聚类结果
</a-menu-item>
<a-menu-item :key="'批次'">
<a-menu-item :key="'批次'" class="snapshot-cluster-title">
批次
</a-menu-item>
</a-menu>
......@@ -55,3 +55,9 @@ export default {
<style scoped>
</style>
<style type="text/css">
.snapshot-cluster-title.ant-menu-item{
line-height: 28px!important;
padding-left: 20px!important;
}
</style>
\ No newline at end of file
src/views/SnapshotCluster/SnapshotRecord/SnapshotRecord.vue
......@@ -128,7 +128,9 @@
</div>
<el-image :src="item.picture_url"
:fit="'fill'"
class="single-image">
class="single-image"
:style="{'height':imgHeight+'px'}"
>
</el-image>
<div>时间:{{ item.counttime }}</div>
<div>人员类型:{{ item.person_type==1?'店员':(item.person_type==0?'顾客':'未知')}}({{ item.childAdult==1?'成人':(item.childAdult==0?'儿童':'未知') }})</div>
......@@ -149,7 +151,7 @@
@showSizeChange="onPageSizeChange"
show-size-changer
show-quick-jumper
style="text-align:center"
style="text-align:center;margin-top: 10px;"
/>
</div>
<!-- <imgDialog ref='imgModelRef'></imgDialog> -->
......@@ -215,6 +217,7 @@ export default {
const searchCondition = ref({})
if(window.localStorage.getItem('searchCondition')){
searchCondition.value = JSON.parse(window.localStorage.getItem('searchCondition'));
console.log(searchCondition.value)
// queryForm.type = searchCondition.value.type;
queryForm.zone_id = searchCondition.value.zone_id;
queryForm.gate_id = searchCondition.value.gate_id;
......@@ -426,6 +429,7 @@ export default {
...searchCondition,
...storageData
}
console.log(newSearchCondition)
window.localStorage.setItem('searchCondition',JSON.stringify(newSearchCondition))
snapshotRecordApi.getSnapshotRecordList(data).then(
(r) => {
......@@ -566,9 +570,11 @@ export default {
confirmSearch()
}
const contentHeight = ref(0)
const imgHeight = ref(0)
const __main = function() {
getAccountList()
contentHeight.value = window.innerHeight - 310
contentHeight.value = window.innerHeight - 280
imgHeight.value = (((window.innerWidth - 240)/8)-10)*1.21
}
__main()
......@@ -588,6 +594,7 @@ export default {
pagedTableDataList,
currentItemId,
contentHeight,
imgHeight,
// mapping
queryForm,
// function
......
src/views/SnapshotCluster/batchesResult/batchesResult.vue
......@@ -7,7 +7,7 @@
</a-select>
</a-form-item>
<a-form-item label="广场：" style="padding: 5px 0">
<a-select v-model:value="queryForm.plaza_id" style="width: 240px" mode="multiple" :maxTagCount="1" :options="plazaList" optionFilterProp="label" show-search>
<a-select v-model:value="queryForm.plaza_id" style="width: 240px" :maxTagCount="1" :options="plazaList" optionFilterProp="label" show-search>
</a-select>
</a-form-item>
......@@ -99,7 +99,7 @@
const currentItemId = ref()
const queryForm = reactive({
account_id: [],
plaza_id: [],
plaza_id: '',
date: moment(moment().format('YYYY-MM-DD'), 'YYYY-MM-DD'),
startTime: '00:00:00',
endTime: '23:59:59',
......@@ -130,7 +130,7 @@
getPlazaList(1)
}
const getPlazaList = function(val) {
queryForm.plaza_id = []
queryForm.plaza_id = ''
plazaList.value = []
batchesResultApi.getPlazaList({
account_id: queryForm.account_id.toString()
......@@ -145,9 +145,9 @@
}
if (plazaList.value.length > 0) {
if (!val && searchCondition.value.plaza_id && searchCondition.value.plaza_id.length > 0) {
queryForm.plaza_id = searchCondition.value.plaza_id
queryForm.plaza_id = searchCondition.value.plaza_id[0]
} else {
queryForm.plaza_id.push(plazaList.value[0].value)
queryForm.plaza_id = plazaList.value[0].value
}
confirmSearch()
}
......@@ -188,7 +188,7 @@
isLoading.value = true
const rawData = toRaw(queryForm)
const data = filterEmptyValueInObject({
mallId: rawData.plaza_id?rawData.plaza_id.toString():'',
mallId: rawData.plaza_id,
countDate: formatDate(rawData.date),
startTime: formatDate(rawData.date) + ' ' + rawData.startTime,
endTime: formatDate(rawData.date) + ' ' + rawData.endTime,
......@@ -199,7 +199,7 @@
})
const storageData = filterEmptyValueInObject({
account_id: rawData.account_id,
plaza_id: rawData.plaza_id,
plaza_id: [rawData.plaza_id],
date: rawData.date,
minNum: rawData.minNum,
maxNum: rawData.maxNum,
......@@ -292,7 +292,7 @@
countDate: formatDate(rawData.date),
sourceGroupUnid:selectArr[0].groupUnid,
targetGroupUnid:selectArr[1].groupUnid,
mallId: rawData.plaza_id?rawData.plaza_id.toString():'',
mallId: rawData.plaza_id,
}
ElMessageBox.confirm('是否合并选中的两个批次分组？', {
confirmButtonText: '确认',
......
src/views/SnapshotCluster1/ClusterResult/ClusterResult.vue
......@@ -463,7 +463,12 @@ export default {
endTime: formatDate(rawData.date) + ' ' + formatTime(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/SnapshotCluster1/SnapshotRecord/SnapshotRecord.vue
......@@ -416,7 +416,12 @@ export default {
endTime: formatDate(rawData.date) + ' ' + formatTime(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/SourceTrajectoryAnalysis/ClusterResult/ClusterResult.vue
......@@ -302,7 +302,12 @@
gate_id: rawData.gate_id,
date: rawData.date,
})
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/TestDriveHospitality/ClusterResult/ClusterResult.vue
......@@ -287,7 +287,12 @@
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))
clusterResultApi.getClusterResultList(data).then(
(r) => {
isLoading.value = false
......
src/views/TestDriveHospitality/SnapshotRecord/SnapshotRecord.vue
......@@ -291,7 +291,12 @@
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
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!