电量图

pages/equipmentDataMonitoring/electronicMonitoring.vue

@@ -774,24 +774,24 @@
 					// sumQuantity+=list[i]
 
 				}
-				var axisLabel={
-					rotate:40,
-					interval:0,
+				var axisLabel = {
+					rotate: 40,
+					interval: 0,
 					textStyle: {
 						color: "#333"
 					}
 				}
-				
-				if(data1.length<8){
-					axisLabel={
-					
-					interval:0,
-					textStyle: {
-						color: "#333"
-					},
+
+				if (data1.length < 8) {
+					axisLabel = {
+
+						interval: 0,
+						textStyle: {
+							color: "#333"
+						},
 					}
 				}
-				
+
 				// this.sumQuantity = sumQuantity.toFixed(2);
 				var headitemby = "";
 				var showkey = "";
@@ -802,10 +802,20 @@
 							type: 'shadow'
 						},
 						formatter: (value) => {
-							//var dataIndex = value[0].dataIndex;
+							var dataIndex = value[0].dataIndex;
+							var name2 = ''
+							if (dataIndex + 1 == data1.length) {
+								name2 = "24:00"
+							} else {
+								name2 = data1[dataIndex + 1];
+							}
 							var name = value[0].name;
 							var obj = this.hourMap[name]
 							var text = `<p>${name}</p>`
+							
+							if (data1.length < 8) {
+								text = `<p>${name}-${name2}</p>`
+							}
 							if (obj.electricityPrice != undefined) {
 								text += `<p>电价：${obj.electricityPrice}元/度</p>`
 							}