Merge branch 'V1.5.24_feature' into develop

b04700eb · 李智书 · db62da43 · 665ff19e · b04700eb
Commit b04700eb authored Dec 28, 2021 by 李智书
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

src/pages/ConsumptionReport/ConsumptionReport.vue src/pages/ConsumptionReport/ConsumptionReport.vue +1 -0

No files found.
--- a/src/pages/ConsumptionReport/ConsumptionReport.vue
+++ b/src/pages/ConsumptionReport/ConsumptionReport.vue
@@ -763,6 +763,7 @@
 										})
 									}
 									console.warn(tmpData)
+									this_.dayConsumerTrend = res.obj
 									this_.dailyConsumptionData = tmpData
 									resolve()
 									return