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

pages/deductionRecord/deductionDetails.vue

@@ -143,7 +143,7 @@
 						
 					</template>
 					 
-					<template v-if="contractItem.id&&tenantBalanceRecord.remark=='公摊电费'&&tenantBalanceRecord.extraJson.sharedKwh!=null">
+					<template v-if="contractItem.id&&tenantBalanceRecord.extraJson.sharedKwh!=null">
 						
 						
 						<table class="table1" >
@@ -170,7 +170,7 @@
 							</tr>
 							
 							<tr>
-								<td class="td1">公摊电量</td>
+								<td class="td1">分摊电量</td>
 								<!-- <td></td> -->
 								<td class="td3" >{{(tenantBalanceRecord.extraJson.sharedKwh)}}度</td>
 							</tr>
@@ -202,7 +202,7 @@
 							</tr>
 						<tr style="font-weight: bold;color:#fff;background-color:#307af6 ;" >
 							
-								<td class="td1">租户公摊电量</td>
+								<td class="td1">租户分摊电量</td>
 								<!-- <td></td> -->
 								<td class="td3" >{{tenantBalanceRecord.extraJson.tenantSharedKwh}}度</td>
 							</tr>

pages/deductionRecord/deductionRecord.vue

@@ -319,7 +319,7 @@
 			extraInfoText(extraInfo){
 				var obj=JSON.parse(extraInfo)
 				if(obj.sharedKwh!=null){
-					return  `租户公摊电量合计${obj.tenantSharedKwh}度`
+					return  `租户分摊电量合计${obj.tenantSharedKwh}度`
 					
 				}else{
 					return  `起止码${obj.startMeter}-${obj.endMeter};<br/>合计${obj.kwh}度`

pages/statistics/statistics.vue

@@ -394,7 +394,7 @@
 			</view>
 
 			<!-- 统计2 异常告警记录 -->
-			<view class="statistics-2 statistics" >
+			<view class="statistics-2 statistics" v-if="codes&&codes.indexOf('property')!=-1" >
 				<view class="title">
 					<view class="icon">
 						<image class="img" src="@/assets/img/circleCopy1@1x.png" mode=""></image>
@@ -1192,7 +1192,11 @@
 			
 			// 异常告警记录
 			getAbnormalAlarmRecord() {
-				
+				if(this.codes&&this.codes.indexOf('property')!=-1){
+					
+				}else{
+					return
+				}
 				API.remindList({
 				//	queryDate: this.queryDateMonth,
 					configId: '',