调整：电子巡更 逾期

subPackWork/electronicPatrol/electronicPatrol.vue

@@ -45,7 +45,7 @@ export default {
 	mounted() {
 		 this.getDateWithData();
 		//this.getList();
-		let now = new Date();
+		let now = new Date(); 
 		this.nowTime = now.getHours() + ':' + now.getMinutes();
 		 this.patrolDate = formatDate(now);
 		 this.getPatrollingTaskData();
@@ -121,14 +121,18 @@ export default {
 			let data ={
 				"patrolDate": this.patrolDate,
 			}
+			let now = new Date();
+	
 			getPatrollingTaskData(data).then(res =>{
 				 if(res.code == 200){
 					 this.jobList =res.rows
 					 if (this.jobList.length > 0) {
 					 	this.jobList.forEach((item) => {
-					 		let now = new Date();
-					 		let nowStr = now.getHours() + ':' + now.getMinutes();
-					 		let timeStr = item.startDate;
+					 		
+					 		let nowStr = (formatDate(now) +" "+now);
+					 		let timeStr = (this.patrolDate+ " "+ item.startDate);
+							
+						 
 					 		let obj = {
 					 			statusDesign: '即将开始'
 					 		};

subPackWork/electronicPatrol/taskDetails.vue

@@ -33,7 +33,9 @@
 						开始时间：{{item.startDate}}
 					</view>
 					<view >
-						<button @click="clockIn(item)" :class="[item.finishDate==''?'unfinish-btn':'finish-btn','task-btn']" :disabled="item.finishDate!='' && item.finishDate != null">{{item.finishDate=='' || item.finishDate == null?'打卡':'已打卡'}} </button>
+						<button v-if="nowDate == patrolDate" @click="clockIn(item)" :class="[item.finishDate==''?'unfinish-btn':'finish-btn','task-btn']" :disabled="item.finishDate!='' && item.finishDate != null">{{item.finishDate=='' || item.finishDate == null?'打卡':'已打卡'}} </button>
+					<button  v-else :class="['finish-btn','task-btn']" disabled="true">{{item.finishDate=='' || item.finishDate == null?'已逾期':'已打卡'}} </button>
+					
 					</view>
 				</view>
 			</view>
@@ -65,8 +67,8 @@ export default {
 		let patrolDate = option.patrolDate;
 		this.taskId = id;
 		this.patrolDate = patrolDate;
-		 let now = new Date(); 
-		 console.log(formatDate(now))
+		 let now = new Date();  
+		 this.nowDate = formatDate(now)
 		this.getPatrollingTaskDetail();
 	},
 	methods:{
@@ -76,7 +78,6 @@ export default {
 			})
 		},
 		goLine(val){
-			console.log(val)
 			uni.navigateTo({
 				url:'patrolTrack?id='+val+'&patrolDate='+this.patrolDate
 			})
@@ -97,7 +98,6 @@ export default {
 			  let myDate = new Date();
 			  let str = myDate.toTimeString(); //"10:55:24 GMT+0800 (中国标准时间)"
 			  let timeStr = str.substring(0,8); //  '10:55:24'
-			  console.log(timeStr)
 			  if(val.startDate >timeStr){
 				  uni.showToast({
 				  	title:"尚未到打卡时间",
@@ -127,7 +127,6 @@ export default {
 				"dimension":res.latitude
 				
 			} 
-			console.log(data)
 			patrollingClock(data).then(res =>{
 				if(res.code == 200){