Merge branch 'master' of http://47.92.161.104:10080/zkx/jp-housekeep-manage

pages/equipmentDataMonitoring/electronicMonitoring.vue

@@ -86,7 +86,7 @@
 			</view>
 		</view>
 		<!-- 各时段用电量 -->
-		<view class="electricity-chart" v-if="meterDetail.type!=7">
+		<view class="electricity-chart" >
 			<view class="title">
 				<view class="icon">
 
@@ -236,7 +236,7 @@
 		</view>
 
 		<!-- 设备信息 -->
-		<view class="equipment-information">
+		<view class="equipment-information"  v-if="meterDetail.type!=7">
 			<view class="title">
 
 				<view class="icon">