From 36db9587329a9ea53d726d0550027bedbeb76cfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9DRain=E2=80=9C?= <904416525@qq.com> Date: Tue, 21 May 2024 18:03:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=BA=94=E6=80=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/headers/headers.vue | 2 +- manifest.json | 8 +- pages.json | 14 + .../emergencyalarm/emergencyalarm.vue | 99 ++- .../exam/examresult/examresult.vue | 4 +- .../emergencyDisposal/ImmediateRescue.vue | 4 +- pages/projectEnd/emergencyDisposal/detail.vue | 78 ++- pages/projectEnd/emergencyDisposal/index.vue | 24 +- pages/projectEnd/emergencyDisposal/mymaps.vue | 61 ++ .../emergencyDisposal/reliefApprove.vue | 570 ++++++++++++++++++ pages/projectEnd/safeSame/index.vue | 11 + 11 files changed, 794 insertions(+), 81 deletions(-) create mode 100644 pages/projectEnd/emergencyDisposal/mymaps.vue create mode 100644 pages/projectEnd/emergencyDisposal/reliefApprove.vue diff --git a/components/headers/headers.vue b/components/headers/headers.vue index cac08e97..76697265 100644 --- a/components/headers/headers.vue +++ b/components/headers/headers.vue @@ -30,7 +30,7 @@ var that = this uni.getSystemInfo({ success(res) { - that.mobileTopHeight = res.statusBarHeight + that.mobileTopHeight = res.statusBarHeight ? res.statusBarHeight : 0; uni.setStorageSync('systemInfo',res) console.log(res) } diff --git a/manifest.json b/manifest.json index 44ab431a..fe34826e 100644 --- a/manifest.json +++ b/manifest.json @@ -189,7 +189,13 @@ } }, "sdkConfigs" : { - "maps" : {} + "maps" : { + "amap" : { + "key" : "3b060f3a0ce4bafebeba1621dcd99c31", + "securityJsCode" : "", + "serviceHost" : "" + } + } }, "router" : { "mode" : "hash", diff --git a/pages.json b/pages.json index 9e1620c7..f5b1f9b4 100644 --- a/pages.json +++ b/pages.json @@ -2623,6 +2623,20 @@ { "navigationBarTitleText" : "" } + }, + { + "path" : "pages/projectEnd/emergencyDisposal/mymaps", + "style" : + { + "navigationBarTitleText" : "" + } + }, + { + "path" : "pages/projectEnd/emergencyDisposal/reliefApprove", + "style" : + { + "navigationBarTitleText" : "" + } } ], // "subPackages":[{ diff --git a/pages/personLocation/emergencyalarm/emergencyalarm.vue b/pages/personLocation/emergencyalarm/emergencyalarm.vue index 9c661ff6..6514d078 100644 --- a/pages/personLocation/emergencyalarm/emergencyalarm.vue +++ b/pages/personLocation/emergencyalarm/emergencyalarm.vue @@ -46,14 +46,14 @@ 视频(mp4)附件： - {{item.name}} - × @@ -248,27 +248,12 @@ filePath: tempFilePaths[0], name: 'files', success: (uploadFileRes) => { + console.log(uploadFileRes); let data = { name: JSON.parse(uploadFileRes.data).data[0].filename, url: JSON.parse(uploadFileRes.data).data[0].imageUrl }; that.imgFileList.push(data) - uni.getImageInfo({ - src: tempFilePaths[0], - success: (resInfo) => { - console.log('传过去啦 resInfo', resInfo) - that.imgList = { - imgUrl: tempFilePaths[0], - imgWidth: resInfo.width, - imgHeight: resInfo.height, - // team:'班组人员', - // name: '张三' - } - that.openImg = true - } - }) - that.openImg = false - } }); } @@ -359,40 +344,52 @@ getAddress() { const that = this; console.log("获取地址") - uni.getLocation({ - type: 'gcj02', - // type: 'wgs84', - geocode: true, //设置该参数为true可直接获取经纬度及城市信息 - isHighAccuracy: "true", - accuracy: "best", // 精度值为20m - success: function(res) { - console.log(res) - // const latitude = parseFloat(res.latitude); - // const longitude = parseFloat(res.longitude); + uni.chooseLocation({ + success: function (res) { + // console.log('位置名称：' + res.name); + // console.log('详细地址：' + res.address); + // console.log('纬度：' + res.latitude); + // console.log('经度：' + res.longitude); + that.emergencyInfo.incidentSite = res.address; that.emergencyInfo.longitude = parseFloat(res.longitude); that.emergencyInfo.latitude = parseFloat(res.latitude); - that.addressList = [ - res.latitude.address.province, - res.latitude.address.city, - res.latitude.address.district, - res.latitude.address.street, - res.latitude.address.streetNum, - res.latitude.address.city, - res.latitude.address.poiName, - res.latitude.address.cityCode, - ] - that.emergencyInfo.incidentSite = that.addressList.map(item => item).join('、') - console.log(that.emergencyInfo.incidentSite) - - // that.addrDel = res; - }, - fail: function() { - uni.showToast({ - title: '获取地址失败，将导致部分功能不可用', - icon: 'none' - }); } }); + // uni.getLocation({ + // type: 'gcj02', + // // type: 'wgs84', + // geocode: true, //设置该参数为true可直接获取经纬度及城市信息 + // isHighAccuracy: "true", + // accuracy: "best", // 精度值为20m + // success: function(res) { + // console.log(res) + // // const latitude = parseFloat(res.latitude); + // // const longitude = parseFloat(res.longitude); + // that.emergencyInfo.longitude = + // that.emergencyInfo.latitude = parseFloat(res.latitude); + // that.addressList = [ + // res.address.province, + // res.address.city, + // res.address.district, + // res.address.street, + // res.address.streetNum, + // res.address.city, + // res.address.poiName, + // res.address.cityCode, + // ] + // that.emergencyInfo.incidentSite = that.addressList.map(item => item).join('、') + // console.log(that.emergencyInfo.incidentSite) + // console.log(66666666); + + // // that.addrDel = res; + // }, + // fail: function() { + // uni.showToast({ + // title: '获取地址失败，将导致部分功能不可用', + // icon: 'none' + // }); + // } + // }); } } } @@ -421,7 +418,7 @@ } .emergencyalarm { - padding: 64rpx 24rpx 120rpx 24rpx; + padding: 88rpx 24rpx 120rpx 24rpx; .item-boxs { .item-box { @@ -594,6 +591,8 @@ position: relative; margin-right: 30rpx; margin-bottom: 16rpx; + display: flex; + align-items: center; .img { width: 100%; diff --git a/pages/personLocation/exam/examresult/examresult.vue b/pages/personLocation/exam/examresult/examresult.vue index b89ed6e7..1fa9bc3b 100644 --- a/pages/personLocation/exam/examresult/examresult.vue +++ b/pages/personLocation/exam/examresult/examresult.vue @@ -57,9 +57,9 @@ .image-error { width: 145.52rpx; height: 145.52rpx; - background-image: url(/static/signin-error.png); + /* background-image: url(/static/signin-error.png); background-repeat: no-repeat; - background-size: 100% 100%; + background-size: 100% 100%; */ display: flex; justify-content: center; align-items: center; diff --git a/pages/projectEnd/emergencyDisposal/ImmediateRescue.vue b/pages/projectEnd/emergencyDisposal/ImmediateRescue.vue index 5456ac61..fe1d4bfe 100644 --- a/pages/projectEnd/emergencyDisposal/ImmediateRescue.vue +++ b/pages/projectEnd/emergencyDisposal/ImmediateRescue.vue @@ -58,7 +58,7 @@ - + @@ -93,7 +93,7 @@ - 新增处置记录 + 新增救援记录 提交保存 diff --git a/pages/projectEnd/emergencyDisposal/detail.vue b/pages/projectEnd/emergencyDisposal/detail.vue index 3ccb572a..51d8b503 100644 --- a/pages/projectEnd/emergencyDisposal/detail.vue +++ b/pages/projectEnd/emergencyDisposal/detail.vue @@ -29,24 +29,29 @@ 应急详情： - {{emergencyDetail.incidentSite}} + {{emergencyDetail.emergencyDetail}} - 处置状态： - + 救援状态： + 待救援 + 救援中 + 已救援 + 现场情况视频： - + {{item.name}} - @@ -60,7 +65,8 @@ 经纬度： - {{emergencyDetail.longitude}},{{emergencyDetail.latitude}} + {{emergencyDetail.longitude}},{{emergencyDetail.latitude}} 现场情况图片： @@ -68,7 +74,8 @@ - + @@ -86,11 +93,17 @@ 处置资料： - 4654.mp4 + + {{ JSON.parse(emergencyInfo.disposalInformation).map(item => item.name).join("、") }} + 指导文件： - 4654.mp4 + + {{ JSON.parse(emergencyInfo.guidanceDocument).map(item => item.name).join("、") }} + @@ -172,11 +185,11 @@ + @click="downloadReport(this.imgList)"> 下载处置报告 - + 应急物资 @@ -196,6 +209,8 @@ emergencyDetail: {}, imageValue: [], imgList: [], + emergencyTypeList: [], + emergencyInfo: {}, } }, mounted() { @@ -208,12 +223,13 @@ }, onShow() { + this.getEmergencyTypeList(); this.getEmergencyRecordQueryById(); }, methods: { - downloadReport() { - const url = this.imgList[0].url; - const fileName = this.imgList[0].name; + downloadReport(row) { + const url = row[0].url; + const fileName = row[0].name; fetch(url) .then(response => response.blob()) @@ -276,6 +292,21 @@ // } }, + getEmergencyTypeList() { + let that = this; + //获取我整改的巡查记录数量 + this.sendRequest({ + url: 'xmgl/xzEmergencyType/list', + method: 'get', + data: { + projectSn: this.projectSn, + }, + success: res => { + console.log(res); + that.emergencyTypeList = res.result; + } + }) + }, //获取记录 getEmergencyRecordQueryById() { let that = this; @@ -290,16 +321,23 @@ success: res => { console.log(res); that.emergencyDetail = res.result; + const find = that.emergencyTypeList.find(item => item.id == res.result + .emergencyTypeId); + that.emergencyInfo = find ? find : {}; this.imgList = res.result.disposalReport && JSON.parse(res.result.disposalReport); } }) - }, getnavigateTo(url) { uni.navigateTo({ url, }) }, + goMaps() { + uni.navigateTo({ + url: `./mymaps?latitude=${this.emergencyDetail.latitude}&longitude=${this.emergencyDetail.longitude}` + }) + }, //查看视频 playVideo(url, type) { uni.navigateTo({ @@ -404,7 +442,7 @@ } .disposal-detail { - margin: 12% 0; + margin: 88rpx 0; padding: 0 30rpx; position: relative; @@ -442,7 +480,7 @@ // margin-top: 15%; font-size: 14px; color: #000000; - padding: 0 8rpx; + padding: 0 8rpx 30rpx; view { display: flex; diff --git a/pages/projectEnd/emergencyDisposal/index.vue b/pages/projectEnd/emergencyDisposal/index.vue index 07b5ae7b..6bfe6dff 100644 --- a/pages/projectEnd/emergencyDisposal/index.vue +++ b/pages/projectEnd/emergencyDisposal/index.vue @@ -59,7 +59,7 @@ 处置台账 - + 报警人员姓名： {{item.alarmPersonName}} @@ -168,8 +168,13 @@ dataList: [], total: 0, page:1, + + getGoId:-1, } }, + onLoad(option) { + this.getGoId = option.id; + }, mounted() { this.getTime() // this.getListData(); @@ -242,6 +247,7 @@ projectSn: this.projectSn, pageNo: this.page, pageSize: 10, + inDispositionStatus:this.getGoId == 2 ? "2,3" : "1,2,3", }, success: res => { console.log(res) @@ -287,9 +293,16 @@ url: "./analysisAlarm" }) }, - getnavigateTo(url) { + getnavigateTo(id) { + if(this.getGoId == 2){ + uni.navigateTo({ + url:`./reliefApprove?id=${id}`, + }) + return + } + uni.navigateTo({ - url, + url:`./detail?id=${id}`, }) }, } @@ -299,6 +312,7 @@ \ No newline at end of file diff --git a/pages/projectEnd/emergencyDisposal/reliefApprove.vue b/pages/projectEnd/emergencyDisposal/reliefApprove.vue new file mode 100644 index 00000000..b52990c2 --- /dev/null +++ b/pages/projectEnd/emergencyDisposal/reliefApprove.vue @@ -0,0 +1,570 @@ + + + + + \ No newline at end of file diff --git a/pages/projectEnd/safeSame/index.vue b/pages/projectEnd/safeSame/index.vue index c3025e8b..80433d33 100644 --- a/pages/projectEnd/safeSame/index.vue +++ b/pages/projectEnd/safeSame/index.vue @@ -86,6 +86,11 @@ 特种验收 + + + + 新增隐患审批 +