平均用水量

pages/equipmentDataMonitoring/electronicMonitoringWater.vue

@@ -758,10 +758,12 @@
 
 				var data1 = [];
 				var data2 = [];
+				var data3 = [];
 				// var sumQuantity=0
 				for (var i in list) {
 					data1.push(i)
 					data2.push(list[i].consumption)
+					data3.push(list[i].consumptionAverage)
 					// sumQuantity+=list[i]
 
 				}
@@ -811,8 +813,11 @@
 
 						}
 					},
+					legend: {
+					  
+					  },
 					grid: {
-						top: 20,
+						top: 60,
 						left: 5,
 						right: 10,
 						bottom: 20,
@@ -829,15 +834,27 @@
 
 					},
 					series: [{
-						name: '合计',
+						name: '用水量',
 						data: data2,
 						type: 'bar',
+						 barGap:"0%",
 						label: {
 							show: true,
 							position: 'top',
 							color: '#5C7BD9'
 						}
-					}]
+					},
+					{
+						name: '平均用水量',
+						data: data3,
+						type: 'bar',
+						label: {
+							show: true,
+							position: 'top',
+							color: '#5C7BD9'
+						}
+					}
+					]
 				}
 				console.log(option)
 				this.myChart.setOption(option);

pages/equipmentDataMonitoring/equipmentElectricityWater.vue

@@ -5,7 +5,7 @@
 				<u-icon name="arrow-left" color="#101010" size="36"></u-icon>
 			</view>
 			<view class="title">
-				用水量（度）
+				用水量（m³）
 				<image class="img" src="@/assets/img/refresh-line.svg" @click="getList(true)"></image>
 			</view>
 

pages/platformRevenueStatistics/electricityConsumptionAnalysis.vue

@@ -228,7 +228,7 @@
 					series: [{
 						name: '合计',
 						data: data2,
-						type: 'line',
+						type: 'bar',
 						 markPoint: {  
 							
 						            data: [