|
|
|
|
@ -104,8 +104,16 @@ export default { |
|
|
|
|
{ |
|
|
|
|
label: '占用时间', |
|
|
|
|
prop: 'updateTime', |
|
|
|
|
search: false, |
|
|
|
|
sortable: true, |
|
|
|
|
span: 12, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: '占用时间', |
|
|
|
|
prop: 'timeFrame', |
|
|
|
|
search: true, |
|
|
|
|
sortable: true, |
|
|
|
|
hide:true, |
|
|
|
|
span: 12, |
|
|
|
|
type: 'date', |
|
|
|
|
format: 'YYYY-MM-DD', |
|
|
|
|
@ -252,9 +260,9 @@ export default { |
|
|
|
|
|
|
|
|
|
onLoad(page, params = {}) { |
|
|
|
|
this.loading = true; |
|
|
|
|
if (this.query.updateTime && this.query.updateTime.length > 0) { |
|
|
|
|
this.query.startTime = this.query.updateTime[0]+' 00:00:00'; |
|
|
|
|
this.query.endTime = this.query.updateTime[1]+' 00:00:00'; |
|
|
|
|
if (this.query.timeFrame && this.query.timeFrame.length > 0) { |
|
|
|
|
this.query.startTime = this.query.timeFrame[0]+' 00:00:00'; |
|
|
|
|
this.query.endTime = this.query.timeFrame[1]+' 00:00:00'; |
|
|
|
|
} |
|
|
|
|
getLocationLis(page.currentPage, page.pageSize, Object.assign(params, this.query)).then( |
|
|
|
|
res => { |
|
|
|
|
|