From e919faf2859f838402fdc5537b01c5ba1c4b7625 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:45:09 +0800
Subject: [PATCH 1/2] 1
---
pages/projectEnd/InspectionRoute/inspecteddetail.vue | 8 +++++---
pages/projectEnd/InspectionRoute/inspectedstay.vue | 4 ++--
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/pages/projectEnd/InspectionRoute/inspecteddetail.vue b/pages/projectEnd/InspectionRoute/inspecteddetail.vue
index 0c2ac424..2d0c4dbd 100644
--- a/pages/projectEnd/InspectionRoute/inspecteddetail.vue
+++ b/pages/projectEnd/InspectionRoute/inspecteddetail.vue
@@ -115,7 +115,7 @@
this.projectSn = JSON.parse(uni.getStorageSync('projectDetail')).projectSn;
console.log(options);
this.getcheckingList();
- this.getcheckingInfo();
+
},
//上拉触底时间
onReachBottom() {
@@ -139,6 +139,8 @@
success: res => {
console.log(res.result.records);
that.checkingList = res.result.records;
+ this.checkingInfoDetail = res.result.records[0];
+ this.getcheckingInfo();
}
})
},
@@ -158,9 +160,9 @@
method: 'post',
data: {
projectSn: this.projectSn,
- // xzCheckingRouteTaskId: this.info.id,
+ xzCheckingRouteTaskId: this.info.id,
checkingPointId:this.checkingInfoDetail.id,
- // checkingPointUserId: this.info.xzCheckingRoute.inspectUserIds,
+ // checkingPointUserId: this.checkingInfoDetail.inspectUserIds,
pageNo: that.pageNo,
pageSize: that.pageSize,
},
diff --git a/pages/projectEnd/InspectionRoute/inspectedstay.vue b/pages/projectEnd/InspectionRoute/inspectedstay.vue
index 28ff5e34..300a0587 100644
--- a/pages/projectEnd/InspectionRoute/inspectedstay.vue
+++ b/pages/projectEnd/InspectionRoute/inspectedstay.vue
@@ -5,7 +5,7 @@
巡检任务
-
@@ -144,7 +144,6 @@
methods: {
//获取进度数据
getListData() {
-
let that = this;
this.sendRequest({
url: 'xmgl/xzCheckingRouteTask/page',
@@ -152,6 +151,7 @@
data: {
...that.condition,
isInspect: that.tabIndex,
+ date:this.condition.date,
},
success: res => {
let arr = JSON.parse(JSON.stringify(this.listData));
From 48b0902b90199f815216b2061b50fe8145ce0942 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:53:53 +0800
Subject: [PATCH 2/2] 1
---
.../InspectionRoute/inspecteddetail.vue | 53 +++++++++++++------
1 file changed, 36 insertions(+), 17 deletions(-)
diff --git a/pages/projectEnd/InspectionRoute/inspecteddetail.vue b/pages/projectEnd/InspectionRoute/inspecteddetail.vue
index 2d0c4dbd..2c427f36 100644
--- a/pages/projectEnd/InspectionRoute/inspecteddetail.vue
+++ b/pages/projectEnd/InspectionRoute/inspecteddetail.vue
@@ -4,9 +4,9 @@
-
+
@@ -25,7 +25,8 @@
-
+
{{item.checkingPointName}}
@@ -56,7 +57,7 @@
-
+
{{item.checkingPointName}}
@@ -71,12 +72,18 @@
异常详情:{{item.alarmDetails}}
异常图片:
-
-
+
+
+
+
+ 扫码巡检
+
@@ -100,11 +107,11 @@
statusName: "异常",
image: "/static/inspectelcon-abnormal.png",
}],
- checkingInfoList:[],
- checkingInfoDetail:{
- id:"",
+ checkingInfoList: [],
+ checkingInfoDetail: {
+ id: "",
},
- statusBarHeight:0,
+ statusBarHeight: 0,
pageNo: 1,
pageSize: 10,
}
@@ -115,7 +122,7 @@
this.projectSn = JSON.parse(uni.getStorageSync('projectDetail')).projectSn;
console.log(options);
this.getcheckingList();
-
+
},
//上拉触底时间
onReachBottom() {
@@ -144,16 +151,16 @@
}
})
},
- onClickSelect(item){
- this.pageNo= 1;
- this.pageSize= 10;
+ 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',
@@ -161,10 +168,10 @@
data: {
projectSn: this.projectSn,
xzCheckingRouteTaskId: this.info.id,
- checkingPointId:this.checkingInfoDetail.id,
+ checkingPointId: this.checkingInfoDetail.id,
// checkingPointUserId: this.checkingInfoDetail.inspectUserIds,
pageNo: that.pageNo,
- pageSize: that.pageSize,
+ pageSize: that.pageSize,
},
success: res => {
console.log(res);
@@ -251,6 +258,18 @@
}
}
+ .scancodebtn {
+ padding: 20rpx 20rpx;
+ background-color: #2b8df3;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-size: 32rpx;
+ color: white;
+ border-radius: 16rpx;
+ margin-top: 160rpx;
+ }
+
.content {
padding: 0 26rpx 15%;
box-sizing: border-box;