From fcf73178f130b3620edb1aec1e1a4e876d861c2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?= <819653817@qq.com> Date: Thu, 9 May 2024 10:06:17 +0800 Subject: [PATCH] =?UTF-8?q?=E8=85=BE=E8=AE=AF=E5=9C=B0=E5=9B=BE=E7=9A=84?= =?UTF-8?q?=E5=AE=9A=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InspectionReport/InspectionReport.js | 176 ++++++++++++------ .../InspectionReport/InspectionReport.wxml | 4 +- .../InspectionReport/InspectionReport.wxss | 1 + .../safetyinspection/safetyinspection.wxml | 145 ++++++++------- .../safetyinspection/safetyinspection.wxss | 12 ++ 5 files changed, 203 insertions(+), 135 deletions(-) diff --git a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.js b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.js index 17a8726..7580cd8 100644 --- a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.js +++ b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.js @@ -1,66 +1,118 @@ // subpages/InspectionReport/pages/InspectionReport/InspectionReport.js +const QQMapWX = require('../../../../utils/qqmap-wx-jssdk') Page({ - /** - * 页面的初始数据 - */ - data: { - - }, - - /** - * 生命周期函数--监听页面加载 - */ - onLoad(options) { - - }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady() { - - }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow() { - - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide() { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload() { - - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh() { - - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom() { - - }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage() { - - } + /** + * 页面的初始数据 + */ + data: { + addressContent:'', + fmData: { + gridId: '', + attachmentList:[],//图片 + voiceList:[], + latitude:"", + longitude:"", + resiId:"", + happenTime:"", + content:"",//内容 + address:"",//地址 + }, + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + this.data.qqMapWX = new QQMapWX({ + key: 'CMJBZ-4DECI-JXGGN-5B4WU-QLV2H-B5BEJ' + }) + this.reverseLocation() + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + this.reverseLocation + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() {}, + //跳转地图选点 + toughGetLocation() { + // this.getLocation(false); + wx.chooseLocation({ + success: res => { + console.log('resadddres', res) + const { + fmData + } = this.data; + this.setData({ + fmData: { + ...fmData, + address: res.address, + longitude: res.longitude, + latitude: res.latitude + }, + addressContent: res.address + }); + console.log(this.data.fmData); + } + }) + }, + reverseLocation() { + const _this = this + this.data.qqMapWX.reverseGeocoder({ + success(res) { + console.log(res); + _this.setData({ + addressContent:res.result.address, + 'fmData.address': res.result.address, + 'fmData.longitude':res.result.location.lng, + 'fmData.latitude':res.result.location.lat, + }) + }, + fail(err) { + console.debug(err) + } + }) + }, }) \ No newline at end of file diff --git a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxml b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxml index 557694b..305d7db 100644 --- a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxml +++ b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxml @@ -3,11 +3,11 @@ - 定位的信息 + {{addressContent}} 如定位不在事发地，请重新选择定位 - + 重新定位 diff --git a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxss b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxss index 2c0d195..a23bfca 100644 --- a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxss +++ b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxss @@ -162,6 +162,7 @@ page { flex-direction: column; width: 650rpx; margin-left: 40rpx; + height: 90rpx; } .add{ display: flex; diff --git a/subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxml b/subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxml index 957fe57..c412d43 100644 --- a/subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxml +++ b/subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxml @@ -10,30 +10,33 @@ - - - - * - 已整改隐患 +