From 644c0aea991eef832bc5dc684010eb4e67793647 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 23:55:06 +0800
Subject: [PATCH 1/3] 1

---
 pages/projectEnd/scan/saoSao.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/projectEnd/scan/saoSao.vue b/pages/projectEnd/scan/saoSao.vue
index 3630b9af..ccb84a96 100644
--- a/pages/projectEnd/scan/saoSao.vue
+++ b/pages/projectEnd/scan/saoSao.vue
@@ -5,7 +5,7 @@
 				巡检点信息
 			</view>
 		</headers>
-		<view class="content" :style="{ 'padding-top': (statusBarHeight+52) + 'px' }">
+		<view class="content" :style="{ 'margin-top': (statusBarHeight+52) + 'px' }">
 			<view class="splitTitle">
 				巡检信息
 			</view>

From 566fbd7571090e8abbb08bff50966987a20c67ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9DRain=E2=80=9C?= <904416525@qq.com>
Date: Sat, 25 May 2024 18:50:07 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=8A=A0=E6=89=AB=E7=A0=81=E6=9D=83?=
 =?UTF-8?q?=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/projectEnd/scan/saoSao.vue      | 8 +++++---
 pages/standardScheduleNews/detail.vue | 3 +++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pages/projectEnd/scan/saoSao.vue b/pages/projectEnd/scan/saoSao.vue
index ccb84a96..133e1215 100644
--- a/pages/projectEnd/scan/saoSao.vue
+++ b/pages/projectEnd/scan/saoSao.vue
@@ -185,6 +185,7 @@
 								longitude: res.longitude,
 								latitude: res.latitude,
 								userId: userInfo.userId,
+								xzCheckingRouteTaskId:this.form.id,
 							},
 							method: "GET",
 							success(res) {
@@ -198,9 +199,10 @@
 										buttonText: '确定',
 										success: function(res) {
 											if (res.confirm) {
-												uni.navigateTo({
-													url: '../projectIndex/projectIndex'
-												})
+												// uni.navigateTo({
+												// 	url: '../projectIndex/projectIndex'
+												// })
+												uni.navigateBack();
 											}
 										}
 									});
diff --git a/pages/standardScheduleNews/detail.vue b/pages/standardScheduleNews/detail.vue
index 1d22b516..4dcf58cf 100644
--- a/pages/standardScheduleNews/detail.vue
+++ b/pages/standardScheduleNews/detail.vue
@@ -12,6 +12,9 @@
 			<view class="type">
 				<view class="textColor">分部分项工程名称：<span class="textStyle">{{itemFrom.taskName}}</span></view>
 			</view>
+			<view class="type">
+				<view class="textColor">区域：<span class="textStyle">{{itemFrom.qualityRegionName}}</span></view>
+			</view>
 			<view class="type">
 				<view class="textColor">计划开始日期：<span class="textStyle">{{itemFrom.startDate}}</span></view>
 			</view>

From 686cf0b04d394faa88f7b312f5b1285192bdd697 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9DRain=E2=80=9C?= <904416525@qq.com>
Date: Sun, 26 May 2024 19:13:56 +0800
Subject: [PATCH 3/3] 1

---
 pages/projectEnd/emergencyDisposal/index.vue | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pages/projectEnd/emergencyDisposal/index.vue b/pages/projectEnd/emergencyDisposal/index.vue
index 54f2415f..7e2fd070 100644
--- a/pages/projectEnd/emergencyDisposal/index.vue
+++ b/pages/projectEnd/emergencyDisposal/index.vue
@@ -183,17 +183,15 @@
 		},
 		mounted() {
 			this.getTime()
-			// this.getListData();
-			// this.loadData();
-		},
-		onShow() {
-			this.dataList = [];
-			this.projectSn = JSON.parse(uni.getStorageSync('projectDetail')).projectSn;
-			this.statusBarHeight = uni.getStorageSync('systemInfo').statusBarHeight;
 			this.getListData();
 			// this.loadData();
 			this.getRecordList()
 		},
+		onShow() {
+			// this.dataList = [];
+			this.projectSn = JSON.parse(uni.getStorageSync('projectDetail')).projectSn;
+			this.statusBarHeight = uni.getStorageSync('systemInfo').statusBarHeight;
+		},
 		methods: {
 			//实时时间
 			getTime() {