Merge branch 'bjxz-rain' into bjxz-dev

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() {

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>
@@ -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();
 											}
 										}
 									});

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>