# 更新日期筛选

This commit is contained in:
xianfuxing 2020-06-24 11:48:18 +08:00
parent 39e670743c
commit 11e9e5fec0
1 changed files with 21 additions and 14 deletions

View File

@ -79,7 +79,7 @@
<el-pagination background <el-pagination background
:current-page="1" :current-page="1"
:page-sizes="[10,20,30,50]" :page-sizes="[10,20,30,50]"
:page-size="20" :page-size="deviceHistoryListQuery.limit"
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next, jumper"
:total="logsTotal" @size-change="handleSizeChange" @current-change="handleCurrentChange" /> :total="logsTotal" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
</div> </div>
@ -112,7 +112,7 @@
<el-pagination background <el-pagination background
:current-page="1" :current-page="1"
:page-sizes="[10,20,30,50]" :page-sizes="[10,20,30,50]"
:page-size="deviceHistoryListQuery.limit" :page-size="deviceTempListQuery.limit"
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next, jumper"
:total="tempTotal" @size-change="handleTempSizeChange" @current-change="handleTempCurrentChange" /> :total="tempTotal" @size-change="handleTempSizeChange" @current-change="handleTempCurrentChange" />
</div> </div>
@ -159,6 +159,8 @@ export default {
device_id: undefined, device_id: undefined,
page: 1, page: 1,
limit: 20, limit: 20,
start: undefined,
end: undefined,
ordering: '-create_time' ordering: '-create_time'
}, },
deviceHistoryListQuery: { deviceHistoryListQuery: {
@ -211,13 +213,13 @@ export default {
this.listLoading = false this.listLoading = false
}) })
}, },
getDeviceLogsTableHistory(params) { // getDeviceLogsTableHistory(params) {
fetchDeviceLogsHistory(params).then(response => { // fetchDeviceLogsHistory(params).then(response => {
this.deviceLogs = response.data.results // this.deviceLogs = response.data.results
this.logsTotal = response.data.count // this.logsTotal = response.data.count
this.listLoading = false // this.listLoading = false
}) // })
}, // },
getDeviceTempLog(params) { getDeviceTempLog(params) {
fetchDeviceTempLog(params).then(response => { fetchDeviceTempLog(params).then(response => {
const dateList = [] const dateList = []
@ -230,6 +232,7 @@ export default {
} }
}) })
this.HumitureData.total.xAxis = dateList this.HumitureData.total.xAxis = dateList
this.tempTotal = response.data.count
this.tempLoading = false this.tempLoading = false
}) })
}, },
@ -268,11 +271,15 @@ export default {
const [start, end] = value const [start, end] = value
this.deviceHistoryListQuery.start = start this.deviceHistoryListQuery.start = start
this.deviceHistoryListQuery.end = end this.deviceHistoryListQuery.end = end
this.deviceTempListQuery.start = start
this.deviceTempListQuery.end = end
} }
}, },
handleFilter() { handleFilter() {
this.deviceHistoryListQuery.page = 1 this.deviceHistoryListQuery.page = 1
this.deviceTempListQuery.page = 1
this.getDeviceLogsHistory(this.deviceHistoryListQuery) this.getDeviceLogsHistory(this.deviceHistoryListQuery)
this.getDeviceTempTableLog(this.deviceTempListQuery)
}, },
handleCurrentChange(page) { handleCurrentChange(page) {
this.listLoading = true this.listLoading = true
@ -292,14 +299,14 @@ export default {
this.tempLoading = true this.tempLoading = true
this.deviceTempListQuery.page = page this.deviceTempListQuery.page = page
this.deviceTempListQuery.device_id = this.device_id this.deviceTempListQuery.device_id = this.device_id
this.getDeviceTempTableLog(this.deviceTempListQuery) this.getDeviceTempLog(this.deviceTempListQuery)
}, },
handleTempSizeChange(page) { handleTempSizeChange(val) {
this.tempLoading = true this.tempLoading = true
this.deviceTempListQuery.page = page this.deviceTempListQuery.limit = val
this.deviceTempListQuery.device_id = device_id this.deviceTempListQuery.device_id = device_id
const device_id = this.$store.getters.deviceID const device_id = this.$store.getters.deviceID
this.getDeviceTempTableLog(this.deviceTempListQuery) this.getDeviceTempLog(this.deviceTempListQuery)
}, },
handleTabClick(tab, event) { handleTabClick(tab, event) {
// console.log(tab, event) // console.log(tab, event)
@ -320,7 +327,7 @@ export default {
this.deviceHistoryListQuery.device_id = this.device_id this.deviceHistoryListQuery.device_id = this.device_id
this.deviceTempListQuery.device_id = this.device_id this.deviceTempListQuery.device_id = this.device_id
this.getDevices({ device_id: this.device_id }) this.getDevices({ device_id: this.device_id })
this.getDeviceLogsTableHistory({ device_id: this.device_id, limit: 20 }) // this.getDeviceLogsTableHistory({ device_id: this.device_id, limit: 20 })
this.getDeviceTempLog({ device_id: this.device_id, last_day: 1, limit: 30 }) this.getDeviceTempLog({ device_id: this.device_id, last_day: 1, limit: 30 })
this.getDeviceTempTableLog(this.deviceTempListQuery) this.getDeviceTempTableLog(this.deviceTempListQuery)
} }