|
@@ -519,7 +519,7 @@
|
|
|
name: '指定月份',
|
|
name: '指定月份',
|
|
|
disabled: false
|
|
disabled: false
|
|
|
}],
|
|
}],
|
|
|
- value: '2',
|
|
|
|
|
|
|
+ value: '4',
|
|
|
intervalId: null, // 用于存储间隔ID
|
|
intervalId: null, // 用于存储间隔ID
|
|
|
intervalReady: true, // 用于存储间隔ID
|
|
intervalReady: true, // 用于存储间隔ID
|
|
|
};
|
|
};
|
|
@@ -536,7 +536,7 @@
|
|
|
this.endYear = new Date().getFullYear();
|
|
this.endYear = new Date().getFullYear();
|
|
|
this.FormData.queryDate = parseUnixTime(new Date(), '{y}-{m}-{d}');
|
|
this.FormData.queryDate = parseUnixTime(new Date(), '{y}-{m}-{d}');
|
|
|
this.FormData2.queryDate = parseUnixTime(new Date(), '{y}-{m}-{d}');
|
|
this.FormData2.queryDate = parseUnixTime(new Date(), '{y}-{m}-{d}');
|
|
|
- this.FormData.type = 2;
|
|
|
|
|
|
|
+ this.FormData.type = 4;
|
|
|
|
|
|
|
|
this.getElectricityStatistics();
|
|
this.getElectricityStatistics();
|
|
|
this.getTimeSlotStatistics();
|
|
this.getTimeSlotStatistics();
|
|
@@ -664,8 +664,8 @@
|
|
|
this.FormData2.meterId = e[2].value;
|
|
this.FormData2.meterId = e[2].value;
|
|
|
this.FormData2.queryDate = parseUnixTime(new Date(), '{y}-{m}-{d}');
|
|
this.FormData2.queryDate = parseUnixTime(new Date(), '{y}-{m}-{d}');
|
|
|
//this.meterId =e[2].value;
|
|
//this.meterId =e[2].value;
|
|
|
- this.FormData.type = 2;
|
|
|
|
|
- this.value = '2';
|
|
|
|
|
|
|
+ this.FormData.type = 4;
|
|
|
|
|
+ this.value = '4';
|
|
|
|
|
|
|
|
this.getTimeSlotStatistics();
|
|
this.getTimeSlotStatistics();
|
|
|
this.getElectricityStatistics();
|
|
this.getElectricityStatistics();
|
|
@@ -681,8 +681,8 @@
|
|
|
this.FormData2.meterId = this.meterId;
|
|
this.FormData2.meterId = this.meterId;
|
|
|
this.FormData2.queryDate = parseUnixTime(new Date(), '{y}-{m}-{d}');
|
|
this.FormData2.queryDate = parseUnixTime(new Date(), '{y}-{m}-{d}');
|
|
|
|
|
|
|
|
- this.FormData.type = 2;
|
|
|
|
|
- this.value = '2';
|
|
|
|
|
|
|
+ this.FormData.type = 4;
|
|
|
|
|
+ this.value = '4';
|
|
|
|
|
|
|
|
this.getTimeSlotStatistics();
|
|
this.getTimeSlotStatistics();
|
|
|
this.getElectricityStatistics();
|
|
this.getElectricityStatistics();
|
|
@@ -992,7 +992,8 @@
|
|
|
this.FormData2.queryDate = parseUnixTime(new Date(), '{y}-{m}-{d}');
|
|
this.FormData2.queryDate = parseUnixTime(new Date(), '{y}-{m}-{d}');
|
|
|
this.queryDay = parseUnixTime(new Date(this.FormData2.queryDate), '{y}年{m}月{d}日');
|
|
this.queryDay = parseUnixTime(new Date(this.FormData2.queryDate), '{y}年{m}月{d}日');
|
|
|
this.getTimeSlotStatistics();
|
|
this.getTimeSlotStatistics();
|
|
|
- } else {
|
|
|
|
|
|
|
+ } else {
|
|
|
|
|
+ this.clickType="4"
|
|
|
this.FormData.type = this.clickType;
|
|
this.FormData.type = this.clickType;
|
|
|
this.value = this.clickType;
|
|
this.value = this.clickType;
|
|
|
if (this.value != 10) {
|
|
if (this.value != 10) {
|
wkyy