diff --git a/src/views/energy/report/businessEnergyConsumptionAnalysis/index.vue b/src/views/energy/report/businessEnergyConsumptionAnalysis/index.vue
index fdf5b40..5f4a12f 100644
--- a/src/views/energy/report/businessEnergyConsumptionAnalysis/index.vue
+++ b/src/views/energy/report/businessEnergyConsumptionAnalysis/index.vue
@@ -63,7 +63,7 @@
value-format="yyyy-MM-dd HH:mm:ss"
:placeholder="getDatePickerPlaceholder"
style="width: 240px"
- @change="handleQuery"
+ @change="handleEndTimeChange"
/>
@@ -418,9 +418,8 @@ export default {
const now = new Date();
const startTime = new Date(now.setHours(0, 0, 0, 0));
const endTime = new Date(now.setHours(23, 59, 59, 999));
-
this.queryParams.startTime = this.formatDateTime(startTime, this.queryParams.type);
- this.queryParams.endTime = this.formatDateTime(endTime, this.queryParams.type);
+ this.queryParams.endTime = this.getEndDateTime(endTime, this.queryParams.type);
},
initCharts() {
@@ -480,13 +479,21 @@ export default {
handleTimeRangeChange(type) {
const now = new Date();
const startTime = new Date(now.setHours(0, 0, 0, 0));
- const endTime = new Date(now.setHours(23, 59, 59, 999));
-
+ const endTime = new Date(now);
this.queryParams.startTime = this.formatDateTime(startTime, type);
this.queryParams.endTime = this.getEndDateTime(endTime, type);
this.handleQuery();
},
+ // 监听结束时间变化
+ handleEndTimeChange(time) {
+ if (time) {
+ const date = new Date(time);
+ this.queryParams.endTime = this.getEndDateTime(date, this.queryParams.type);
+ this.handleQuery();
+ }
+ },
+
//数组转树形结构
tranListToTreeData(list) {
// 最终要产出的树状数据的数组
diff --git a/src/views/energy/report/energyConsumptionTrendAnalysis/index.vue b/src/views/energy/report/energyConsumptionTrendAnalysis/index.vue
index 3b84324..b9ee684 100644
--- a/src/views/energy/report/energyConsumptionTrendAnalysis/index.vue
+++ b/src/views/energy/report/energyConsumptionTrendAnalysis/index.vue
@@ -63,7 +63,7 @@
value-format="yyyy-MM-dd HH:mm:ss"
:placeholder="getDatePickerPlaceholder"
style="width: 240px"
- @change="handleQuery"
+ @change="handleEndTimeChange"
/>
@@ -322,7 +322,7 @@ export default {
const endTime = new Date(now.setHours(23, 59, 59, 999));
this.queryParams.startTime = this.formatDateTime(startTime, this.queryParams.type);
- this.queryParams.endTime = this.formatDateTime(endTime, this.queryParams.type);
+ this.queryParams.endTime = this.getEndDateTime(endTime, this.queryParams.type);
},
initCharts() {
@@ -386,6 +386,15 @@ export default {
this.handleQuery();
},
+ // 监听结束时间变化
+ handleEndTimeChange(time) {
+ if (time) {
+ const date = new Date(time);
+ this.queryParams.endTime = this.getEndDateTime(date, this.queryParams.type);
+ this.handleQuery();
+ }
+ },
+
//数组转树形结构
tranListToTreeData(list) {
// 最终要产出的树状数据的数组