租户预警需求调整

pages/equipmentDataMonitoring/electronicMonitoring.vue

@@ -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">
 

pages/statistics/statistics.vue

@@ -1132,10 +1132,14 @@
 						// if(tenant1.autoDeductFee!=true){
 						// 	continue; 
 						// }
-						if(selectType1==0){
+						if(selectType1==0){
+							
 							return true
 						}
-						if(selectType1==1){
+						if(selectType1==1){
+							if(tenant1.autoDeductFee!=true){
+								continue; 
+							}
 							return tenant.balance<tenant.minBalance
 						}
 						for(var k in tenant1.contractItemList){

pages/tenantList/contractList.vue

@@ -213,6 +213,9 @@
 								 bl=true
 							}
 							if(selectType1==1){
+								if(tenant1.autoDeductFee!=true){
+									continue; 
+								}
 								return tenant.balance<tenant.minBalance
 							}
 							if(item.paymentMethod==1&&item.name!='电费'){