diff --git a/src/api/counter.js b/src/api/counter.js index 0a9c0fc..8007737 100644 --- a/src/api/counter.js +++ b/src/api/counter.js @@ -53,3 +53,13 @@ export function fetchLogStatisticHistory(query) { params: query }) } + +// device temp log statistic api + +export function fetchDeviceTempLog(query) { + return request({ + url: '/api/mosq/temp/', + method: 'get', + params: query + }) +} diff --git a/src/views/counter/components/chart.vue b/src/views/counter/components/chart.vue index 40c3480..d594fec 100644 --- a/src/views/counter/components/chart.vue +++ b/src/views/counter/components/chart.vue @@ -94,7 +94,6 @@ export default { }, showChart(val) { if (val) { - console.log(val) this.chart.resize() } }, @@ -166,7 +165,6 @@ export default { }, initChart() { this.chart = echarts.init(this.$el, 'macarons') - console.log(this.chartData) // this.setOptions(this.chartData) } } diff --git a/src/views/counter/components/humiture.vue b/src/views/counter/components/humiture.vue index 4230f1b..26a5068 100644 --- a/src/views/counter/components/humiture.vue +++ b/src/views/counter/components/humiture.vue @@ -25,7 +25,7 @@ export default { type: Boolean, default: true }, - chartData: { + HumitureData: { type: Object }, showHumiture: { @@ -86,7 +86,7 @@ export default { this.chart = null }, watch: { - chartData: { + HumitureData: { deep: true, handler(val) { this.setOptions(val) @@ -94,7 +94,6 @@ export default { }, showHumiture(val) { if (val) { - console.log(val) this.chart.resize() } }, @@ -102,10 +101,10 @@ export default { this.screenWidth = val if (val <= 400) { this.rotate = 30 - this.setOptions(this.chartData) + this.setOptions(this.HumitureData) } else { this.rotate = 0 - this.setOptions(this.chartData) + this.setOptions(this.HumitureData) } } }, @@ -166,8 +165,8 @@ export default { }, initChart() { this.chart = echarts.init(this.$el, 'macarons') - console.log(this.chartData) - // this.setOptions(this.chartData) + console.log(this.HumitureData) + // this.setOptions(this.HumitureData) } } } diff --git a/src/views/counter/detail.vue b/src/views/counter/detail.vue index ff32eec..24477c3 100644 --- a/src/views/counter/detail.vue +++ b/src/views/counter/detail.vue @@ -23,7 +23,7 @@ @@ -67,7 +67,7 @@