|
@@ -140,7 +140,7 @@
|
|
|
@click="ckDate(1)" ></i>
|
|
|
</div>
|
|
|
<dl class="returnChart returnChartBlue">
|
|
|
- <dt><span>功率监测(kW)</span></dt>
|
|
|
+ <dt><span>功率监测(KW)</span></dt>
|
|
|
<dd>
|
|
|
<div id="kwPicture" style="width:100%;height: 300px;">
|
|
|
|
|
@@ -149,7 +149,7 @@
|
|
|
</dd>
|
|
|
</dl>
|
|
|
<dl class="returnChart">
|
|
|
- <dt><span>电压监测(A)</span></dt>
|
|
|
+ <dt><span>电流监测(A)</span></dt>
|
|
|
<dd>
|
|
|
<div id="aPicture" style="width:100%;height: 300px;">
|
|
|
|
|
@@ -180,7 +180,7 @@
|
|
|
mapGetters,
|
|
|
mapMutations
|
|
|
} from 'vuex'
|
|
|
- import echarts from 'echarts'
|
|
|
+ import * as echarts from 'echarts'
|
|
|
|
|
|
import 'echarts/lib/chart/line'
|
|
|
import {
|
|
@@ -200,7 +200,7 @@
|
|
|
isLoading: false,
|
|
|
showTop:[0,0,0,0,0,0,0,0],
|
|
|
nowDate:"",
|
|
|
-
|
|
|
+ timeList:[],
|
|
|
queryDate:"",
|
|
|
queryDate2:"",
|
|
|
selectType:"0",
|
|
@@ -219,7 +219,7 @@
|
|
|
created() {
|
|
|
|
|
|
this.init()
|
|
|
- //this.queryDate='2022-06-08'
|
|
|
+
|
|
|
|
|
|
},
|
|
|
methods: {
|
|
@@ -242,7 +242,7 @@
|
|
|
this.nowDate=parseUnixTime(currentTimeStamp(), '{y}-{m}-{d}');
|
|
|
this.queryDate=parseUnixTime(beforeTimeStamp(0), '{y}-{m}-{d}');
|
|
|
this.queryDate2=parseUnixTime(beforeTimeStamp(0), '{y}-{m}-{d}');
|
|
|
-
|
|
|
+ this.queryDate='2022-06-08'
|
|
|
this.showlist1=['总功率','A相功率','B相功率','C相功率'];
|
|
|
|
|
|
this.showlist2=['A相电流','B相电流','C相电流'];
|
|
@@ -332,7 +332,11 @@
|
|
|
})
|
|
|
},
|
|
|
setMap(bl){
|
|
|
-
|
|
|
+ this.timeList=[];
|
|
|
+ for(var i in this.energyCenterMapObj){
|
|
|
+
|
|
|
+ this.timeList.push(i)
|
|
|
+ }
|
|
|
var list1=[];
|
|
|
var list2=[];
|
|
|
var list3=[];
|
|
@@ -363,7 +367,9 @@
|
|
|
var ap={
|
|
|
name: sz1[j],
|
|
|
type: 'line',
|
|
|
- stack: 'Total',
|
|
|
+ symbol: 'none',
|
|
|
+ sampling: 'lttb',
|
|
|
+ // stack: 'Total',
|
|
|
data:[]
|
|
|
}
|
|
|
list.push(ap)
|
|
@@ -447,14 +453,14 @@
|
|
|
grid: {
|
|
|
left: '3%',
|
|
|
right: '4%',
|
|
|
- bottom: '3%',
|
|
|
+ bottom: '15%',
|
|
|
containLabel: true
|
|
|
},
|
|
|
|
|
|
xAxis: {
|
|
|
type: 'category',
|
|
|
boundaryGap: false,
|
|
|
- data: ['01', '02', '03', '04', '05', '06', '07','08', '09', '10', '11', '12', '13', '14','15', '16', '17', '18', '19', '20', '21', '22', '23','24'],
|
|
|
+ data: this.timeList,
|
|
|
axisLabel:{
|
|
|
textStyle:{
|
|
|
color:colorName
|
|
@@ -469,6 +475,7 @@
|
|
|
},
|
|
|
yAxis: {
|
|
|
type: 'value',
|
|
|
+
|
|
|
axisLabel:{
|
|
|
textStyle:{
|
|
|
color:colorName
|
|
@@ -480,6 +487,17 @@
|
|
|
}
|
|
|
},
|
|
|
},
|
|
|
+ dataZoom: [
|
|
|
+ {
|
|
|
+ type: 'inside',
|
|
|
+ start: 0,
|
|
|
+ end: 100
|
|
|
+ },
|
|
|
+ {
|
|
|
+ start: 0,
|
|
|
+ end: 100
|
|
|
+ }
|
|
|
+ ],
|
|
|
series: seriesdata
|
|
|
};
|
|
|
myChart.setOption(option);
|