改字

pages/deductionRecord/billingRules.vue

@@ -109,7 +109,7 @@
 						
 					</view>
 					
-					<view class="contentRule1" style="margin-top: 20rpx;"  v-for="(it,j) in item.contractItemList"  v-if="it.periodPriceList">
+					<view class="contentRule1" style="margin-top: 20rpx;"  v-for="(it,j) in item.contractItemList"  :key="j"  v-if="it.periodPriceList">
 						<template >
 						<view>收费标准-{{it.name}}  ({{it.unit}})</view>
 						<u-table>

pages/deductionRecord/deductionDetails.vue

@@ -160,8 +160,8 @@
 							<tr>
 								<td class="td1">楼层电量</td>
 								<td class="td3" >{{tenantBalanceRecord.extraJson.totalKwh}}度
-								<!-- <span v-if="tenantBalanceRecord.extraJson.lineLoss">(其中线损电量:{{tenantBalanceRecord.extraJson.lineLoss}}度)</span>
-								 --></td>
+								<span v-if="tenantBalanceRecord.extraJson.lineLoss">(其中线损电量:{{tenantBalanceRecord.extraJson.lineLoss}}度)</span>
+								</td>
 							</tr>
 							<tr>
 								<td class="td1">收费电量</td>

pages/mine/feedbackRecord.vue

@@ -15,7 +15,7 @@
 			</view>
 			
 			<view class="picture">
-				<image class="img" src="../../assets/img/feedbackPic.png" v-for="item in 4"  mode=""></image>
+				<image class="img" src="../../assets/img/feedbackPic.png"  mode=""></image>
 			</view>
 		</view>
 		<!-- 底部 -->

pages/statistics/statistics.vue

@@ -452,7 +452,7 @@
 					本年度共有<text> 42</text>次设备异常告警
 				</view>
 				<view class="ranking-main">
-					<view class="item" v-for="item in 3"
+					<view class="item" v-for="(item,i) in 3" :key="i"
 						@click="gotoUrl('/pages/equipmentDataMonitoring/electronicMonitoring?id='+'&name=')">
 						<view class="ranking">
 							1

pages/test/workOrderManagement/workOrderDetails.vue

@@ -131,7 +131,7 @@
 								<view class="u-order-title"> <text class="name">郭群 </text>完成工单</view>
 								<view class="u-order-desc">处理结果：冻雨天气导致私变线路问题，已解决。</view>
 								<view class="u-order-picture">
-									<image v-for="item in 4" class="img" src="@/assets/img/pImage@1x.png" mode="">
+									<image  class="img" src="@/assets/img/pImage@1x.png" mode="">
 									</image>
 								</view>
 								<view class="u-order-time">2019-05-08 12:12</view>

pages/timing/autoOff.vue

@@ -65,7 +65,7 @@
 				
 				<view class="time">
 					 <view class="time-slot" >
-						智能停电时间段
+						智能停电时间区间
 						
 					 </view>
 					 <view class="type">
@@ -125,7 +125,7 @@
 			 @click="thresholdsPopup=true" >
 				<view class="time">
 					<view class="time-slot">
-						最大功率阈值
+						智能停电条件
 					</view>
 					<view class="type">
 						{{formData.maxPower!=''?formData.maxPower+'kW':'未设置'}}
@@ -144,8 +144,9 @@
 				<view class="time">
 					
 					<view class="type">
-						1. 功率达到最大阈值时“自动停电”；<br/>
-						2.“智能停电”结束时，如果处于停电状态将打开电源供电；
+						1. 智能停电条件：智能停电是功率大于等于阈值持续达到一定时间后；<br/>
+						2. 达到智能停电条件后“自动停电”，1分钟后回复电源供电；<br/>
+						3.“智能停电”结束时，如果处于停电状态将打开电源供电；
 
 					</view>
 				</view>
@@ -316,11 +317,11 @@
 
 			</view>
 		</u-popup>
-		<!-- 最大功率阈值 -->
+		 
 		<u-popup v-model="thresholdsPopup" mode="bottom">
 			<view class="thresholds">
 				<view class="headline">
-					最大功率阈值(kW)
+					智能停电条件：功率(kW)
 				</view>
 				<view class="input" style=" padding: 0 24rpx;">
 				  	<u-input type="digit" min="1"
@@ -641,7 +642,7 @@ import {
 				
 				}else{
 					uni.showToast({
-						title: "请填写最大功率阈值（kw）",
+						title: "请填写智能停电条件：功率（kw）",
 						icon: "none"
 					})
 				}
@@ -730,7 +731,7 @@ import {
 						
 						
 						uni.showToast({
-							title: "请设置智能停电时间段",
+							title: "请设置智能停电时间区间",
 							icon: "none"
 						})
 						return
@@ -786,7 +787,7 @@ import {
 				}
 				if(this.formData.switchStatus==3&&this.maxPower==''){
 					uni.showToast({
-						title: "请填写最大功率阈值（kw）",
+						title: "请填写智能停电条件：功率（kw）",
 						icon: "none"
 					})
 					return

pages/timing/timing.vue

@@ -14,7 +14,7 @@
 		</u-navbar>
 		<view class="time-group">
 			<checkbox-group @change="checkboxChange">
-				<view class="time-item" v-for="(item,i) in timerSwitchList">
+				<view class="time-item" v-for="(item,i) in timerSwitchList" :key="i" >
 					<view class="time" @click="clicksheetInfo(item)">
 						<view class="time-slot">
 							{{item.startTime}}