admin/zhgdyunapp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bjxz-rain' into bjxz-dev

Browse Source
This commit is contained in:
kun 2024-05-24 21:55:55 +08:00
commit d58922c17f
2 changed files with 42 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
pages/projectEnd/InspectionRoute/inspecteddetail.vue
View File

@ -4,9 +4,9 @@
<view class="headerName">
{{info.itemName}}
</view>
<view class="right" @click="getScanCode()">
<!-- <view class="right" @click="getScanCode()">
<image class="scancode" src="@/static/scancode.png" mode=""></image>
</view>
</view> -->
</headers>
<view class="content" :style="{ 'padding-top': (statusBarHeight+52) + 'px' }">
<view class="coordinate">
@ -25,7 +25,8 @@
</view>
</view>
<view class="coordinate-item">
<view :class="{'abnormal':item.inspectStatus == 2}" @click="onClickSelect(item)" 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>
@ -56,7 +57,7 @@
</view>
</view>
<view class="detail-main" v-for="item in checkingInfoList" :key="item.id">
<view class="title">
{{item.checkingPointName}}
@ -71,12 +72,18 @@
<view v-if="item.status == 2">异常详情:{{item.alarmDetails}}</view>
<view v-if="item.status == 2" class="detail-image">
异常图片:
<view v-if="item.alarmImage && JSON.parse(item.alarmImage).length > 0" >
<image v-for="ele in JSON.parse(item.alarmImage)" @click="previewImage(url_config+'image/'+ele.url)" :src="url_config+'image/'+ele.url" mode=""></image>
<view v-if="item.alarmImage && JSON.parse(item.alarmImage).length > 0">
<image v-for="ele in JSON.parse(item.alarmImage)"
@click="previewImage(url_config+'image/'+ele.url)" :src="url_config+'image/'+ele.url"
mode=""></image>
</view>
</view>
</view>
</view>
<view class="scancodebtn" @click="getScanCode()">
扫码巡检
</view>
</view>
</view>
</template>
@ -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;

4
pages/projectEnd/InspectionRoute/inspectedstay.vue
View File

@ -5,7 +5,7 @@
巡检任务
</view>
<view class="right">
<dateTimePiccker :placeholder="'请选择'" :start="startTime" fields="day" :default-value="condition.date"
<dateTimePiccker :placeholder="'请选择'" fields="day" :default-value="condition.date"
@change="bindPickerChange($event,'startTime')" class="dateTimePiccker">
</dateTimePiccker>
</view>
@ -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));