调整： 样式

pages/work/index.vue

@@ -72,7 +72,7 @@
 							</template>
 						</common-title>
 						<view class="v-index-event">
-							<view v-for="(event,index) in sonEvent" class="v-event-item">
+							<view v-for="(event,index) in sonEvent" class="v-event-item" @click="toSchedulingDetail(event)">
 								<view class="v-event-box">
 									<span class="big-font g-blue">{{ event.value }}</span>
 									{{event.name}}
@@ -560,6 +560,7 @@
 					}
 				})
 			},
+			// 告警方式
 			getAlartWayData() {
 				let _that = this;
 				getAlartWayData().then(res => {
@@ -652,6 +653,9 @@
 			changeSwiper(e) {
 				this.current = e.detail.current;
 			},
+			toSchedulingDetail(val){
+				console.log(val)
+			},
 			changeGrid(e) {
 				console.log(e)
 				switch (e.detail.index) {

subPackDeatil/resourceStatistics/resourceDetail.vue

@@ -240,6 +240,7 @@ export default {
 	  
 	  dataSynchronousImageUrl(data){
 		  this.detail = data;
+		  console.log(data)
 		  if(data.imageUrl){
 			  this.imageArr =[]
 			  const arr = data.imageUrl.split(',')

subPackWork/electronicPatrol/patrolTrack.vue

@@ -9,8 +9,8 @@
 					<text class="detail-status small-font" :class="pointDetail.checkDate != ''?'detail-status-on':'detail-status'">{{ pointDetail.checkDate != '' ? '已打卡' : '未打卡' }}</text>
 				</view>
 				<view class="detail-box"> 
-				<!-- 	<view>开始时间：{{ pointDetail.patrolDate }}</view> -->
-					<view>打开时间：{{ pointDetail.checkDate }}</view>
+					<view>开始时间：{{ pointDetail.patrolDate }}</view>
+					<view>打卡时间：{{ pointDetail.checkDate }}</view>
 					<view>打卡方式：{{ pointDetail.checkInWay }}</view>
 				</view>
 			</view>
@@ -225,12 +225,14 @@ export default {
 
 		markertap(val) {
 			console.log(val); 
+			console.log(this.datas)
 					this.pointDetail = { 
 						patrolPointName: this.datas[val.detail.markerId].patrolPointName,
 						checkDate: this.datas[val.detail.markerId].checkDate,
 						longitude: this.datas[val.detail.markerId].longitude,
 						dimension: this.datas[val.detail.markerId].dimension,
-						checkInWay: this.datas[val.detail.markerId].checkInWay
+						checkInWay: this.datas[val.detail.markerId].checkInWay,
+						patrolDate: this.datas[val.detail.markerId].patrolDate
 					};
 					this.$refs.popup.open('bottom');
 			  

subPackWork/electronicPatrol/taskDetails.vue

@@ -34,13 +34,13 @@
 					</view>
 					<view >
 						<view>
-							{{nowDate}}{{patrolDate}}
+							
 							<template v-if="(nowDate == patrolDate)">
 								<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>
 								
 							</template>
 							<template v-else>
-								<button   :class="['finish-btn','task-btn']" disabled="true">{{item.finishDate=='' || item.finishDate == null?'已逾期':'已打卡'}} </button>
+								<button   :class="['finish-btn','task-btn']" disabled="true">{{item.finishDate=='' || item.finishDate == null?'未完成':'已打卡'}} </button>
 								
 							</template>
 						</view>