优化列表显示，增加提示

pages/index/index.vue

@@ -147,7 +147,13 @@
 		<view class="main_list1 panel ">
 			<view class="top-main">
 				<view class="title-main">
-					故障未处理记录
+					故障未处理记录
+					<span v-if="dataerrRecordsTotal" class="badge">
+						
+						{{dataerrRecordsTotal}}
+					</span>
+
+
 
 
 				</view>
@@ -223,7 +229,11 @@
 		<view class="main_list1 panel ">
 			<view class="top-main">
 				<view class="title-main">
-					未巡检记录
+					未巡检记录
+					<span v-if="datainsRecordsTotal" class="badge">
+						
+						{{datainsRecordsTotal}}
+					</span>
 
 				</view>
 				<view class="goto-main" @click="gotoUrl('/pages/inspection/list')">
@@ -628,7 +638,9 @@
 		.title-main {
 			color: rgba(51, 51, 51, 1);
 			font-size: 32rpx;
-			font-weight: bold;
+			font-weight: bold;
+			display: flex;
+			align-items: center;
 		}
 
 		.goto-main {
@@ -936,5 +948,19 @@
 
 	.getHourDistanceArrNum24 {
 		color: #8161FF;
+	}
+	.badge{
+		//width: 40rpx;
+		//height: 40rpx;
+		background-color: red;
+		border-radius: 50px;
+		    display: inline-block;
+			padding: 2rpx 8rpx;
+			color: #fff;
+			    text-align: center;
+				font-size: 22rpx;
+				    display: flex;
+				    align-items: center;
+				
 	}
 </style>

pages/inspection/list.vue

@@ -53,6 +53,26 @@
 		
 						</view>
 						
+						<view  class="value"  v-if="getdaysDistance(item.lastInspectionTime,item.inspectionEndTime)=='-'"
+						
+						 style="color:#777777 ;" >
+						
+							
+						</view>
+						
+						<view  class="value"  v-else-if="getdaysDistance(item.lastInspectionTime,item.inspectionEndTime)<5"
+						 style="color:#FF7B00 ;" >
+						
+							{{getdaysDistance(item.lastInspectionTime,item.inspectionEndTime)}}天后到期
+						
+						</view>
+						
+						<view   class="value" v-else  style="color: #EE3138 ;" >
+						
+							已逾期
+						
+						
+						</view>
 						
 					</view>
 					<view class="line2" v-if="item.status==1"  >
@@ -87,7 +107,7 @@
 	import {
 	
 		currentTimeStamp,
-		parseUnixTime,newDate,nextMonth
+		parseUnixTime,newDate,nextMonth,daysDistance
 	} from '@/apis/utils'
 	export default {
 		data() {
@@ -153,6 +173,13 @@
 			}
 		},
 		methods: {
+			getdaysDistance(time1, time2) {
+				if (!time1) {
+					return '-'
+				}
+			
+				return daysDistance(time1, time2)
+			},
 			testBtn() {
 			
 				this.queryName=this.testName

pages/task/listTask.vue

@@ -62,7 +62,7 @@
 					
 					<view class="line2">
 						<view class="value" v-if="item.deviceName">
-							设备编号 {{item.deviceName}}
+							设备编号 {{item.deviceName}}<span style="margin: 0 8rpx;">|</span>{{item.deviceNo}}
 		
 						</view>
 						<view class="value">
@@ -71,13 +71,29 @@
 						</view>
 						<view class="value">
 							上报时间 {{item.errorReportTime}} 
-						</view>
-						<view class="value" v-if="item.status==1">
-							处理时间 {{item.repairTime}} 
+							<span   class="value"  v-if="getHourDistanceArr(item)==0" :class="{
+								getHourDistanceArrNum10:true,
+							
+							}">
+							
+							</span>
+							<span  class="value"  v-else :class="{
+								getHourDistanceArrNum10:true,
+								getHourDistanceArrNum12:getHourDistanceArr(item)>12,
+								getHourDistanceArrNum24:getHourDistanceArr(item)>24,
+							}">
+								(超{{getHourDistanceArr(item) }}小时)
+								</span>
+								
 						</view>
 						<view class="value"  v-if="item.status==1">
 							处理人员 {{item.repairNames}} 
 						</view>
+						<view class="value" v-if="item.status==1">
+							处理时间 {{item.repairTime}} 
+							
+						</view>
+						
 						
 					</view>
 					
@@ -116,7 +132,7 @@
 	import {
 	
 		currentTimeStamp,
-		parseUnixTime,newDate,nextMonth
+		parseUnixTime,newDate,nextMonth,hourDistanceArr
 	} from '@/apis/utils'
 	
 	export default {
@@ -197,6 +213,27 @@
 			}
 		},
 		methods: {
+			getHourDistanceArr(item) {
+				var time=item.errorReportTime;
+				if (!item.errorReportTime) {
+					return '-'
+				}
+				var  key="";
+				if(item.repairTime){
+					key=hourDistanceArr(time, newDate(item.repairTime))[0]
+					
+				}else{
+					key=hourDistanceArr(time, new Date())[0]
+					
+				}
+				
+				
+				
+				
+				return  key
+			
+			
+			},
 			testBtn() {
 				this.queryName=this.testName
 				this.listForm.queryContent=this.queryName
@@ -505,4 +542,16 @@
 						font-size: 36rpx;
 				}
 		}
+		
+		.getHourDistanceArrNum10 {
+			color: #FF7B00;
+		}
+		
+		.getHourDistanceArrNum12 {
+			color: red;
+		}
+		
+		.getHourDistanceArrNum24 {
+			color: #8161FF;
+		}
 </style>

pages/task/maintenanceTaks.vue

@@ -72,7 +72,18 @@
 					<u-icon name="arrow-right" size="24" color="#BBBBBB"></u-icon>
 				</view>
 			</view>
-
+			<view class="item" @click="gotoUrl('/pages/station/stationInfo?id='+errorRecord.stationId)">
+				<view class="name">
+					所属设备
+			
+				</view>
+				<view class="value ">
+					
+						{{errorRecord.deviceName}}
+					{{errorRecord.deviceNo}}
+					
+				</view>
+			</view>
 
 			<view class="item">
 				<view class="name">