From 2e1de42595a1c8a56528b967771bd7479e307a46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9DRain=E2=80=9C?= <904416525@qq.com>
Date: Fri, 24 May 2024 21:04:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A1=E6=A3=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../InspectionRoute/inspecteddetail.vue       | 31 +++++++++++++++----
 .../InspectionRoute/inspectedstay.vue         | 10 +++---
 pages/projectEnd/scan/saoSao.vue              |  5 ++-
 3 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/pages/projectEnd/InspectionRoute/inspecteddetail.vue b/pages/projectEnd/InspectionRoute/inspecteddetail.vue
index 401d7441..0c2ac424 100644
--- a/pages/projectEnd/InspectionRoute/inspecteddetail.vue
+++ b/pages/projectEnd/InspectionRoute/inspecteddetail.vue
@@ -25,7 +25,7 @@
 					</view>
 				</view>
 				<view class="coordinate-item">
-					<view :class="{'abnormal':item.inspectStatus == 2}" v-for="item in checkingList" :key="item.id">
+					<view :class="{'abnormal':item.inspectStatus == 2}" @click="onClickSelect(item)" v-for="item in checkingList" :key="item.id">
 						<image :src="statusList[item.inspectStatus].image" mode=""></image>
 						<text>{{item.checkingPointName}}</text>
 					</view>
@@ -101,7 +101,12 @@
 					image: "/static/inspectelcon-abnormal.png",
 				}],
 				checkingInfoList:[],
+				checkingInfoDetail:{
+					id:"",
+				},
 				statusBarHeight:0,
+				pageNo: 1,
+				pageSize: 10,
 			}
 		},
 		onLoad(options) {
@@ -112,6 +117,11 @@
 			this.getcheckingList();
 			this.getcheckingInfo();
 		},
+		//上拉触底时间
+		onReachBottom() {
+			this.pageNo = this.pageNo + 1;
+			this.getcheckingInfo();
+		},
 		methods: {
 			getcheckingList() {
 				let that = this;
@@ -132,8 +142,16 @@
 					}
 				})
 			},
+			onClickSelect(item){
+				this.pageNo= 1;
+				this.pageSize= 10;
+				this.checkingInfoList = [];
+				this.checkingInfoDetail = item;
+				this.getcheckingInfo();
+			},
 			getcheckingInfo() {
 				let that = this;
+			
 				//获取我整改的巡查记录详情
 				this.sendRequest({
 					url: 'xmgl/checkingPointInfo/selectPage',
@@ -141,25 +159,26 @@
 					data: {
 						projectSn: this.projectSn,
 						// xzCheckingRouteTaskId: this.info.id,
-						checkingPointId:"",
+						checkingPointId:this.checkingInfoDetail.id,
 						// checkingPointUserId: this.info.xzCheckingRoute.inspectUserIds,
-						pageNo: 1,
-						pageSize: 10,
+						pageNo: that.pageNo,
+						pageSize:  that.pageSize,
 					},
 					success: res => {
 						console.log(res);
-						that.checkingInfoList = res.result.records;
+						that.checkingInfoList = this.checkingInfoList.concat(res.result.records);
 					}
 				})
 			},
 
 			getScanCode() {
+				const that = this;
 				uni.scanCode({
 					scanType: ['qrCode'],
 					success: function(res) {
 						console.log('扫一扫得到的数据：' + res.result)
 						uni.navigateTo({
-							url: '../scan/saoSao?data=' + res.result
+							url: `../scan/saoSao?data=${res.result}&id=${that.info.id}`
 						})
 
 						// let qrcodeVal=JSON.parse(res.result)
diff --git a/pages/projectEnd/InspectionRoute/inspectedstay.vue b/pages/projectEnd/InspectionRoute/inspectedstay.vue
index 5699ad0b..28ff5e34 100644
--- a/pages/projectEnd/InspectionRoute/inspectedstay.vue
+++ b/pages/projectEnd/InspectionRoute/inspectedstay.vue
@@ -32,21 +32,21 @@
 					</view>
 					<view>
 						<text>巡检点情况:</text>
-						<text>{{item.taskToInspectUser ? (item.taskToInspectUser.normalCheckingPointNum + item.taskToInspectUser.abnormalCheckingPointNum) : 0}}/{{item.taskToInspectUser ? item.taskToInspectUser.checkingPointNum : 0}}</text>
+						<text>{{(item.normalCheckingPointNum + item.abnormalCheckingPointNum)}}/{{item.checkingPointNum ? item.checkingPointNum : 0}}</text>
 					</view>
 				</view>
 				<view class="item-box">
 					<view>
 						<text>正常点位:</text>
-						<text>{{item.taskToInspectUser ? item.taskToInspectUser.normalCheckingPointNum : 0}}</text>
+						<text>{{item.normalCheckingPointNum ? item.normalCheckingPointNum : 0}}</text>
 					</view>
 					<view>
 						<text>异常点位:</text>
-						<text>{{item.taskToInspectUser ? item.taskToInspectUser.abnormalCheckingPointNum : 0}}</text>
+						<text>{{item.abnormalCheckingPointNum ? item.abnormalCheckingPointNum : 0}}</text>
 					</view>
 				</view>
-				<view class="status" :style="`background-color: ${item.taskToInspectUser && statusList[item.taskToInspectUser.inspectStatus - 1].color};`">
-					{{item.taskToInspectUser && statusList[item.taskToInspectUser.inspectStatus - 1].statusName}}
+				<view class="status" :style="`background-color: ${item.inspectStatus && statusList[item.inspectStatus - 1].color};`">
+					{{item.inspectStatus && statusList[item.inspectStatus - 1].statusName}}
 				</view>
 			</view>
 		</view>
diff --git a/pages/projectEnd/scan/saoSao.vue b/pages/projectEnd/scan/saoSao.vue
index 70e3835d..fcb2e605 100644
--- a/pages/projectEnd/scan/saoSao.vue
+++ b/pages/projectEnd/scan/saoSao.vue
@@ -111,7 +111,9 @@
 		onLoad(e) {
 			this.checkOpenGPSServiceByAndroid()
 			console.log(e.data,'我的测试数据')
+			console.log(e,'我的测试数据')
 			this.sendData = JSON.parse(e.data);
+			this.form.id = e.id;
 			uni.showLoading({
 				title: "获取数据中"
 			})
@@ -326,7 +328,8 @@
 						position: this.form.posiTion,
 						status: this.form.status,
 						template: JSON.stringify(this.form.templateList),
-						updateDate: ""
+						updateDate: "",
+						xzCheckingRouteTaskId:this.form.id,
 					},
 
 					method: "POST",