虚拟电表， 统计电表显示调整

components/tree/tree-node.vue

@@ -20,11 +20,11 @@
 			 
 			
 			  <view class="meter-number" v-if="(node.level==0&&showPark)||node.level!=0"
-			   :style="node.type==6?'padding-right: 36rpx;':''"
+			 
 			   @click="toElectronicMonitoring(node)">
 				{{node.kwh}}度
 				
-				<u-icon name="arrow-right" v-if="node.type!=6"
+				<u-icon name="arrow-right" 
 				color="#d4d4d4" size="24"></u-icon>
 				
 			  </view>
@@ -202,12 +202,13 @@ export default {
 	  },
 	  toElectronicMonitoring(item) {
 		  if(item.type!=6){
-			  uni.navigateTo({
-			  	url: '/pages/equipmentDataMonitoring/electronicMonitoring?id=' + item.id + '&name=' + item
-			  		.name +
-			  		'&companyId=' + item.companyId
-			  })
+			 
 		  }
+		  uni.navigateTo({
+		  	url: '/pages/equipmentDataMonitoring/electronicMonitoring?id=' + item.id + '&name=' + item
+		  		.name +
+		  		'&companyId=' + item.companyId
+		  })
 	  
 	  },
 	  query(item){

pages/equipmentDataMonitoring/electronicMonitoring.vue

@@ -90,7 +90,7 @@
 			</view>
 		</view>
 		<!-- 各时段用电量 -->
-		<view class="electricity-chart"  v-if="meterDetail.type!=7" >
+		<view class="electricity-chart"   >
 			<view class="title">
 				<view class="icon">
 
@@ -168,7 +168,7 @@
 		</view>
 
 		<!-- 能源监测 -->
-		<view class="energy-inspection"  v-if="meterDetail.type!=7" >
+		<view class="energy-inspection" v-if="meterDetail.type!=7&&meterDetail.type!=6"  >
 			<view class="title">
 				<view class="icon">
 
@@ -220,7 +220,7 @@
 			</view>
 		</view>
 		<!-- 数据分析 -->
-		<view class="data-analysis"  v-if="meterDetail.type!=7" >
+		<view class="data-analysis"  v-if="meterDetail.type!=7&&meterDetail.type!=6" >
 			<view class="title">
 				<view class="icon">
 
@@ -255,7 +255,7 @@
 		</view>
 
 		<!-- 设备信息 -->
-		<view class="equipment-information"  v-if="meterDetail.type!=7">
+		<view class="equipment-information" v-if="meterDetail.type!=7&&meterDetail.type!=6" >
 			<view class="title">
 
 				<view class="icon">
@@ -638,6 +638,7 @@
 				}
 			},
 			startInterval() {
+				return
 				this.clearTimer(); // 组件销毁前清除定时器 
 				this.intervalId = setInterval(() => {
 					// 每隔5秒运行的代码