Skip to content

罗鑫霖 / vion-tools

Go to a project
Commit b5ad41ab by 李金轩
Options

修改

1 parent 25d81ad1
Inline Side-by-side
Showing 3 changed files with 182 additions and 81 deletions
static/index.html
...@@ -1065,12 +1065,6 @@ ...@@ -1065,12 +1065,6 @@
</el-menu> </el-menu>
<div v-if="currentIndex6 === '1'"> <div v-if="currentIndex6 === '1'">
<el-form :inline="true" size="small"> <el-form :inline="true" size="small">
<!-- <el-form-item label="平台：">-->
<!-- <el-select>-->
<!-- <el-option :label="'Store'" :value="'Store'"></el-option>-->
<!-- <el-option :label="'Mall'" :value="'Store'"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="集团："> <el-form-item label="集团：">
<el-select <el-select
v-model="account_id" v-model="account_id"
...@@ -1078,7 +1072,6 @@ ...@@ -1078,7 +1072,6 @@
multiple multiple
collapse-tags collapse-tags
:clearable="false" :clearable="false"
placeholder="请选择集团"
class="query-select mall-sel-box" class="query-select mall-sel-box"
@change="onAccount_idChange" @change="onAccount_idChange"
> >
...@@ -1095,15 +1088,6 @@ ...@@ -1095,15 +1088,6 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="出入类型：">
<el-select v-model="type6"
@change="onTypeChange">
<el-option :label="'广场出入口'" :value="1"></el-option>
<el-option :label="'楼层出入口'" :value="2"></el-option>
<el-option :label="'店铺出入口'" :value="3"></el-option>
<el-option :label="'其他'" :value="4"></el-option>
</el-select>
</el-form-item>
<el-form-item label="广场："> <el-form-item label="广场：">
<el-select <el-select
v-model="plaza_id" v-model="plaza_id"
...@@ -1128,7 +1112,17 @@ ...@@ -1128,7 +1112,17 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="区域信息："> <el-form-item label="出入类型：">
<el-select v-model="type6"
@change="onTypeChange">
<el-option :label="'全场'" :value="0"></el-option>
<el-option :label="'广场出入口'" :value="1"></el-option>
<el-option :label="'楼层出入口'" :value="2"></el-option>
<el-option :label="'店铺出入口'" :value="3"></el-option>
<el-option :label="'其他'" :value="4"></el-option>
</el-select>
</el-form-item>
<el-form-item label="区域信息：" v-if="[0, 3].includes(type6)">
<el-select <el-select
v-model="zone_id" v-model="zone_id"
filterable filterable
...@@ -1151,11 +1145,12 @@ ...@@ -1151,11 +1145,12 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="出入口信息："> <el-form-item label="监控点：">
<el-select <el-select
v-model="gate_id" v-model="gate_id"
filterable multiple
clearable collapse-tags
class="query-select mall-sel-box"
> >
<el-option <el-option
v-for="(item, index) in gate_idList" v-for="(item, index) in gate_idList"
...@@ -1163,14 +1158,38 @@ ...@@ -1163,14 +1158,38 @@
:label="item.name" :label="item.name"
:value="item.id" :value="item.id"
> >
<span class="custom-checkbox__input">
<span class="custom-checkbox__inner"></span>
</span>
<span style="padding-left: 5px;">{{ item.name }}</span>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="方向："> <el-form-item label="方向：">
<el-select v-model="direction6"> <el-select v-model="direction6"
<el-option :label="'进'" :value="1"></el-option> filterable
<el-option :label="'出'" :value="0"></el-option> multiple
<el-option :label="'横穿'" :value="2"></el-option> collapse-tags
:clearable="false"
class="query-select mall-sel-box">
<el-option :label="'进'" :value="1">
<span class="custom-checkbox__input">
<span class="custom-checkbox__inner"></span>
</span>
<span style="padding-left: 5px;">进</span>
</el-option>
<el-option :label="'出'" :value="0">
<span class="custom-checkbox__input">
<span class="custom-checkbox__inner"></span>
</span>
<span style="padding-left: 5px;">出</span>
</el-option>
<el-option :label="'横穿'" :value="2">
<span class="custom-checkbox__input">
<span class="custom-checkbox__inner"></span>
</span>
<span style="padding-left: 5px;">横穿</span>
</el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="抓拍类型："> <el-form-item label="抓拍类型：">
...@@ -1180,21 +1199,47 @@ ...@@ -1180,21 +1199,47 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="人员类型："> <el-form-item label="人员类型：">
<el-select v-model="personType6"> <el-select v-model="personType6"
<el-option :label="'店员'" :value="1"></el-option> multiple
<el-option :label="'顾客'" :value="0"></el-option> collapse-tags
class="query-select mall-sel-box"
>
<el-option :label="'店员'" :value="1">
<span class="custom-checkbox__input">
<span class="custom-checkbox__inner"></span>
</span>
<span style="padding-left: 5px;">店员</span>
</el-option>
<el-option :label="'顾客'" :value="0">
<span class="custom-checkbox__input">
<span class="custom-checkbox__inner"></span>
</span>
<span style="padding-left: 5px;">顾客</span>
</el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="选择日期："> <el-form-item label="选择日期：">
<el-date-picker v-model="time6" type="datetimerange" range-separator="至"> <el-date-picker v-model="time6_1" type="date" placeholder="选择日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="选择时间：">
<el-time-picker
is-range
v-model="time6_2"
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
placeholder="选择时间范围"
>
</el-time-picker>
</el-form-item>
<el-form-item> <el-form-item>
<el-button @click="confirmSearch" type="primary">搜索</el-button> <el-button @click="confirmSearch" type="primary">搜索</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div v-loading="isLoading1">
<el-row v-for="row in pagedTableDataList1"> <el-row v-for="row in pagedTableDataList1">
<el-col :span="3" v-for="item in row"> <el-col :span="3" v-for="item in row">
<div style="margin: 0 5px"> <div style="margin: 0 5px">
...@@ -1218,14 +1263,9 @@ ...@@ -1218,14 +1263,9 @@
> >
</el-pagination> </el-pagination>
</div> </div>
</div>
<div v-if="currentIndex6 === '2'"> <div v-if="currentIndex6 === '2'">
<el-form :inline="true" size="small"> <el-form :inline="true" size="small">
<!-- <el-form-item label="平台：">-->
<!-- <el-select>-->
<!-- <el-option :label="'Store'" :value="'Store'"></el-option>-->
<!-- <el-option :label="'Mall'" :value="'Store'"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="集团："> <el-form-item label="集团：">
<el-select <el-select
v-model="account_id" v-model="account_id"
...@@ -1233,7 +1273,6 @@ ...@@ -1233,7 +1273,6 @@
multiple multiple
collapse-tags collapse-tags
:clearable="false" :clearable="false"
placeholder="请选择集团"
class="query-select mall-sel-box" class="query-select mall-sel-box"
@change="onAccount_idChange" @change="onAccount_idChange"
> >
...@@ -1250,21 +1289,6 @@ ...@@ -1250,21 +1289,6 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item label="广场：">-->
<!-- <el-select>-->
<!-- <el-option :label="'Store'"></el-option>-->
<!-- <el-option :label="'Mall'"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="出入类型：">
<el-select v-model="type6"
@change="onTypeChange">
<el-option :label="'广场出入口'" :value="1"></el-option>
<el-option :label="'楼层出入口'" :value="2"></el-option>
<el-option :label="'店铺出入口'" :value="3"></el-option>
<el-option :label="'其他'" :value="4"></el-option>
</el-select>
</el-form-item>
<el-form-item label="广场："> <el-form-item label="广场：">
<el-select <el-select
v-model="plaza_id" v-model="plaza_id"
...@@ -1289,7 +1313,17 @@ ...@@ -1289,7 +1313,17 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="区域信息："> <el-form-item label="出入类型：">
<el-select v-model="type6"
@change="onTypeChange">
<el-option :label="'全场'" :value="0"></el-option>
<el-option :label="'广场出入口'" :value="1"></el-option>
<el-option :label="'楼层出入口'" :value="2"></el-option>
<el-option :label="'店铺出入口'" :value="3"></el-option>
<el-option :label="'其他'" :value="4"></el-option>
</el-select>
</el-form-item>
<el-form-item label="区域信息：" v-if="[0, 3].includes(type6)">
<el-select <el-select
v-model="zone_id" v-model="zone_id"
filterable filterable
...@@ -1312,11 +1346,12 @@ ...@@ -1312,11 +1346,12 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="出入口信息："> <el-form-item label="监控点：">
<el-select <el-select
v-model="gate_id" v-model="gate_id"
filterable multiple
clearable collapse-tags
class="query-select mall-sel-box"
> >
<el-option <el-option
v-for="(item, index) in gate_idList" v-for="(item, index) in gate_idList"
...@@ -1324,14 +1359,38 @@ ...@@ -1324,14 +1359,38 @@
:label="item.name" :label="item.name"
:value="item.id" :value="item.id"
> >
<span class="custom-checkbox__input">
<span class="custom-checkbox__inner"></span>
</span>
<span style="padding-left: 5px;">{{ item.name }}</span>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="方向："> <el-form-item label="方向：">
<el-select v-model="direction6"> <el-select v-model="direction6"
<el-option :label="'进'" :value="1"></el-option> filterable
<el-option :label="'出'" :value="0"></el-option> multiple
<el-option :label="'横穿'" :value="2"></el-option> collapse-tags
:clearable="false"
class="query-select mall-sel-box">
<el-option :label="'出'" :value="0">
<span class="custom-checkbox__input">
<span class="custom-checkbox__inner"></span>
</span>
<span style="padding-left: 5px;">出</span>
</el-option>
<el-option :label="'进'" :value="1">
<span class="custom-checkbox__input">
<span class="custom-checkbox__inner"></span>
</span>
<span style="padding-left: 5px;">进</span>
</el-option>
<el-option :label="'横穿'" :value="2">
<span class="custom-checkbox__input">
<span class="custom-checkbox__inner"></span>
</span>
<span style="padding-left: 5px;">横穿</span>
</el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="抓拍类型："> <el-form-item label="抓拍类型：">
...@@ -1341,15 +1400,40 @@ ...@@ -1341,15 +1400,40 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="人员类型："> <el-form-item label="人员类型：">
<el-select v-model="personType6"> <el-select v-model="personType6"
<el-option :label="'店员'" :value="1"></el-option> multiple
<el-option :label="'顾客'" :value="0"></el-option> collapse-tags
class="query-select mall-sel-box"
>
<el-option :label="'店员'" :value="1">
<span class="custom-checkbox__input">
<span class="custom-checkbox__inner"></span>
</span>
<span style="padding-left: 5px;">店员</span>
</el-option>
<el-option :label="'顾客'" :value="0">
<span class="custom-checkbox__input">
<span class="custom-checkbox__inner"></span>
</span>
<span style="padding-left: 5px;">顾客</span>
</el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="选择日期："> <el-form-item label="选择日期：">
<el-date-picker v-model="time6" type="datetimerange" range-separator="至"> <el-date-picker v-model="time6_1" type="date" placeholder="选择日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="选择时间：">
<el-time-picker
is-range
v-model="time6_2"
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
placeholder="选择时间范围"
>
</el-time-picker>
</el-form-item>
<el-form-item label="图片数量："> <el-form-item label="图片数量：">
<el-row> <el-row>
<el-col :span="10"> <el-col :span="10">
...@@ -1369,6 +1453,7 @@ ...@@ -1369,6 +1453,7 @@
</el-form> </el-form>
<div v-loading="isLoading2">
<div v-for="person in dataList2" style="margin: 10px 0;border: solid 1px black"> <div v-for="person in dataList2" style="margin: 10px 0;border: solid 1px black">
人id:{{ ' ' + person.person_unid }} 人id:{{ ' ' + person.person_unid }}
图片数量:{{ person.perrsonList.length }} 图片数量:{{ person.perrsonList.length }}
...@@ -1397,6 +1482,7 @@ ...@@ -1397,6 +1482,7 @@
</el-pagination> </el-pagination>
</div> </div>
</div> </div>
</div>
<!-- <div class="clear-select"> <!-- <div class="clear-select">
<el-button size="small" round @click="clearDiv()">清空Div</el-button> <el-button size="small" round @click="clearDiv()">清空Div</el-button>
</div> --> </div> -->
......
static/js/home.js
...@@ -19,13 +19,14 @@ new Vue({ ...@@ -19,13 +19,14 @@ new Vue({
data: function() { data: function() {
return { return {
currentIndex6: '1', currentIndex6: '1',
type6: 1, type6: 0,
direction6: 1, direction6: [0, 1, 2],
picType6: 1, picType6: 2,
personType6: 1, personType6: [0, 1],
time6: [new Date(), new Date()], time6_1: new Date(),
time6_2: [new Date(new Date(new Date().toLocaleDateString()).getTime()), new Date(new Date(new Date().toLocaleDateString()).getTime() + 24 * 60 * 60 * 1000 - 1)],
minPic: 0, minPic: 0,
maxPic: 10, maxPic: 100,
pageNum1: 1, pageNum1: 1,
pageSize1: 24, pageSize1: 24,
total1: 0, total1: 0,
...@@ -96,6 +97,8 @@ new Vue({ ...@@ -96,6 +97,8 @@ new Vue({
endRange: "1.2", endRange: "1.2",
isMallSelAll: false, isMallSelAll: false,
isAccoutSelAll: false, isAccoutSelAll: false,
isLoading1: false,
isLoading2: false,
//全选 //全选
checkedTraffic: [], checkedTraffic: [],
checkAllTraffic: false, checkAllTraffic: false,
...@@ -445,29 +448,34 @@ new Vue({ ...@@ -445,29 +448,34 @@ new Vue({
plaza_id: this.plaza_id.toString(), plaza_id: this.plaza_id.toString(),
zone_id: this.zone_id.toString(), zone_id: this.zone_id.toString(),
// zone_id: 48, // zone_id: 48,
gate_id: this.gate_id, gate_id: this.gate_id.toString(),
// gate_id: 268, // gate_id: 268,
direction: this.direction6, direction: this.direction6.toString(),
picType: this.picType6, picType: this.picType6,
personType: this.personType6, personType: this.personType6.toString(),
// personType: 0, // personType: 0,
startTime: formatDate(this.time6[0]), startTime: formatDate(this.time6_1, this.time6_2[0]),
endTime: formatDate(this.time6[1]), endTime: formatDate(this.time6_1, this.time6_2[2]),
page: this.pageNum1 - 1, page: this.pageNum1 - 1,
pageSize: this.pageSize1, pageSize: this.pageSize1,
} }
) )
this.isLoading1 = true
get( get(
window._CONF_.apiUrl2 + '/faceRecognitions/faceRecord', window._CONF_.apiUrl2 + '/faceRecognitions/faceRecord',
data data
).then( ).then(
(r) => { (r) => {
this.isLoading1 = false
this.dataList1 = r.data.persons this.dataList1 = r.data.persons
this.total1 = r.data.pageNum this.total1 = r.data.pageNum
} }
).catch(
e => {
this.isLoading1 = false
}
) )
}, },
confirmSearch2: function() { confirmSearch2: function() {
const data = filterEmptyValueInObject( const data = filterEmptyValueInObject(
...@@ -480,14 +488,15 @@ new Vue({ ...@@ -480,14 +488,15 @@ new Vue({
plaza_id: this.plaza_id.toString(), plaza_id: this.plaza_id.toString(),
zone_id: this.zone_id.toString(), zone_id: this.zone_id.toString(),
// zone_id: 48, // zone_id: 48,
gate_id: this.gate_id, gate_id: this.gate_id.toString(),
// gate_id: 268, // gate_id: 268,
direction: this.direction6, direction: this.direction6.toString(),
picType: this.picType6, picType: this.picType6,
personType: this.personType6, personType: this.personType6.toString(),
// personType: 0, // personType: 0,
startTime: formatDate(this.time6[0]),
endTime: formatDate(this.time6[1]), startTime: formatDate(this.time6_1, this.time6_2[0]),
endTime: formatDate(this.time6_1, this.time6_2[2]),
page: this.pageNum2 - 1, page: this.pageNum2 - 1,
pageSize: this.pageSize2, pageSize: this.pageSize2,
minPic: this.minPic, minPic: this.minPic,
...@@ -495,14 +504,20 @@ new Vue({ ...@@ -495,14 +504,20 @@ new Vue({
} }
) )
this.isLoading2 = true
get( get(
window._CONF_.apiUrl2 + '/faceRecognitions/faceRecordGroup', window._CONF_.apiUrl2 + '/faceRecognitions/faceRecordGroup',
data data
).then( ).then(
(r) => { (r) => {
this.isLoading2 = false
this.dataList2 = r.data.persons this.dataList2 = r.data.persons
this.total2 = r.data.pageNum this.total2 = r.data.pageNum
} }
).catch(
e => {
this.isLoading2 = false
}
) )
}, },
......
static/js/utility.js
const formatDate = function(date) { const formatDate = function(date1, data2) {
return moment(date).format("YYYY-MM-DD HH:mm:ss") return moment(date1).format("YYYY-MM-DD") + ' ' + moment(data2).format("HH:mm:ss")
} }
const getPagedList = function(list, columnNum) { const getPagedList = function(list, columnNum) {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!