diff --git a/src/views/dataManage/deviceData/watchSevenDay.vue b/src/views/dataManage/deviceData/watchSevenDay.vue index 3060bee..cc79e85 100644 --- a/src/views/dataManage/deviceData/watchSevenDay.vue +++ b/src/views/dataManage/deviceData/watchSevenDay.vue @@ -27,7 +27,7 @@ - + @@ -80,7 +80,7 @@ metrics: ['total'], dimension: ['uptime'] }, - data:[] + data: [] } }, @@ -105,9 +105,12 @@ this.fetchData() // 传row }, fetchData() { - if(this.timeRange.length==2){ + if (this.timeRange.length === 2) { this.listQuery.beginTime = this.timeRange[0] this.listQuery.endTime = this.timeRange[1] + } else { + this.listQuery.beginTime = '' + this.listQuery.endTime = '' } sevenDayData(this.listQuery).then(response => { this.loading = true diff --git a/src/views/dataManage/deviceData/watchSevenDay.vue b/src/views/dataManage/deviceData/watchSevenDay.vue index 3060bee..cc79e85 100644 --- a/src/views/dataManage/deviceData/watchSevenDay.vue +++ b/src/views/dataManage/deviceData/watchSevenDay.vue @@ -27,7 +27,7 @@ - + @@ -80,7 +80,7 @@ metrics: ['total'], dimension: ['uptime'] }, - data:[] + data: [] } }, @@ -105,9 +105,12 @@ this.fetchData() // 传row }, fetchData() { - if(this.timeRange.length==2){ + if (this.timeRange.length === 2) { this.listQuery.beginTime = this.timeRange[0] this.listQuery.endTime = this.timeRange[1] + } else { + this.listQuery.beginTime = '' + this.listQuery.endTime = '' } sevenDayData(this.listQuery).then(response => { this.loading = true diff --git a/src/views/dataManage/deviceData/waterHistory.vue b/src/views/dataManage/deviceData/waterHistory.vue index 436978a..d8b75b2 100644 --- a/src/views/dataManage/deviceData/waterHistory.vue +++ b/src/views/dataManage/deviceData/waterHistory.vue @@ -18,9 +18,9 @@ - - - + + + @@ -44,7 +44,7 @@ beginTime: '', endTime: '' }, - data:[] + data: [] } }, @@ -70,9 +70,12 @@ }, fetchData() { this.loading1 = true - if(this.timeRange.length==2){ + if (this.timeRange.length == 2) { this.listQuery.beginTime = this.timeRange[0] this.listQuery.endTime = this.timeRange[1] + } else { + this.listQuery.beginTime = '' + this.listQuery.endTime = '' } totalData(this.listQuery).then(response => { this.data = response.data @@ -101,8 +104,7 @@ downloadElement.click() // 点击下载 document.body.removeChild(downloadElement) // 下载完成移除元素 window.URL.revokeObjectURL(href) // 释放blob对象 - }) - .catch((res) => { + }).catch((res) => { loading.close() }) }