优化

pages/equipmentDataMonitoring/electronicMonitoring.vue

@@ -64,7 +64,7 @@
 		<!-- 远程控制电源开关 -->
 		<view class="control" 
 		
-		v-if="codes&&codes.indexOf('switch')!=-1&&meterDetail.type!=6&&meterDetail.allowSwitch">
+		v-if="codes&&codes.indexOf('switch')!=-1&&(meterDetail.type!=6&&meterDetail.type!=7)&&meterDetail.allowSwitch">
 			<view class="text" @click="gotoUrl('/pages/tenantList/switchDetail?id='+meterDetail.id)">
 				
 				智能监控电源
@@ -86,7 +86,7 @@
 			</view>
 		</view>
 		<!-- 各时段用电量 -->
-		<view class="electricity-chart">
+		<view class="electricity-chart" v-if="meterDetail.type!=7">
 			<view class="title">
 				<view class="icon">
 
@@ -114,7 +114,7 @@
 			</view>
 		</view>
 		<!-- 异常告警 -->
-		<view class="abnormal" v-if="abnormalRecordsList.length" >
+		<view class="abnormal" v-if="abnormalRecordsList.length"  >
 			<view class="headline">
 				<view class="title">
 					<view class="icon">
@@ -149,7 +149,7 @@
 		</view>
 
 		<!-- 能源监测 -->
-		<view class="energy-inspection">
+		<view class="energy-inspection"  v-if="meterDetail.type!=7" >
 			<view class="title">
 				<view class="icon">
 
@@ -201,7 +201,7 @@
 			</view>
 		</view>
 		<!-- 数据分析 -->
-		<view class="data-analysis">
+		<view class="data-analysis"  v-if="meterDetail.type!=7" >
 			<view class="title">
 				<view class="icon">
 

pages/statistics/statistics.vue

@@ -1366,15 +1366,16 @@
 				}, 60000);
 			},
 			merchantChangeApi() {
-				this.popShow=false
-				
 				
+				this.popShow=false
+				this.getHomePageManageshowLoading=false;
+				this.meterList=[]
 				if (this.companyId) {
 					
 					if(this.companyId&&this.codes&&this.codes.indexOf('property')!=-1){
 						this.getTenantList(this.companyId)
 					}
-					this.getHomePageKwh(this.companyId)
+					this.getHomePageKwh(this.companyId,true)
 					this.getAbnormalAlarmRecord(this.companyId);
 					
 				}else{
@@ -1565,6 +1566,9 @@
 			},
 			
 			getHomePageManage(bl,companyId) {
+				if(this.myBarChart){
+					this.myBarChart.clear()
+				}
 				this.getHomePageManageReady=false
 				if(bl){
 					this.getHomePageManageshowLoading=false
@@ -1757,7 +1761,9 @@
 			},
 			// 累计报警
 			getDeviceStatus(companyId) {
-				 
+				 this.alarmsForm ={
+					 okNum:0,errorNum:0
+				 }
 				API.deviceStatus({
 					companyId: companyId
 				}).then((response) => {