diff --git a/pages/projectEnd/InspectionRoute/inspecteddetail.vue b/pages/projectEnd/InspectionRoute/inspecteddetail.vue index 0c2ac424..2c427f36 100644 --- a/pages/projectEnd/InspectionRoute/inspecteddetail.vue +++ b/pages/projectEnd/InspectionRoute/inspecteddetail.vue @@ -4,9 +4,9 @@ {{info.itemName}} - + @@ -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(); - this.getcheckingInfo(); + }, //上拉触底时间 onReachBottom() { @@ -139,30 +146,32 @@ success: res => { console.log(res.result.records); that.checkingList = res.result.records; + this.checkingInfoDetail = res.result.records[0]; + this.getcheckingInfo(); } }) }, - 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', method: 'post', data: { projectSn: this.projectSn, - // xzCheckingRouteTaskId: this.info.id, - checkingPointId:this.checkingInfoDetail.id, - // checkingPointUserId: this.info.xzCheckingRoute.inspectUserIds, + xzCheckingRouteTaskId: this.info.id, + checkingPointId: this.checkingInfoDetail.id, + // checkingPointUserId: this.checkingInfoDetail.inspectUserIds, pageNo: that.pageNo, - pageSize: that.pageSize, + pageSize: that.pageSize, }, success: res => { console.log(res); @@ -249,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; 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));