|
@@ -377,6 +377,7 @@
|
|
export default {
|
|
export default {
|
|
data() {
|
|
data() {
|
|
return {
|
|
return {
|
|
|
|
+ timeOut: false,
|
|
abnormalRecordsList: [], //异常list
|
|
abnormalRecordsList: [], //异常list
|
|
companyId: '', //企业id
|
|
companyId: '', //企业id
|
|
meterId: '', //设备id
|
|
meterId: '', //设备id
|
|
@@ -483,6 +484,12 @@
|
|
onReady() {
|
|
onReady() {
|
|
this.getBarCharts(false);
|
|
this.getBarCharts(false);
|
|
},
|
|
},
|
|
|
|
+ onUnload() {
|
|
|
|
+ this.timeOut = false;
|
|
|
|
+ },
|
|
|
|
+ onHide() {
|
|
|
|
+ this.timeOut = false;
|
|
|
|
+ },
|
|
methods: {
|
|
methods: {
|
|
gotoInfo(path,type,name){
|
|
gotoInfo(path,type,name){
|
|
if(!this.FormData.meterId){
|
|
if(!this.FormData.meterId){
|
|
@@ -658,17 +665,35 @@
|
|
})
|
|
})
|
|
})
|
|
})
|
|
},
|
|
},
|
|
- getTimeSlotStatistics() {
|
|
|
|
- uni.showLoading({
|
|
|
|
- title: "加载中",
|
|
|
|
- mask: true,
|
|
|
|
- })
|
|
|
|
-
|
|
|
|
|
|
+ getTimeSlotStatistics(bl) {
|
|
|
|
+ if(!bl) {
|
|
|
|
+ uni.showLoading({
|
|
|
|
+ title: "加载中",
|
|
|
|
+ mask: true,
|
|
|
|
+ })
|
|
|
|
+ }
|
|
|
|
+
|
|
this.queryDay = parseUnixTime(new Date(this.FormData2.queryDate), '{y}年{m}月{d}日');
|
|
this.queryDay = parseUnixTime(new Date(this.FormData2.queryDate), '{y}年{m}月{d}日');
|
|
API.timeSlotStatistics(this.FormData2).then((response) => {
|
|
API.timeSlotStatistics(this.FormData2).then((response) => {
|
|
- uni.hideLoading();
|
|
|
|
|
|
+ if(!bl) {
|
|
|
|
+ uni.hideLoading();
|
|
|
|
+ }
|
|
this.hourMap = response.data.hourMap;
|
|
this.hourMap = response.data.hourMap;
|
|
- this.getBarCharts(this.hourMap);
|
|
|
|
|
|
+ // this.sumQuantity = response.data.allKwh;
|
|
|
|
+ if(!bl) {
|
|
|
|
+ this.getBarCharts(this.hourMap);
|
|
|
|
+ } else {
|
|
|
|
+ this.myChart.setOption({
|
|
|
|
+ series: [{
|
|
|
|
+ data: this.hourMap
|
|
|
|
+ }]
|
|
|
|
+ });
|
|
|
|
+ }
|
|
|
|
+ if(this.timeOut) {
|
|
|
|
+ setTimeout(() => {
|
|
|
|
+ this.getTimeSlotStatistics(true);
|
|
|
|
+ }, 30000)
|
|
|
|
+ }
|
|
}).catch(error => {
|
|
}).catch(error => {
|
|
uni.showToast({
|
|
uni.showToast({
|
|
title: error,
|
|
title: error,
|
|
@@ -725,19 +750,14 @@
|
|
}
|
|
}
|
|
this.myChart.clear();
|
|
this.myChart.clear();
|
|
|
|
|
|
- var data1 = ['0-2点', '2-4点', '4-6点', '6-8点', '8-10点', '10-12点', '12-14点', '14-16点',
|
|
|
|
- '16-18点', '18-20点', '20-22点', '22-24点'
|
|
|
|
- ];
|
|
|
|
- var data2 = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
|
|
|
|
- var sumQuantity = 0;
|
|
|
|
- if (list) {
|
|
|
|
- data1 = [];
|
|
|
|
- data2 = [];
|
|
|
|
- for (var i in list) {
|
|
|
|
- data1.push(i);
|
|
|
|
- data2.push(list[i]);
|
|
|
|
- sumQuantity += list[i];
|
|
|
|
- }
|
|
|
|
|
|
+ var data1=[];
|
|
|
|
+ var data2=[];
|
|
|
|
+ var sumQuantity=0
|
|
|
|
+ for(var i in list){
|
|
|
|
+ data1.push(i)
|
|
|
|
+ data2.push(list[i])
|
|
|
|
+ sumQuantity+=list[i]
|
|
|
|
+
|
|
}
|
|
}
|
|
this.sumQuantity = sumQuantity.toFixed(2);
|
|
this.sumQuantity = sumQuantity.toFixed(2);
|
|
var headitemby = "";
|
|
var headitemby = "";
|