修复：巡更人员、巡更路径

subPackWork/electronicPatrol/electronicPatrol.vue

@@ -37,14 +37,15 @@ export default {
 		};
 	},
 	onShow() {
+		
+	},
+	mounted() {
+		//this.getList();
 		let now = new Date();
 		this.nowTime = now.getHours() + ':' + now.getMinutes()
 		 this.patrolDate = formatDate(now)
 		 this.getPatrollingTaskData()
 	},
-	mounted() {
-		//this.getList();
-	},
 	methods: {
 		//打卡
 		signIn(val){

subPackWork/electronicPatrol/patrolTrack.vue

@@ -8,9 +8,9 @@
 					<text class="detail-title big-font">{{ pointDetail.patrolPointName }}</text>
 					<text class="detail-status small-font" :class="pointDetail.checkDate != ''?'detail-status-on':'detail-status'">{{ pointDetail.checkDate != '' ? '已打卡' : '未打卡' }}</text>
 				</view>
-				<view class="detail-box">
+				<view class="detail-box"> 
 					<view>开始时间：{{ pointDetail.patrolDate }}</view>
-					<view>开始时间：{{ pointDetail.checkDate }}</view>
+					<view>打开时间：{{ pointDetail.checkDate }}</view>
 					<view>打卡方式：{{ pointDetail.checkInWay }}</view>
 				</view>
 			</view>
@@ -224,17 +224,25 @@ export default {
 		},
 
 		markertap(val) {
-			console.log(val);
-			//模拟点位数据
-			this.pointDetail = {
-				patrolDate: '2023-03-03 09:10',
-				patrolPointName: '嵩山打卡点3',
-				checkDate: '2023-03-03 15:31:24',
-				longitude: '114.14',
-				dimension: '38.52',
-				checkInWay: '扫码,刷脸'
-			};
-			this.$refs.popup.open('bottom');
+			console.log(val); 
+					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
+					};
+					this.$refs.popup.open('bottom');
+			  
+			// this.pointDetail = {
+			// 	patrolDate: '2023-03-03 09:10',
+			// 	patrolPointName: '嵩山打卡点3',
+			// 	checkDate: '2023-03-03 15:31:24',
+			// 	longitude: '114.14',
+			// 	dimension: '38.52',
+			// 	checkInWay: '扫码,刷脸'
+			// };
+			// this.$refs.popup.open('bottom');
 		},
 		// 巡更轨迹
 		getPatrollingTrajectory(){
@@ -262,7 +270,7 @@ export default {
 					 		longitude: item.longitude,
 					 		width: 20,
 					 		height: 30,
-					 		id: index + 1,
+					 		id: index,
 					 		alpha: 0.7,
 					 		// #ifdef  H5
 					 		iconPath: '../../../static/activity_pin.png'

subPackWork/equipmentManagement/equipmentDetails.vue

@@ -10,7 +10,7 @@
 				<view class="content-detail">
 					<uni-list>
 						<uni-list-item title="设备类型" :rightText="datas.type" />
-						<uni-list-item title="设备名称" :rightText="datas.devModelName" />
+						<uni-list-item title="设备名称" :rightText="datas.resourceName" />
 						<uni-list-item title="设备编码" :rightText="datas.resourceCode" />
 						<uni-list-item title="设备品牌" :rightText="datas.devBrandName" />
 						<uni-list-item title="规格型号" :rightText="datas.devModelName" />
@@ -155,8 +155,7 @@
 			getEnquipmentDetail(id, type) {
 				getEnquipmentDetail(id, type).then(res => {
 					if (res.code === 200) {
-						this.datas = res.data
-						console.log(res)
+						this.datas = res.data 
 						if (this.datas.coverImg) {
 							this.datas.coverImg.split(',').forEach(item => {
 								this.imgs.push(baseUrl + item)