调整

pages/equipmentDataMonitoring/3PhaseCurrentDetails.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<u-navbar :title="typeName+'监测'"  title-color="#101010" >
+		<u-navbar :title="title"  title-color="#101010" >
 			
 			<view class="slot" slot="right" @click="show=true">
 				<image class="img" src="@/assets/img/riLine-calendar-todo-line 2.svg" mode=""></image>
@@ -20,7 +20,7 @@
 						
 					</view>
 					<span>
-						{{typeKey}}监测 <span v-if="typeN">（单位{{typeN}}）</span>
+						{{typeName}}监测 <span v-if="typeN">（单位{{typeN}}）</span>
 						
 					</span>
 				
@@ -124,6 +124,7 @@
 				typeName:'',
 				typeN:'',
 				typeKey:'',
+				title:"",
 			}
 		},
 		computed:{
@@ -133,7 +134,7 @@
 			this.meterNo=op.id
 			this.type=op.type
 			this.typeName=op.typeName
-			
+			this.title=op.title
 			if(this.type=='P'){
 				this.typeKey='功率'
 				this.typeN='kW'
@@ -407,10 +408,11 @@
 		 padding: 32rpx;
 		 .title{
 			
-			
+				
 			 .icon{
 				 width: 8rpx;
 				 height: 32rpx;
+				 	margin-right: 8rpx;
 				 background-color: rgba(22,119,255,1);
 			 }
 			

pages/equipmentDataMonitoring/chartMoM.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<u-navbar title="环比分析" title-color="#101010">
+		<u-navbar :title="title" title-color="#101010">
 		</u-navbar>
 
 		<u-picker-select :noselect="false" @confirm="selector2confirm" @reset="selector2reset" :defaultTime="queryDate"
@@ -15,7 +15,7 @@
 
 					</view>
 					<span>
-						每月用电量(kW·h)
+						环比分析-每月用电量(kW·h)
 
 					</span>
 
@@ -40,7 +40,7 @@
 
 					</view>
 					<span>
-						每小时用电量(kW·h)
+						环比分析-每小时用电量(kW·h)
 
 					</span>
 
@@ -93,7 +93,8 @@
 				description: "",
 				timeList1: [],
 				timeList2: [],
-				nowYear: '',
+				nowYear: '',
+				title:"",
 
 			}
 		},
@@ -101,14 +102,14 @@
 			this.meterNo = op.id
 			//this.type=op.type
 			//this.typeName=op.typeName
-
+			this.title=op.title
 			this.nowDate = parseUnixTime(currentTimeStamp(), '{y}-{m}-{d}');
 			this.queryDate = parseUnixTime(beforeTimeStamp(0), '{y}-{m}-{d}');
 			this.queryDateStr = parseUnixTime(new Date(this.queryDate), '{y}年{m}月{d}日');
 			
 			this.nowYear = new Date().getFullYear()
 			//this.showlist1 = [];
-
+			
 
 			this.electricityMonthTB()
 			this.electricityHourByYear()
@@ -418,7 +419,8 @@
 			    align-items: center;
 			    justify-content: space-between;
 			.icon {
-				width: 8rpx;
+				width: 8rpx;
+					margin-right: 8rpx;
 				height: 32rpx;
 				background-color: rgba(22, 119, 255, 1);
 			}

pages/equipmentDataMonitoring/chartYoY.vue

@@ -1,12 +1,13 @@
 <template>
 	<view>
-		<u-navbar title="同比分析" title-color="#101010">
+		<u-navbar :title="title" title-color="#101010">
 		</u-navbar>
 
 		<u-picker-select :noselect="false" @confirm="selector2confirm" @reset="selector2reset" :defaultTime="queryDate"
 			title="日期选择" v-model="show" mode="time" :params="params"></u-picker-select>
-
-		<view class="main">
+			
+		<view class="main">
+ 			 
 			<view class="title">
 
 				<view class="text">
@@ -15,7 +16,7 @@
 
 					</view>
 					<span>
-						每月用电量(kW·h)
+						同比分析-每月用电量(kW·h)
 
 					</span>
 
@@ -40,7 +41,7 @@
 
 					</view>
 					<span>
-						每小时用电量(kW·h)
+						同比分析-每小时用电量(kW·h)
 
 					</span>
 
@@ -93,14 +94,14 @@
 				timeList1: [],
 				timeList2: [],
 				nowYear: '',
-
+				title:"",
 			}
 		},
 		onLoad(op) {
 			this.meterNo = op.id
 			//this.type=op.type
 			//this.typeName=op.typeName
-
+			this.title=op.title
 			this.nowDate = parseUnixTime(currentTimeStamp(), '{y}-{m}-{d}');
 			this.queryDate = parseUnixTime(beforeTimeStamp(0), '{y}-{m}-{d}');
 			this.queryDateStr = parseUnixTime(new Date(this.queryDate), '{y}年{m}月{d}日');
@@ -409,10 +410,11 @@
 			    justify-content: space-between;
 			.icon {
 				width: 8rpx;
-				height: 32rpx;
+				height: 32rpx;
+					margin-right: 8rpx;
 				background-color: rgba(22, 119, 255, 1);
 			}
-
+		 
 			.text {
 				display: flex;
 				align-items: center;

pages/equipmentDataMonitoring/electronicMonitoring.vue

@@ -609,7 +609,7 @@
 				}
 				uni.navigateTo({
 					url: "/pages/equipmentDataMonitoring/" + path + "?id=" + this.FormData.meterId + "&type=" + type +
-						"&typeName=" + name
+						"&typeName=" + name+"&title="+this.tabsFrom.title
 				})
 
 			},