diff --git a/src/api/iot/staistics.js b/src/api/iot/staistics.js index 75222dae..16e9e2d3 100644 --- a/src/api/iot/staistics.js +++ b/src/api/iot/staistics.js @@ -7,3 +7,19 @@ export function projectEnergy(query) { params: query }) } + +export function monthOnMonthEnergy(query) { + return request({ + url: '/iot/stat/monthOnMonthEnergy', + method: 'get', + params: query + }) +} + +export function monthOnCircleEnergy(query) { + return request({ + url: '/iot/stat/monthOnCircleEnergy', + method: 'get', + params: query + }) +} diff --git a/src/components/Echarts/EEchartsBar.vue b/src/components/Echarts/EEchartsBar.vue index 12d7b6a5..ca08c406 100644 --- a/src/components/Echarts/EEchartsBar.vue +++ b/src/components/Echarts/EEchartsBar.vue @@ -32,7 +32,9 @@ export default { this.chart = null; }, mounted() { - this.drawBar(); + window.addEventListener("resize", () => { + this.updateEchart(); + }); }, methods: { updateEchart() { diff --git a/src/components/RightToolbar/index.vue b/src/components/RightToolbar/index.vue index 92c65a53..4c7fbcb3 100644 --- a/src/components/RightToolbar/index.vue +++ b/src/components/RightToolbar/index.vue @@ -11,19 +11,23 @@ - + - + + diff --git a/src/views/iot/statistics/compared/index.vue b/src/views/iot/statistics/compared/index.vue index 9ebd2f5a..d8a25e2b 100644 --- a/src/views/iot/statistics/compared/index.vue +++ b/src/views/iot/statistics/compared/index.vue @@ -22,7 +22,7 @@ - + @@ -30,79 +30,37 @@ 搜索 - 重置 + > --> -
- -
- -
- - - - - - - - - - - - - - - - - -
+ + + + + + diff --git a/src/views/iot/statistics/energy/index.vue b/src/views/iot/statistics/energy/index.vue index 5ba4e0ea..fd89111b 100644 --- a/src/views/iot/statistics/energy/index.vue +++ b/src/views/iot/statistics/energy/index.vue @@ -60,12 +60,12 @@ diff --git a/src/views/iot/video/camera/index.vue b/src/views/iot/video/camera/index.vue index 498efc7a..b4c28ed7 100644 --- a/src/views/iot/video/camera/index.vue +++ b/src/views/iot/video/camera/index.vue @@ -198,15 +198,13 @@ /> - - + @@ -402,23 +400,22 @@ -