调整优化 +小时

pages/equipmentDataMonitoring/electronicMonitoringWater.vue

@@ -196,7 +196,7 @@
 		
 			<view class="infos">
 				
-				<view class="item" style="width: 40%;" v-if="dtuInfo&&dtuInfo.id">
+				<view class="item" style="width: 40%;" v-if="dtuInfo&&dtuInfo.id&&!meterDetail.customer">
 					<view class="item-title">
 						通讯模块
 					</view>
@@ -228,7 +228,7 @@
 				<view class="border">
 		
 				</view>
-				<view class="item" style="width: 30%;">
+				<view class="item" style="width: 30%;" v-if="!meterDetail.installationAddressSimple">
 					<view class="item-title">
 						水价
 					</view>
@@ -236,6 +236,14 @@
 						{{meterDetail.price}}元/吨
 					</view>
 				</view>
+				<view class="item" style="width: 30%;" v-else>
+					<view class="item-title">
+						地址简称
+					</view>
+					<view class="item-value">
+						{{meterDetail.installationAddressSimple}}
+					</view>
+				</view>
 			</view>
 		</view>
 		
@@ -811,12 +819,17 @@
 					interval: 0,
 					textStyle: {
 						color: "#333"
-					}
+					},
+					formatter: function (value) {
+					       return value + '时'; // 在每个 x 轴标签后添加后缀
+					 },
 				}
 
 				if (data1.length < 4) {
 					axisLabel = {
-
+						formatter: function (value) {
+						       return value + '时'; // 在每个 x 轴标签后添加后缀
+						 },
 						interval: 0,
 						textStyle: {
 							color: "#333"
@@ -837,7 +850,7 @@
 							
 							var name = value[0].name;
 							var obj=list[name]
-							var text= `<p>${name}</p>`
+							var text= `<p>${name}时</p>`
 														
 							if(this.meterDetail.price){
 								text += `<p>水价：`+this.meterDetail.price+`元/吨</p>`
@@ -870,9 +883,11 @@
 						data: data1,
 
 						axisLabel: axisLabel,
+						
 					},
 					yAxis: {
 						type: 'value',
+						
 
 					},
 					series: [{

pages/platformRevenueStatistics/daypartingStatisticsWater.vue

@@ -17,7 +17,7 @@
 					
 		
 			<view  class="tabsItem" @click="tabsFrom.show1=!tabsFrom.show1">
-			{{formData.timeNode}} <u-icon
+			{{formData.timeNode}}时 <u-icon
 					name="arrow-up" v-if="tabsFrom.show1"></u-icon><u-icon v-else name="arrow-down"></u-icon></view>
 					
 			
@@ -106,7 +106,7 @@
 			selector1confirm(e){
 				console.log(e)
 				this.tabsFrom.show1Index=e
-				this.formData.timeNode=this.tabsFrom.selector1[e].label
+				this.formData.timeNode=this.tabsFrom.selector1[e].value
 				this.getInfo()
 			},
 			getData(){
@@ -124,7 +124,7 @@
 				
 					for(var i in this.data.hourMap ){
 						this.tabsFrom.selector1.push({
-							label:i,
+							label:i+'时',
 							value:i
 						})
 						if(!this.formData.timeNode){

pages/platformRevenueStatistics/electricityConsumptionAnalysis.vue

@@ -306,7 +306,7 @@
 				
 				for (var i in list) {
 					var obj=list[i]
-					data1.push(obj.hour)
+					data1.push(obj.hour+'时')
 					data2.push(obj.obj.consumptionAverage)
 					data3.push(obj.obj.workConsumptionAverage)
 					data4.push(obj.obj.restConsumptionAverage)
@@ -342,7 +342,8 @@
 							interval: 0,
 							textStyle: {
 								color: "#333"
-							}
+							},
+							
 						},
 				
 					},