Skip to content

罗鑫霖 / vion-tools

Go to a project
Commit c37b6d1d by 李乾广
Options

年龄筛选修改，增加性别筛选

1 parent b9051e60
Inline Side-by-side
Showing 2 changed files with 118 additions and 6 deletions
src/views/SnapshotCluster/ClusterResult/ClusterResult.vue
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
style="width: 240px"> style="width: 240px">
</a-select> </a-select>
</a-form-item> </a-form-item>
<a-form-item label="年龄类型：" style="padding: 5px 0"> <!-- <a-form-item label="年龄类型：" style="padding: 5px 0">
<a-select v-model:value="queryForm.childAdult" <a-select v-model:value="queryForm.childAdult"
mode="multiple" mode="multiple"
:maxTagCount="1" :maxTagCount="1"
...@@ -109,6 +109,30 @@ ...@@ -109,6 +109,30 @@
<a-select-option :value="0">儿童</a-select-option> <a-select-option :value="0">儿童</a-select-option>
<a-select-option :value="-1">未知</a-select-option> <a-select-option :value="-1">未知</a-select-option>
</a-select> </a-select>
</a-form-item> -->
<a-form-item label="年龄类型：" style="padding: 5px 0">
<a-select v-model:value="queryForm.childAdult"
mode="multiple"
:maxTagCount="1"
style="width: 240px">
<a-select-option
v-for="item in childAdultAgeOptions"
:key="item.value"
:value="item.value"
>{{item.label}}</a-select-option>
</a-select>
</a-form-item>
<a-form-item label="性别：" style="padding: 5px 0">
<a-select v-model:value="queryForm.gender"
mode="multiple"
:maxTagCount="1"
style="width: 240px">
<a-select-option
v-for="item in genderOptions"
:key="item.value"
:value="item.value"
>{{item.label}}</a-select-option>
</a-select>
</a-form-item> </a-form-item>
<a-form-item label="接待类型：" style="padding: 5px 0"> <a-form-item label="接待类型：" style="padding: 5px 0">
<a-select v-model:value="queryForm.receptionType" style="width: 240px"> <a-select v-model:value="queryForm.receptionType" style="width: 240px">
...@@ -229,7 +253,7 @@ ...@@ -229,7 +253,7 @@
<el-image v-if="person.imageDisplayType" :src="item.eventPic" :fit="'fill'" class="single-image"></el-image> <el-image v-if="person.imageDisplayType" :src="item.eventPic" :fit="'fill'" class="single-image"></el-image>
<el-image v-else :src="item.picture_url" :fit="'fill'" class="single-image"></el-image> <el-image v-else :src="item.picture_url" :fit="'fill'" class="single-image"></el-image>
<div>时间:{{ item.counttime }}</div> <div>时间:{{ item.counttime }}</div>
<div>人员类型:{{ personTypeStr(item.person_type)}}({{ item.childAdult==1?'成人':(item.childAdult==0?'儿童':'未知') }})</div> <div>人员类型:{{ personTypeStr(item.person_type)}}({{ formatChildAdult(item.childAdult) }})</div>
<div>性别:{{ formatGender(item.gender) }}({{item.age}})</div> <div>性别:{{ formatGender(item.gender) }}({{item.age}})</div>
<div class="direction" :class="'direction'+item.direction">方向:{{ formatDirection(item.direction) }}</div> <div class="direction" :class="'direction'+item.direction">方向:{{ formatDirection(item.direction) }}</div>
<div>地点:{{ item.gate_name }}</div> <div>地点:{{ item.gate_name }}</div>
...@@ -345,6 +369,7 @@ export default { ...@@ -345,6 +369,7 @@ export default {
personUnid:'', personUnid:'',
maxPic: 1000, maxPic: 1000,
childAdult:[], childAdult:[],
gender:[],
receptionType:'', receptionType:'',
sortType:'', sortType:'',
} }
...@@ -360,6 +385,7 @@ export default { ...@@ -360,6 +385,7 @@ export default {
queryForm.positionId = searchCondition.value.positionId; queryForm.positionId = searchCondition.value.positionId;
queryForm.direction = searchCondition.value.direction; queryForm.direction = searchCondition.value.direction;
queryForm.childAdult = searchCondition.value.childAdult; queryForm.childAdult = searchCondition.value.childAdult;
queryForm.gender = searchCondition.value.gender;
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;
...@@ -617,6 +643,7 @@ export default { ...@@ -617,6 +643,7 @@ export default {
page: pageNum.value - 1, page: pageNum.value - 1,
pageSize: pageSize.value, pageSize: pageSize.value,
childAdult: rawData.childAdult?rawData.childAdult.toString():'', childAdult: rawData.childAdult?rawData.childAdult.toString():'',
gender: rawData.gender?rawData.gender.toString():'',
receptionType: rawData.receptionType?rawData.receptionType:0, receptionType: rawData.receptionType?rawData.receptionType:0,
sortType: rawData.sortType?rawData.sortType:0, sortType: rawData.sortType?rawData.sortType:0,
} }
...@@ -634,6 +661,7 @@ export default { ...@@ -634,6 +661,7 @@ export default {
picType: rawData.picType, picType: rawData.picType,
personType: rawData.personType, personType: rawData.personType,
childAdult: rawData.childAdult, childAdult: rawData.childAdult,
gender: rawData.gender,
personUnid: rawData.personUnid, personUnid: rawData.personUnid,
date: rawData.date, date: rawData.date,
minPic: rawData.minPic, minPic: rawData.minPic,
...@@ -682,6 +710,30 @@ export default { ...@@ -682,6 +710,30 @@ export default {
const personTypeStr = function(val){ const personTypeStr = function(val){
return (personTypeList.value.filter(v => v.value == val)[0] || {label:'--'}).label return (personTypeList.value.filter(v => v.value == val)[0] || {label:'--'}).label
} }
const childAdultAgeOptions = ref([
{ value: 0, label: '婴儿' },
{ value: 1, label: '儿童' },
{ value: 2, label: '少年' },
{ value: 3, label: '青年' },
{ value: 4, label: '中年' },
{ value: 5, label: '老年' },
{ value: -1, label: '未知' },
])
const childAdultOptions = ref([
{ value: 0, label: '儿童' },
{ value: 1, label: '成人' },
{ value: -1, label: '未知' },
])
const genderOptions = ref([
{ value: 0, label: '女性' },
{ value: 1, label: '男性' },
{ value: -1, label: '未知' },
])
const formatChildAdult = function(val) {
const targetitem = childAdultOptions.value.find(item => item.value === val)
if (targetitem) return targetitem.label
else return '未知'
}
const formatGender = function(number){ const formatGender = function(number){
switch (number) switch (number)
{ {
...@@ -1190,7 +1242,7 @@ export default { ...@@ -1190,7 +1242,7 @@ export default {
const contentHeight = ref(0) const contentHeight = ref(0)
const __main = function() { const __main = function() {
getAccountList() getAccountList()
contentHeight.value = window.innerHeight - 320 contentHeight.value = window.innerHeight - 360
} }
__main() __main()
...@@ -1267,6 +1319,10 @@ export default { ...@@ -1267,6 +1319,10 @@ export default {
mutipleOperationText, mutipleOperationText,
deleteRealPersonRecord, deleteRealPersonRecord,
addShopkeeper, addShopkeeper,
childAdultAgeOptions,
childAdultOptions,
formatChildAdult,
genderOptions,
} }
} }
} }
......
src/views/SnapshotCluster/SnapshotRecord/SnapshotRecord.vue
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
style="width: 280px"> style="width: 280px">
</a-select> </a-select>
</a-form-item> </a-form-item>
<a-form-item label="年龄类型：" style="padding: 5px 0"> <!-- <a-form-item label="年龄类型：" style="padding: 5px 0">
<a-select v-model:value="queryForm.childAdult" <a-select v-model:value="queryForm.childAdult"
mode="multiple" mode="multiple"
:maxTagCount="1" :maxTagCount="1"
...@@ -107,6 +107,30 @@ ...@@ -107,6 +107,30 @@
<a-select-option :value="0">儿童</a-select-option> <a-select-option :value="0">儿童</a-select-option>
<a-select-option :value="-1">未知</a-select-option> <a-select-option :value="-1">未知</a-select-option>
</a-select> </a-select>
</a-form-item> -->
<a-form-item label="年龄类型：" style="padding: 5px 0">
<a-select v-model:value="queryForm.childAdult"
mode="multiple"
:maxTagCount="1"
style="width: 240px">
<a-select-option
v-for="item in childAdultAgeOptions"
:key="item.value"
:value="item.value"
>{{item.label}}</a-select-option>
</a-select>
</a-form-item>
<a-form-item label="性别：" style="padding: 5px 0">
<a-select v-model:value="queryForm.gender"
mode="multiple"
:maxTagCount="1"
style="width: 240px">
<a-select-option
v-for="item in genderOptions"
:key="item.value"
:value="item.value"
>{{item.label}}</a-select-option>
</a-select>
</a-form-item> </a-form-item>
<a-form-item label="选择日期：" style="padding: 5px 0"> <a-form-item label="选择日期：" style="padding: 5px 0">
<a-date-picker v-model:value="queryForm.date" :format="'YYYY-MM-DD'" :allowClear="false" style="width: 280px"/> <a-date-picker v-model:value="queryForm.date" :format="'YYYY-MM-DD'" :allowClear="false" style="width: 280px"/>
...@@ -164,7 +188,7 @@ ...@@ -164,7 +188,7 @@
</el-image> </el-image>
<div @click="personUnidClick(item.person_unid)">人id: {{ item.person_unid }}</div> <div @click="personUnidClick(item.person_unid)">人id: {{ item.person_unid }}</div>
<div>时间:{{ item.counttime }}</div> <div>时间:{{ item.counttime }}</div>
<div>人员类型:{{ personTypeStr(item.person_type)}}({{ item.childAdult==1?'成人':(item.childAdult==0?'儿童':'未知') }})</div> <div>人员类型:{{ personTypeStr(item.person_type)}}({{ formatChildAdult(item.childAdult) }})</div>
<div> <div>
<span>性别:{{ formatGender(item.gender) }}({{item.age}})</span> <span>性别:{{ formatGender(item.gender) }}({{item.age}})</span>
<a-popover v-if="item.personLabel" trigger="click"> <a-popover v-if="item.personLabel" trigger="click">
...@@ -288,6 +312,7 @@ export default { ...@@ -288,6 +312,7 @@ export default {
startTime: '00:00:00', startTime: '00:00:00',
endTime: '23:59:59', endTime: '23:59:59',
childAdult:[], childAdult:[],
gender:[],
} }
) )
const searchCondition = ref({}) const searchCondition = ref({})
...@@ -301,6 +326,7 @@ export default { ...@@ -301,6 +326,7 @@ export default {
queryForm.positionId = searchCondition.value.positionId; queryForm.positionId = searchCondition.value.positionId;
queryForm.direction = searchCondition.value.direction; queryForm.direction = searchCondition.value.direction;
queryForm.childAdult = searchCondition.value.childAdult; queryForm.childAdult = searchCondition.value.childAdult;
queryForm.gender = searchCondition.value.gender;
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;
...@@ -560,6 +586,7 @@ export default { ...@@ -560,6 +586,7 @@ export default {
page: pageNum.value - 1, page: pageNum.value - 1,
pageSize: pageSize.value, pageSize: pageSize.value,
childAdult: rawData.childAdult?rawData.childAdult.toString():'', childAdult: rawData.childAdult?rawData.childAdult.toString():'',
gender: rawData.gender?rawData.gender.toString():'',
} }
) )
const storageData = filterEmptyValueInObject( const storageData = filterEmptyValueInObject(
...@@ -575,6 +602,7 @@ export default { ...@@ -575,6 +602,7 @@ export default {
picType: rawData.picType, picType: rawData.picType,
personType: rawData.personType, personType: rawData.personType,
childAdult: rawData.childAdult, childAdult: rawData.childAdult,
gender: rawData.gender,
date: rawData.date, date: rawData.date,
startTime:rawData.startTime, startTime:rawData.startTime,
endTime:rawData.endTime, endTime:rawData.endTime,
...@@ -620,6 +648,30 @@ export default { ...@@ -620,6 +648,30 @@ export default {
const formatPosition = function(val) { const formatPosition = function(val) {
return (positionList.value.filter(v => v.value == val)[0] || {label:'--'}).label return (positionList.value.filter(v => v.value == val)[0] || {label:'--'}).label
} }
const childAdultAgeOptions = ref([
{ value: 0, label: '婴儿' },
{ value: 1, label: '儿童' },
{ value: 2, label: '少年' },
{ value: 3, label: '青年' },
{ value: 4, label: '中年' },
{ value: 5, label: '老年' },
{ value: -1, label: '未知' },
])
const childAdultOptions = ref([
{ value: 0, label: '儿童' },
{ value: 1, label: '成人' },
{ value: -1, label: '未知' },
])
const genderOptions = ref([
{ value: 0, label: '女性' },
{ value: 1, label: '男性' },
{ value: -1, label: '未知' },
])
const formatChildAdult = function(val) {
const targetitem = childAdultOptions.value.find(item => item.value === val)
if (targetitem) return targetitem.label
else return '未知'
}
const formatGender = function(number){ const formatGender = function(number){
switch (number) switch (number)
{ {
...@@ -1464,7 +1516,11 @@ export default { ...@@ -1464,7 +1516,11 @@ export default {
rucksackTypeStr, rucksackTypeStr,
handbagTypeStr, handbagTypeStr,
shoeTypeStr, shoeTypeStr,
shoppingBagTypeStr shoppingBagTypeStr,
childAdultAgeOptions,
childAdultOptions,
formatChildAdult,
genderOptions,
} }
} }
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!