|
|
@ -16,6 +16,7 @@ Page({ |
|
|
itemData: '', //单条数据
|
|
|
itemData: '', //单条数据
|
|
|
changeTwo: '', //是否异常
|
|
|
changeTwo: '', //是否异常
|
|
|
changeThree: '', //严重等级
|
|
|
changeThree: '', //严重等级
|
|
|
|
|
|
address: '', //当前位置
|
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
handleChangeTwo(e) { |
|
|
handleChangeTwo(e) { |
|
|
@ -52,7 +53,8 @@ Page({ |
|
|
msgInp: '', //巡查详情
|
|
|
msgInp: '', //巡查详情
|
|
|
changeTwo: '', //是否异常
|
|
|
changeTwo: '', //是否异常
|
|
|
changeThree: '', //严重等级
|
|
|
changeThree: '', //严重等级
|
|
|
imgs: [] |
|
|
imgs: [], |
|
|
|
|
|
address: '' |
|
|
}) |
|
|
}) |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
@ -174,7 +176,7 @@ Page({ |
|
|
// 开始巡检录入
|
|
|
// 开始巡检录入
|
|
|
addPatrolRecord: function () { |
|
|
addPatrolRecord: function () { |
|
|
let that = this; |
|
|
let that = this; |
|
|
let { itemData, imgs, msgInp, changeTwo, changeThree, dataList, imgUrl } = that.data; |
|
|
let { itemData, imgs, msgInp, changeTwo, changeThree, dataList, imgUrl, address } = that.data; |
|
|
let newImgs = imgs.map(i => { |
|
|
let newImgs = imgs.map(i => { |
|
|
i = i.replace(imgUrl, ''); |
|
|
i = i.replace(imgUrl, ''); |
|
|
return i; |
|
|
return i; |
|
|
@ -196,7 +198,8 @@ Page({ |
|
|
} |
|
|
} |
|
|
let data = { |
|
|
let data = { |
|
|
patrolPlanId: dataList.id, |
|
|
patrolPlanId: dataList.id, |
|
|
lastInspectionTime: moment().format('YYYY-MM-DD'), |
|
|
pointId: itemData.id, |
|
|
|
|
|
lastInspectionTime: itemData.lastInspectionTime, |
|
|
inspectionTime: moment().format('YYYY-MM-DD'), |
|
|
inspectionTime: moment().format('YYYY-MM-DD'), |
|
|
points: { |
|
|
points: { |
|
|
user: dataList.user, |
|
|
user: dataList.user, |
|
|
@ -206,6 +209,7 @@ Page({ |
|
|
msgInp: msgInp, |
|
|
msgInp: msgInp, |
|
|
changeThree: changeThree == 'slight' ? '轻微' : changeThree == 'moderate' ? '中度' : '严重', |
|
|
changeThree: changeThree == 'slight' ? '轻微' : changeThree == 'moderate' ? '中度' : '严重', |
|
|
imgs: newImgs, |
|
|
imgs: newImgs, |
|
|
|
|
|
address: address |
|
|
}, |
|
|
}, |
|
|
alarm: true |
|
|
alarm: true |
|
|
} |
|
|
} |
|
|
@ -219,13 +223,15 @@ Page({ |
|
|
if (changeTwo == 'normal') { |
|
|
if (changeTwo == 'normal') { |
|
|
let data = { |
|
|
let data = { |
|
|
patrolPlanId: dataList.id, |
|
|
patrolPlanId: dataList.id, |
|
|
lastInspectionTime: moment().format('YYYY-MM-DD'), |
|
|
pointId: itemData.id, |
|
|
|
|
|
lastInspectionTime: itemData.lastInspectionTime, |
|
|
inspectionTime: moment().format('YYYY-MM-DD'), |
|
|
inspectionTime: moment().format('YYYY-MM-DD'), |
|
|
points: { |
|
|
points: { |
|
|
user: dataList.user, |
|
|
user: dataList.user, |
|
|
project: dataList.project, |
|
|
project: dataList.project, |
|
|
frequency: dataList.frequency, |
|
|
frequency: dataList.frequency, |
|
|
itemData: itemData, |
|
|
itemData: itemData, |
|
|
|
|
|
address: address |
|
|
}, |
|
|
}, |
|
|
alarm: false |
|
|
alarm: false |
|
|
} |
|
|
} |
|
|
@ -246,58 +252,90 @@ Page({ |
|
|
|
|
|
|
|
|
// 获取巡检记录
|
|
|
// 获取巡检记录
|
|
|
getPatrolRecord: function () { |
|
|
getPatrolRecord: function () { |
|
|
Request.get(getPatrolRecord(this.data.dataList.id)).then(res => { |
|
|
let that = this; |
|
|
|
|
|
let { dataList } = that.data; |
|
|
|
|
|
let pointId = dataList.points.map(i => { |
|
|
|
|
|
return i.id; |
|
|
|
|
|
}) |
|
|
|
|
|
wx.showLoading({ |
|
|
|
|
|
title: '加载中' |
|
|
|
|
|
}) |
|
|
|
|
|
Request.get(getPatrolRecord(dataList.id, 'null', 'null', 'null', pointId)).then(res => { |
|
|
console.log(res); |
|
|
console.log(res); |
|
|
|
|
|
dataList.points.map(e => { |
|
|
|
|
|
res.map(i => { |
|
|
|
|
|
wx.hideLoading(); |
|
|
|
|
|
console.log(i, '------'); |
|
|
|
|
|
if (i == null) { |
|
|
|
|
|
e.lastInspectionTime = moment().format('YYYY-MM-DD'); |
|
|
|
|
|
e.inspectionTime = moment().format('YYYY-MM-DD'); |
|
|
|
|
|
} |
|
|
|
|
|
}) |
|
|
|
|
|
return e; |
|
|
|
|
|
}) |
|
|
|
|
|
that.setData({ |
|
|
|
|
|
dataList |
|
|
|
|
|
}) |
|
|
}) |
|
|
}) |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
// selfLocation() {
|
|
|
// 解析经纬度
|
|
|
// const self = this
|
|
|
ToDegrees(val) { |
|
|
// wx.showLoading({
|
|
|
if (typeof (val) == "undefined" || val == "") { |
|
|
// title: '定位中',
|
|
|
return ""; |
|
|
// mask: true,
|
|
|
} |
|
|
// });
|
|
|
var i = val.indexOf('.'); |
|
|
// wx.getLocation({
|
|
|
var strDu = i < 0 ? val : val.substring(0, i);//获取度
|
|
|
// type: 'gcj02',
|
|
|
var strFen = 0; |
|
|
// success: (res) => {
|
|
|
var strMiao = 0; |
|
|
// let latitude, longitude;
|
|
|
if (i > 0) { |
|
|
// latitude = res.latitude.toString();
|
|
|
var strFen = "0" + val.substring(i); |
|
|
// longitude = res.longitude.toString();
|
|
|
strFen = strFen * 60 + ""; |
|
|
// this.latitude = res.latitude
|
|
|
i = strFen.indexOf('.'); |
|
|
// this.longitude = res.longitude
|
|
|
if (i > 0) { |
|
|
// getGeocoder({ lat: latitude, long: longitude }).then(res => { // 获取详细信息的接口
|
|
|
strMiao = "0" + strFen.substring(i); |
|
|
// const data = res.data;
|
|
|
strFen = strFen.substring(0, i);//获取分
|
|
|
// self.userAddress.userAddressdetail = ''
|
|
|
strMiao = strMiao * 60 + ""; |
|
|
// var params = {
|
|
|
i = strMiao.indexOf('.'); |
|
|
// text: data.address
|
|
|
strMiao = strMiao.substring(0, i + 4);//取到小数点后面三位
|
|
|
// }
|
|
|
strMiao = parseFloat(strMiao).toFixed(2);//精确小数点后面两位
|
|
|
// parseAddress(params).then(res => { // 粘贴详细信息的接口
|
|
|
} |
|
|
// console.log(res)
|
|
|
} |
|
|
// if (res.status == 200 && res.message == "success") {
|
|
|
return strDu + "°" + strFen + "′" + strMiao + "″"; |
|
|
// this.$forceUpdate(); // 定位后，界面没有反应，因此加上强制刷新
|
|
|
}, |
|
|
// this.userAddress.userAddressdetail = res.data.town + res.data.detail;
|
|
|
|
|
|
// this.$set(this.userAddress, 'selectAddress', parseInt(res.data.county_info.city_id));
|
|
|
// 获取当前位置
|
|
|
// this.addressInfo[0] = res.data.province_info ? res.data.province_info : {};
|
|
|
selfLocation() { |
|
|
// this.addressInfo[1] = res.data.city_info ? res.data.city_info : {};
|
|
|
const that = this |
|
|
// this.addressInfo[2] = res.data.county_info ? res.data.county_info : {};
|
|
|
wx.showLoading({ |
|
|
// }
|
|
|
title: '定位中', |
|
|
// }).catch(res => {
|
|
|
mask: true, |
|
|
// console.log("没有地址信息")
|
|
|
}); |
|
|
// })
|
|
|
wx.getLocation({ |
|
|
// wx.hideLoading();
|
|
|
type: 'wgs84', |
|
|
// })
|
|
|
success: (res) => { |
|
|
// },
|
|
|
wx.request({ |
|
|
// fail: (res) => {
|
|
|
url: `https://apis.map.qq.com/ws/geocoder/v1/?location=${res.latitude},${res.longitude}&key=${getApp().globalData.key}`, |
|
|
// console.log(res)
|
|
|
success: function (res) { |
|
|
// wx.hideLoading();
|
|
|
wx.hideLoading(); |
|
|
// wx.showToast({
|
|
|
//根据自己项目需求获取res内容
|
|
|
// title: res.errMsg,
|
|
|
that.setData({ |
|
|
// icon: 'none',
|
|
|
address: res.data.result.address |
|
|
// duration: 1000
|
|
|
}) |
|
|
// });
|
|
|
} |
|
|
// }
|
|
|
}) |
|
|
// });
|
|
|
}, |
|
|
// },
|
|
|
fail: (res) => { |
|
|
|
|
|
console.log(res) |
|
|
|
|
|
wx.hideLoading(); |
|
|
|
|
|
wx.showToast({ |
|
|
|
|
|
title: res.errMsg, |
|
|
|
|
|
icon: 'none', |
|
|
|
|
|
duration: 1000 |
|
|
|
|
|
}); |
|
|
|
|
|
} |
|
|
|
|
|
}); |
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* 生命周期函数--监听页面加载 |
|
|
* 生命周期函数--监听页面加载 |
|
|
@ -312,7 +350,7 @@ Page({ |
|
|
dataList: data, |
|
|
dataList: data, |
|
|
points |
|
|
points |
|
|
}) |
|
|
}) |
|
|
// that.getPatrolRecord()
|
|
|
that.getPatrolRecord(); |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
|
