|
@ -277,11 +277,9 @@ Page({ |
|
|
title: '加载中' |
|
|
title: '加载中' |
|
|
}) |
|
|
}) |
|
|
Request.get(getPatrolRecord(dataList.id, 'null', 'null', 'null', pointId)).then(res => { |
|
|
Request.get(getPatrolRecord(dataList.id, 'null', 'null', 'null', pointId)).then(res => { |
|
|
console.log(res); |
|
|
|
|
|
dataList.points.map(e => { |
|
|
dataList.points.map(e => { |
|
|
res.map(i => { |
|
|
res.map(i => { |
|
|
wx.hideLoading(); |
|
|
wx.hideLoading(); |
|
|
console.log(i, '------'); |
|
|
|
|
|
if (i == null) { |
|
|
if (i == null) { |
|
|
e.lastInspectionTime = moment().format('YYYY-MM-DD'); |
|
|
e.lastInspectionTime = moment().format('YYYY-MM-DD'); |
|
|
e.inspectionTime = moment().format('YYYY-MM-DD'); |
|
|
e.inspectionTime = moment().format('YYYY-MM-DD'); |
|
@ -360,8 +358,9 @@ Page({ |
|
|
* 生命周期函数--监听页面加载 |
|
|
* 生命周期函数--监听页面加载 |
|
|
*/ |
|
|
*/ |
|
|
onLoad(options) { |
|
|
onLoad(options) { |
|
|
|
|
|
console.log(options, '-------'); |
|
|
let that = this; |
|
|
let that = this; |
|
|
let data = JSON.parse(options.data); |
|
|
let data = JSON.parse(decodeURIComponent(options.data)); |
|
|
let points = data.points.map(e => { |
|
|
let points = data.points.map(e => { |
|
|
return e.name |
|
|
return e.name |
|
|
}).join('、') |
|
|
}).join('、') |
|
|