|
|
@@ -446,16 +446,50 @@
|
|
|
var sumQuantity=0
|
|
|
for(var i in list){
|
|
|
data1.push(i)
|
|
|
- data2.push(list[i])
|
|
|
+ data2.push(list[i].kwh)
|
|
|
sumQuantity+=list[i]
|
|
|
|
|
|
}
|
|
|
+ var axisLabel={
|
|
|
+ rotate:40,
|
|
|
+ interval:0,
|
|
|
+ textStyle: {
|
|
|
+ color: "#333"
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ if(data1.length<8){
|
|
|
+ axisLabel={
|
|
|
+
|
|
|
+ interval:0,
|
|
|
+ textStyle: {
|
|
|
+ color: "#333"
|
|
|
+ },
|
|
|
+ }
|
|
|
+ }
|
|
|
//this.sumQuantity=sumQuantity.toFixed(2)
|
|
|
var headitemby=""
|
|
|
var showkey = "";
|
|
|
var option = {
|
|
|
tooltip: {
|
|
|
- trigger: 'axis'
|
|
|
+ trigger: 'axis',
|
|
|
+ formatter: (value) => {
|
|
|
+ //var dataIndex = value[0].dataIndex;
|
|
|
+ var name = value[0].name;
|
|
|
+ var obj=this.hourMap[name]
|
|
|
+ var text= `<p>${name}</p>`
|
|
|
+ if(obj.electricityPrice!=undefined){
|
|
|
+ text+=`<p>电价：${obj.electricityPrice}元/度</p>`
|
|
|
+ }
|
|
|
+ if(obj.kwh!=undefined){
|
|
|
+ text+=`用电量：${obj.kwh}度`
|
|
|
+ }
|
|
|
+ if(obj.amount!=undefined){
|
|
|
+ text+=` <p>电费：${obj.amount}元</p>`
|
|
|
+ }
|
|
|
+ return text
|
|
|
+
|
|
|
+ }
|
|
|
},
|
|
|
grid: {
|
|
|
top: '6%',
|
|
|
@@ -468,13 +502,7 @@
|
|
|
type: 'category',
|
|
|
data: data1,
|
|
|
|
|
|
- axisLabel: {
|
|
|
- rotate:40,
|
|
|
- interval:0,
|
|
|
- textStyle: {
|
|
|
- color: "#333"
|
|
|
- }
|
|
|
- },
|
|
|
+ axisLabel: axisLabel,
|
|
|
},
|
|
|
yAxis: {
|
|
|
type: 'value',
|
zhengkaixin