Skip to content

罗鑫霖 / vion-tools

Go to a project
Commit b5ad41ab by 李金轩
Options

修改

1 parent 25d81ad1
Expand all
Inline Side-by-side
Showing 3 changed files with 34 additions and 19 deletions
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!