优化

pages/index/index.vue

@@ -100,7 +100,7 @@
 					
 					
 					<u-grid-item   v-if="(electricity.id&&electricity.type!=6)"
-					 @click="gotoUrl('/pages/remoteControl/switchDetail')">
+					 @click="gotoUrl('/pages/remoteControl/switchDetail?id='+electricity.id)">
 						<view class="icon icon11">
 							<image class="img" src="@/assets/img/antFill-control.svg" mode=""></image>
 							
@@ -134,7 +134,7 @@
 					</u-grid-item>
 					
 				
-					<u-grid-item   @click="gotoUrl('/pages/mine/electronicMonitoring')">
+					<u-grid-item   @click="gotoUrl('/pages/mine/electronicMonitoring?id='+electricity.id)">
 						<view class="icon icon7">
 							<image class="img" src="@/assets/img/fas fa-chart-pie.svg" mode=""></image>
 						</view>
@@ -220,15 +220,18 @@
 					
 					if(electricityMeterList.length){
 						for(var i in electricityMeterList){
+							var obj=electricityMeterList[i];
+							
 							if(i==0){
 								this.electricity=electricityMeterList[i]
 							}
-							
+							if(this.electricity.type==6){
+								this.electricity=electricityMeterList[i]
+							}
 							if(!electricityMeterList[i].online){
 								this.electricity=electricityMeterList[i]
 							}
 						}
-					
 					}
 				}).catch(error => {
 					uni.showToast({

pages/mine/electronicMonitoring.vue

@@ -91,13 +91,27 @@
 		
 		<!-- 远程控制电源开关 -->
 		<view class="control" 
-		@click="gotoUrl('/pages/remoteControl/switchDetail?id='+meterDetail.id)"
+	
 		v-if="meterDetail.type!=6&&meterDetail.allowSwitch">
-			<view class="text">
+			<view class="text" 	@click="gotoUrl('/pages/remoteControl/switchDetail?id='+meterDetail.id)" >
 				智能监控电源
 				 <u-icon name="arrow-right" color="#cccccc" size="24" ></u-icon>
 			</view>
-			<view class="icon">
+			<view class="icon"  style="    display: flex;" >
+				
+				<span>关</span>
+				<u-switch size="32" @change="switchBtnApi(meterDetail,$event)"  
+				 v-model="meterDetail.switchStatus"   inactive-color="#ff9900" ></u-switch >
+				<span>开</span>
+				<!-- <img src="@/assets/img/control.png"
+				 @tap.stop="switchBtnApi(meterDetail,0)"
+				 v-if="meterDetail.switchStatus"
+				 alt="" />
+				<img   @tap.stop="switchBtnApi(meterDetail,1)"
+				v-else
+				src="@/assets/img/switchClose.png" alt="" /> -->
+			</view>
+			<!-- <view class="icon" v-i>
 				<img src="@/assets/img/control.png"
 				 @tap.stop="switchBtnApi(meterDetail,0)"
 				 v-if="meterDetail.switchStatus"
@@ -105,7 +119,7 @@
 				<img   @tap.stop="switchBtnApi(meterDetail,1)"
 				v-else
 				src="@/assets/img/switchClose.png" alt="" />
-			</view>
+			</view> -->
 		</view>
 		<!-- 各时段用电量 -->
 		<view class="electricity-chart">
@@ -377,10 +391,16 @@
 				meterDetail:{
 					
 				},
+				meterId:"",
 				equipmentInfosShow:false,
 			};
 		},
-		onLoad() {
+		onLoad(op) {
+			if(op.id){
+				this.meterId=op.id;
+				//this.getMeter()
+				
+			}
 			this.endYear=new Date().getFullYear()
 			this.FormData.queryDate=parseUnixTime(new Date(), '{y}-{m}-{d}')
 			this.FormData2.queryDate=parseUnixTime(new Date(), '{y}-{m}-{d}')
@@ -698,6 +718,8 @@
 					success:res=> {
 						if(res.confirm){
 							this.switchBtnApiMethod(node,key);
+						}else{
+							node.switchStatus=!key
 						}
 					}
 				})
@@ -716,12 +738,22 @@
 					uni.hideLoading();
 					this.electricityMeterList=response.data.meterList
 					if(this.electricityMeterList.length){
-						this.electricity=this.electricityMeterList[0];
+						var index=0;
+						
+						for(var i in this.electricityMeterList){
+							var obj=this.electricityMeterList[i]
+							if(obj.id==this.meterId){
+								index=i
+								this.tabsFrom.show1Index=i;
+							}
+						}
+						
+						this.electricity=this.electricityMeterList[index];
 							
-						this.FormData.meterId=this.electricityMeterList[0].id
-						this.FormData2.meterId=this.electricityMeterList[0].id
+						this.FormData.meterId=this.electricityMeterList[index].id
+						this.FormData2.meterId=this.electricityMeterList[index].id
 					
-						this.title=this.electricityMeterList[0].name
+						this.title=this.electricityMeterList[index].name
 						// {
 						// 		label: '全部类型',
 						// 		value: '',

pages/remoteControl/switchDetail.vue

@@ -15,104 +15,125 @@
 		 :defaultSelector="[tabsFrom.show1Index]"
 		 mode="selector" :range="tabsFrom.selector1"  range-key="label" @confirm="selector1confirm" ></u-picker>
 		
-		
-		<view class="control-group" v-if="meterDetails.meter" >
-               <view class="control">
-               	<view class="text">
-               		电源
-               	</view>
-               	
-               </view>
-			   
-			   <view class="control">
-			   	<view class="text">
-			   		开关
-			   	</view>
-			   	<view class="icon">
-					<img src="@/assets/img/switchIcon.png"
-					 @tap.stop="switchBtnApi(meterDetails.meter,0)" class="img"
-					 v-if="meterDetails.meter.switchStatus" alt="" ></img >
-					<img src="@/assets/img/switchClose.png" 
-					 @tap.stop="switchBtnApi(meterDetails.meter,1)" class="img"
-					v-else alt="" ></img >
-			   		<!-- <img src="@/assets/img/control.png" alt="" /> -->
-			   	</view>
-			   </view>
-		</view>
-		
-		<!-- 用电信息 -->
-		<view class="electricity-information">
-			<view class="title">
-		
-				
-				<view class="text">
-					用电信息
-		
-				</view>
-				<!-- <view class="more" @click="gotoUrl('/pages/tenantList/electricityInformation')">  
-					<u-icon name="arrow-right" size="24" color="#d4d4d4"></u-icon>
-				</view> -->
+		<template  v-if="meterDetails.meter&&meterDetails.meter.type!=6" >
+			<view class="control-group" v-if="meterDetails.meter" >
+			       <view class="control">
+			       	<view class="text">
+			       		电源
+			       	</view>
+			       	
+			       </view>
+				   
+				   <view class="control">
+				   	<view class="text">
+				   		开关
+				   	</view>
+				   	<view class="icon"  style="    display: flex;" >
+						<span>关</span>
+						<u-switch size="32" @change="switchBtnApi(meterDetails.meter,$event)"  
+						 v-model="meterDetails.meter.switchStatus"   inactive-color="#ff9900" ></u-switch >
+						<span>开</span>
+						<!-- 
+						<img src="@/assets/img/switchIcon.png"
+						 @tap.stop="switchBtnApi(meterDetails.meter,0)" class="img"
+						 v-if="meterDetails.meter.switchStatus" alt="" ></img >
+						<img src="@/assets/img/switchClose.png" 
+						 @tap.stop="switchBtnApi(meterDetails.meter,1)" class="img"
+						v-else alt="" ></img > -->
+				   		<!-- <img src="@/assets/img/control.png" alt="" /> -->
+				   	</view>
+				   </view>
 			</view>
-		
-			<view class="infos">
-				<view class="item" style="width: 30%;">
+			
+			<!-- 用电信息 -->
+			<view class="electricity-information">
+				<view class="title">
+			
 					
-					<view class="item-value">
-						{{meterDetails.thisDayKwh}}
-					</view>
-					<view class="item-title">
-						今日用电量(度)
+					<view class="text">
+						用电信息
+			
 					</view>
+					<!-- <view class="more" @click="gotoUrl('/pages/tenantList/electricityInformation')">  
+						<u-icon name="arrow-right" size="24" color="#d4d4d4"></u-icon>
+					</view> -->
 				</view>
-				
-				<view class="item" style="width: 30%;">
-					
-					<view class="item-value">
-						{{meterDetails.thisMonthKwh}}
-					</view>
-					<view class="item-title">
-						当月用电量(度)
+			
+				<view class="infos">
+					<view class="item" style="width: 30%;">
+						
+						<view class="item-value">
+							{{meterDetails.thisDayKwh}}
+						</view>
+						<view class="item-title">
+							今日用电量(度)
+						</view>
 					</view>
-				</view>
-				
-				<view class="item" style="width: 30%;">
 					
-					<view class="item-value" v-if="meterDetails.nowRecord">
-						{{meterDetails.nowRecord.totalPower}}
+					<view class="item" style="width: 30%;">
+						
+						<view class="item-value">
+							{{meterDetails.thisMonthKwh}}
+						</view>
+						<view class="item-title">
+							当月用电量(度)
+						</view>
 					</view>
-					<view class="item-title">
-						当前功率(千瓦)
+					
+					<view class="item" style="width: 30%;">
+						
+						<view class="item-value" v-if="meterDetails.nowRecord">
+							{{meterDetails.nowRecord.totalPower}}
+						</view>
+						<view class="item-title">
+							当前功率(千瓦)
+						</view>
 					</view>
 				</view>
 			</view>
-		</view>
-		
-		<!-- 日志 -->
-		<view class="log"  @click="gotoUrl('/pages/timing/timing?id='+meterId)">
-		       <view class="icon">
-				  <u-icon name="clock" color="#fff" size="40" ></u-icon>
-		       </view>
-			   <view class="text">
-			   	定时
-			   </view>
-			   <view class="more">
-			   	<u-icon name="arrow-right" size="32" color="#bbbbbb" ></u-icon>
-			   </view> 
-		
-		</view>
-		
-		<view class="log" @click="gotoUrl('/pages/remoteControl/operationLog?id='+meterId)">
-		       <view class="icon">
-		       	<img src="@/assets/img/riLine-file-list-2-line.svg" alt="" />
-		       </view>
-			   <view class="text">
-			   	日志
-			   </view>
-			   <view class="more">
-			   	<u-icon name="arrow-right" size="32" color="#bbbbbb" ></u-icon>
-			   </view>
-
-		</view>
+			
+			<!-- 日志 -->
+			<view class="log"  @click="gotoUrl('/pages/timing/timing?id='+meterId)">
+			       <view class="icon">
+					  <u-icon name="clock" color="#fff" size="40" ></u-icon>
+			       </view>
+				   <view class="text">
+				   	定时
+				   </view>
+				   <view class="more">
+				   	<u-icon name="arrow-right" size="32" color="#bbbbbb" ></u-icon>
+				   </view> 
+			
+			</view>
+			
+			<view class="log" @click="gotoUrl('/pages/remoteControl/operationLog?id='+meterId)">
+			       <view class="icon">
+			       	<img src="@/assets/img/riLine-file-list-2-line.svg" alt="" />
+			       </view>
+				   <view class="text">
+				   	日志
+				   </view>
+				   <view class="more">
+				   	<u-icon name="arrow-right" size="32" color="#bbbbbb" ></u-icon>
+				   </view>
+			
+			</view>
+		</template>
+		<template v-else>
+			
+			<view class="log" >
+			      <!-- <view class="icon">
+			      
+			       </view> -->
+				   <view class="text">
+				   	虚拟表不可操作
+				   </view>
+				   <view class="more">
+				   <!-- 	<u-icon name="arrow-right" size="32" color="#bbbbbb" ></u-icon> -->
+				   </view>
+			
+			</view>
+		</template>
 		
 	</view>
 	
@@ -165,10 +186,12 @@
 		},
 		onLoad(op) {
 			if(op.id){
-				//this.meterId=op.id;
+				this.meterId=op.id;
 				//this.getMeter()
+				
 			}
 			this.getElectricityMeterList();
+		
 		},
 		onShow() {
 			if(this.meterId&&this.getMeterReady){
@@ -188,6 +211,7 @@
 				this.title=this.tabsFrom.selector1[index].label
 				
 				this.FormData.meterId=this.tabsFrom.selector1[index].value
+				this.meterId=this.FormData.meterId
 			
 				//this.value="4"
 				this.electricity=this.electricityMeterList[index]
@@ -201,7 +225,7 @@
 					this.tabsFrom.show1=true
 				}
 			},
-			getElectricityMeterList(){
+			getElectricityMeterList(bl){
 				uni.showLoading({
 					title: "加载中",
 					mask: true,
@@ -218,12 +242,21 @@
 						// 	...this.electricityMeterList,
 						// 	...this.electricityMeterList
 						// ]
-						this.electricity=this.electricityMeterList[0];
+						var index=0;
+						
+						for(var i in this.electricityMeterList){
+							var obj=this.electricityMeterList[i]
+							if(obj.id==this.meterId){
+								index=i
+								this.tabsFrom.show1Index=i;
+							}
+						}
+						this.electricity=this.electricityMeterList[index];
 							
-						this.FormData.meterId=this.electricityMeterList[0].id
-					
+						this.FormData.meterId=this.electricityMeterList[index].id
+						this.meterId=this.FormData.meterId
 					
-						this.title=this.electricityMeterList[0].name
+						this.title=this.electricityMeterList[index].name
 						// {
 						// 		label: '全部类型',
 						// 		value: '',
@@ -297,6 +330,8 @@
 					success:res=> {
 						if(res.confirm){
 							this.switchBtnApiMethod(node,key);
+						}else{
+							node.switchStatus=!key
 						}
 					}
 				})