From efeceec3feae2d7550b434aef1e6815db4c3eeeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9DRain=E2=80=9C?= <904416525@qq.com>
Date: Wed, 22 May 2024 00:12:45 +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

---
 api/index.js                                  |   6 +-
 .../emergencyalarm/emergencyalarm.vue         |  68 ++++++++-----
 pages/personLocation/index/index.vue          |   5 +-
 pages/personLocation/login/login.vue          |  17 +++-
 .../emergencyDisposal/ImmediateRescue.vue     |  37 ++++----
 pages/projectEnd/emergencyDisposal/detail.vue |  89 +++++++++++++-----
 pages/projectEnd/emergencyDisposal/index.vue  |  13 +--
 pages/projectEnd/emergencyDisposal/mymaps.vue |  51 ++++++++--
 .../emergencyDisposal/reliefApprove.vue       |  67 ++++++++-----
 pages/projectEnd/safeSame/index.vue           |   2 +-
 static/address-logo1.png                      | Bin 0 -> 1234 bytes
 static/address-logo2.png                      | Bin 0 -> 1230 bytes
 static/reliefApprove.png                      | Bin 0 -> 994 bytes
 13 files changed, 250 insertions(+), 105 deletions(-)
 create mode 100644 static/address-logo1.png
 create mode 100644 static/address-logo2.png
 create mode 100644 static/reliefApprove.png

diff --git a/api/index.js b/api/index.js
index b88e2497..48372514 100644
--- a/api/index.js
+++ b/api/index.js
@@ -6,8 +6,12 @@ import request from "@/utils/request.js"
 
 export function deviceLogin(data) {
 	// 设备、人员登录
+	// return request.post({
+	// 	url: "/xmgl/base/device/login",
+	// 	data
+	// })
 	return request.post({
-		url: "/xmgl/base/device/login",
+		url: "xmgl/workerInfo/selectWorkerInfoByIdCard",
 		data
 	})
 }
diff --git a/pages/personLocation/emergencyalarm/emergencyalarm.vue b/pages/personLocation/emergencyalarm/emergencyalarm.vue
index 6514d078..b6b8a702 100644
--- a/pages/personLocation/emergencyalarm/emergencyalarm.vue
+++ b/pages/personLocation/emergencyalarm/emergencyalarm.vue
@@ -5,7 +5,7 @@
 				应急警报
 			</view>
 		</headers>
-		<view class="item-boxs">
+		<view class="item-boxs" :style="{ 'margin-top': (statusBarHeight+52) + 'px' }">
 			<view class="item-box">
 				<view class="title">
 					应急类型
@@ -22,7 +22,7 @@
 				<view class="title">
 					应急详情
 				</view>
-				<textarea class="textareaType" v-model="emergencyInfo.emergencyDetail" placeholder="请选择应急详情,描述当时情况" />
+				<textarea class="textareaType" maxlength="-1" v-model="emergencyInfo.emergencyDetail" placeholder="请选择应急详情,描述当时情况" />
 			</view>
 			<view class="item-box">
 				<view class="title">
@@ -32,26 +32,29 @@
 					<view class="uploadImg">
 						<text>上传图片：</text>
 						<view class="uni-form-input imgBox_wrap">
-							<view class="imgBox" v-show="imgFileList.length>0" v-for="(item,index) in imgFileList"
-								:key="index">
-								<image :src="url_config+'image/'+item.url" class="img"
-									@click="previewImage(url_config+'image/'+item.url)">
-								</image>
-								<view @click="deleteImg(item,1)" style="margin: 5px;" class="deleteImg">×</view>
+							<view v-show="imgFileList.length>0">
+								<view class="imgBox" v-for="(item,index) in imgFileList"
+									:key="index">
+									<image :src="url_config+'image/'+item.url" class="img"
+										@click="previewImage(url_config+'image/'+item.url)">
+									</image>
+									<view @click="deleteImg(item,1)" style="margin: 5px;" class="deleteImg">×</view>
+								</view>
 							</view>
-							<view class="addImgBox" @click="uploadImg(1)" v-if="imgFileList.length<5">
+							<view class="addImgBox" @click="uploadImg(1)" v-if="imgFileList.length<1">
 								<image src="/static/icon-add.png" class="icon-add"></image>
 							</view>
 						</view>
 					</view>
 					<view class="uploadImg">
 						<text>视频(mp4)附件：</text>
-						<view v-if="videoFileList.length>0" class="imgBox flex2"
-							v-for="(item,index) in videoFileList" :key="index">
-							<view
-								style="color: #4181FE;width: 100%;white-space: nowrap; overflow: hidden;text-overflow: ellipsis;"
-								@click="playVideo(url_config+'image/'+item.url,'video')">
-								{{item.name}}
+						<view v-if="videoFileList.length>0" class="imgBox flex2">
+							<view style="overflow: hidden;" v-for="(item,index) in videoFileList" :key="index">
+								<view
+									style="color: #4181FE;width: 100%;white-space: nowrap; overflow: hidden;text-overflow: ellipsis;"
+									@click="playVideo(url_config+'image/'+item.url,'video')">
+									{{item.name}}
+								</view>
 							</view>
 							<view @click="deleteImg(item,2)" style="margin: 5px;color: gray;right: 0%;"
 								class="deleteImg">×
@@ -66,7 +69,7 @@
 			<view class="item-box_address">
 				<view class="address">
 					<text>事发地</text>
-					<input class="inputAddress" v-model="emergencyInfo.incidentSite" placeholder="请输入详细地址" />
+					<input class="inputAddress" readonly disabled  v-model="emergencyInfo.incidentSite" placeholder="请获取地址" />
 				</view>
 				<view class="getaddress" @click="getAddress()">
 					<text class="round"></text>
@@ -116,7 +119,9 @@
 		},
 		onLoad(options) {
 			this.id = options.id;
-			this.projectSn = uni.getStorageSync('devInfoList')[0].projectSn;
+			console.log(uni.getStorageSync('devInfoList'));
+			this.projectSn = uni.getStorageSync('devInfoList').projectSn;
+			this.statusBarHeight = uni.getStorageSync('systemInfo').statusBarHeight
 			console.log(options);
 			emergencyRecordQueryById({
 				projectSn: this.projectSn,
@@ -152,6 +157,27 @@
 		methods: {
 			emergencyEdit() {
 				var that = this;
+				if(!this.emergencyInfo.emergencyTypeId){
+					uni.showToast({
+						title: "请输入类型",
+						icon: "none"
+					})
+					return
+				}
+				if(!this.emergencyInfo.emergencyDetail){
+					uni.showToast({
+						title: "请输入详情",
+						icon: "none"
+					})
+					return
+				}
+				if(!this.addressList){
+					uni.showToast({
+						title: "请输入事发地",
+						icon: "none"
+					})
+					return
+				}
 				emergencyRecordEdit({
 					id: this.id,
 					projectSn: this.projectSn,
@@ -240,7 +266,7 @@
 				var that = this
 				if (type == 1) {
 					uni.chooseImage({
-						count: 5 - that.imgFileList.length,
+						count: 1,
 						success(res) {
 							const tempFilePaths = res.tempFilePaths;
 							uni.uploadFile({
@@ -418,7 +444,7 @@
 	}
 
 	.emergencyalarm {
-		padding: 88rpx 24rpx 120rpx 24rpx;
+		padding: 0 24rpx 120rpx 24rpx;
 
 		.item-boxs {
 			.item-box {
@@ -590,7 +616,7 @@
 		display: inline-flex;
 		position: relative;
 		margin-right: 30rpx;
-		margin-bottom: 16rpx;
+		// margin-bottom: 16rpx;
 		    display: flex;
 		    align-items: center;
 
@@ -603,7 +629,7 @@
 		.deleteImg {
 			position: absolute;
 			right: -6rpx;
-			top: -36rpx;
+			top: -24rpx;
 			font-size: 36rpx;
 			color: #fff;
 		}
diff --git a/pages/personLocation/index/index.vue b/pages/personLocation/index/index.vue
index ddefaf1b..b12a362a 100644
--- a/pages/personLocation/index/index.vue
+++ b/pages/personLocation/index/index.vue
@@ -39,9 +39,8 @@
 			}
 		},
 		onShow() {
-			console.log(uni.getStorageSync('devInfoList')[0])
-			this.projectSn = uni.getStorageSync('devInfoList')[0].projectSn;
-			this.workerInfoId = uni.getStorageSync('devInfoList')[0].workerInfoId;
+			this.projectSn = uni.getStorageSync('devInfoList').projectSn;
+			this.workerInfoId = uni.getStorageSync('devInfoList').id;
 		},
 		methods: {
 			goNavigateTo(url, type) {
diff --git a/pages/personLocation/login/login.vue b/pages/personLocation/login/login.vue
index 53481294..ff089a75 100644
--- a/pages/personLocation/login/login.vue
+++ b/pages/personLocation/login/login.vue
@@ -3,7 +3,7 @@
 		<u-icon :style="{
 			top: (statusBarHeight + 5) + 'px'
 		}" @click="gotoback" name="arrow-left" size="40" class="back"></u-icon>
-		<view class="title">请选择您的登录方式</view>
+		<!-- <view class="title">请选择您的登录方式</view> -->
 		<view class="loginBox">
 			<view class="tabs">
 				<view class="tab" v-for="(item,index) in tabs" :key="index" :class="{active:current==index}"
@@ -28,9 +28,9 @@
 			</view>
 		</view>
 		<view class="submit" @click="submit">同意协议并登录</view>
-		<view class="bottomTitle" @click="showModal=true">
+		<!-- <view class="bottomTitle" @click="showModal=true">
 			云服务器设置
-		</view>
+		</view> -->
 		<view class="modalBox" v-show="showModal" @click="showModal=false">
 			<view class="modalContent" @click.stop="showModal=true">
 				<view class="modalTitle">
@@ -51,11 +51,14 @@
 	import {
 		deviceLogin
 	} from "@/api/index.js"
+	import {
+		BASE_URL
+	} from "@/api/request.js"
 	export default {
 		data() {
 			return {
 				current: 0,
-				tabs: ["人员登录", "设备登录"],
+				tabs: ["人员登录"],
 				showModal: false,
 				ipPort: '',
 				form: {
@@ -67,11 +70,15 @@
 		},
 		onLoad() {
 			let port = uni.getStorageSync('ipPort')
+			this.statusBarHeight = uni.getStorageSync('systemInfo').statusBarHeight
 			let devInfoList = uni.getStorageSync('devInfoList')
 			if (port) {
 				this.ipPort = port;
 				Vue.prototype.url_config = port;
 			}
+			uni.setStorageSync('ipPort', BASE_URL);
+			Vue.prototype.url_config = BASE_URL;
+			getApp().globalData.siteUrl = BASE_URL;
 			if (devInfoList) {
 				// uni.reLaunch({
 				// 	url: '/pages/personLocation/home/home'
@@ -136,7 +143,7 @@
 								// 设备
 								uni.setStorageSync("loginType","device");
 							}
-							uni.setStorageSync("devInfoList", result.result.devInfoList);
+							uni.setStorageSync("devInfoList", result.result);
 							uni.redirectTo({
 								url: '/pages/personLocation/index/index'
 							});
diff --git a/pages/projectEnd/emergencyDisposal/ImmediateRescue.vue b/pages/projectEnd/emergencyDisposal/ImmediateRescue.vue
index fe1d4bfe..3ff3e040 100644
--- a/pages/projectEnd/emergencyDisposal/ImmediateRescue.vue
+++ b/pages/projectEnd/emergencyDisposal/ImmediateRescue.vue
@@ -6,7 +6,7 @@
 			</view>
 		</headers>
 		<!-- 新增问题 -->
-		<view class="immediate-rescue">
+		<view class="immediate-rescue" :style="{ 'margin-top': (statusBarHeight+52) + 'px' }">
 			<view class="content">
 				<!-- <view class="type flex">
 					<view class="name"><text class="star">*</text>是否处理完毕：</view>
@@ -351,7 +351,7 @@
 		},
 		onLoad(option) {
 			this.id = option.id;
-
+			this.statusBarHeight = uni.getStorageSync('systemInfo').statusBarHeight
 			this.pageTitle = option.type == 'add' ? '新增检查' : '编辑检查';
 			this.projectSn = JSON.parse(uni.getStorageSync('projectDetail')).projectSn;
 			this.userInfo = JSON.parse(uni.getStorageSync('userInfo'));
@@ -752,7 +752,7 @@
 			},
 
 			//下拉选择回显
-			bindPickerChange(e, type,eIndex) {
+			bindPickerChange(e, type, eIndex) {
 				console.log(e)
 				//type ==1 问题等级;2紧急情况;3检查人;4 检查时间;5整改时限; 6整改人; 7复查人; 8核验人;
 				if (type == 1) {
@@ -768,7 +768,7 @@
 					this.form.inspectTime = e.f3;
 				} else if (type == 'startTime2') {
 					// this.form.changeLimitTime = e.f3;
-					 this.rescueList[eIndex].changeLimitTime = e.f3;
+					this.rescueList[eIndex].changeLimitTime = e.f3;
 				} else if (type == 6) {
 					this.changePeopleIndex = e.detail.value;
 					this.form.changeId = this.personUpdateList[e.detail.value].userId;
@@ -997,7 +997,7 @@
 						if (res.confirm) {
 							if (type == 1) {
 								let fileArr = JSON.parse(JSON.stringify(that.rescueList[rowIndex]
-								.imgFileList));
+									.imgFileList));
 								fileArr.forEach((item, index) => {
 									if (item.url == val.url) {
 										fileArr.splice(index, 1)
@@ -1042,7 +1042,7 @@
 									url: that.url_config + 'image/' + JSON.parse(uploadFileRes
 										.data).data[0].imageUrl
 								}
-								 that.rescueList[eIndex].videoFileList.push(obj);
+								that.rescueList[eIndex].videoFileList.push(obj);
 								console.log('上传视频后的数据', that.videoFileList);
 							}
 						})
@@ -1065,13 +1065,14 @@
 
 			//新增保存
 			addSaveBtn() {
-				// if (!data.regionId) {
-				// 	uni.showToast({
-				// 		title: '请选择检查部位',
-				// 		icon: 'none'
-				// 	})
-				// 	return
-				// }
+				const everyTime = this.rescueList.every(item => item.changeLimitTime);
+				if (!everyTime && this.rescueList.length != 0) {
+					uni.showToast({
+						title: '处置完成时间有未填项',
+						icon: 'none'
+					})
+					return
+				}
 				console.log(this.rescueList);
 				this.sendRequest({
 					url: 'xmgl/xzEmergencyRecord/edit',
@@ -1094,10 +1095,10 @@
 					success: res => {
 						console.log(res.result)
 						if (res.code == 200) {
-								uni.showToast({
-									title: '提交成功',
-								})
-								uni.navigateBack()
+							uni.showToast({
+								title: '提交成功',
+							})
+							uni.navigateBack()
 						}
 					}
 				})
@@ -1245,7 +1246,7 @@
 
 
 	.immediate-rescue {
-		margin: 17% 4%;
+		margin: 0 4%;
 		position: relative;
 	}
 
diff --git a/pages/projectEnd/emergencyDisposal/detail.vue b/pages/projectEnd/emergencyDisposal/detail.vue
index 51d8b503..741ed72e 100644
--- a/pages/projectEnd/emergencyDisposal/detail.vue
+++ b/pages/projectEnd/emergencyDisposal/detail.vue
@@ -5,7 +5,7 @@
 				处置详情
 			</view>
 		</headers>
-		<view class="disposal-detail">
+		<view class="disposal-detail" :style="{ 'margin-top': (statusBarHeight+52) + 'px' }">
 			<view class="rescue">
 				<view class="title">
 					基本信息
@@ -86,7 +86,7 @@
 					</div>
 				</view>
 			</view>
-			<view class="rescue">
+			<view class="rescue" v-if="emergencyInfo.emergencyTypeId != -1">
 				<view class="title">
 					救援资料
 				</view>
@@ -120,13 +120,13 @@
 							<text>处置人：</text>
 							<text>{{item.disposalPersonName}}</text>
 						</view>
-						<view style="flex-direction: column;">
+						<view>
 							<text>现场情况视频：</text>
 							<view v-if="item.liveVideoSituation && JSON.parse(item.liveVideoSituation).length>0"
 								class="imgBox flex2" v-for="(ele,index) in JSON.parse(item.liveVideoSituation)"
 								:key="index">
 								<view
-									style="color: #4181FE;width: 50%;white-space: nowrap; overflow: hidden;text-overflow: ellipsis;"
+									style="color: #4181FE;width: 100%;white-space: nowrap; overflow: hidden;text-overflow: ellipsis;"
 									@click="playVideo(ele.url,'video')">
 									{{ele.name}}
 								</view>
@@ -185,7 +185,7 @@
 				</view>
 				<view v-if="emergencyDetail.dispositionStatus == 3"
 					style="color: #5181f6; cursor: pointer; height: 88rpx; justify-content: center; align-items: center;display: flex;"
-					@click="downloadReport(this.imgList)">
+					@click="downloadReport(imgList)">
 					下载处置报告
 				</view>
 			</view>
@@ -211,6 +211,7 @@
 				imgList: [],
 				emergencyTypeList: [],
 				emergencyInfo: {},
+				statusBarHeight: "",
 			}
 		},
 		mounted() {
@@ -218,6 +219,7 @@
 		},
 		onLoad(options) {
 			this.id = options.id;
+			this.statusBarHeight = uni.getStorageSync('systemInfo').statusBarHeight
 			this.projectSn = JSON.parse(uni.getStorageSync('projectDetail')).projectSn;
 			console.log(options);
 
@@ -228,20 +230,53 @@
 		},
 		methods: {
 			downloadReport(row) {
-				const url = row[0].url;
-				const fileName = row[0].name;
+				const url = row && row != "null" && row[0].url;
+				const fileName = row && row != "null" && row[0].name;
+				if (!url) {
+					uni.showToast({
+						title: "暂无下载文件！",
+						icon: "none"
+					})
+					return
+				}
+				uni.showLoading({
+					title: "保存中..."
+				})
+				uni.downloadFile({
+					url: url, //网络路径，下载下来  
+					success: (res) => {
+						if (res.statusCode === 200) {
+							uni.saveImageToPhotosAlbum({
+								filePath: res.tempFilePath, //下载后的临时路径  
+								success: res => { //下载完成后在相册里压根找不到  
+									uni.hideLoading()
+									uni.showToast({
+										title: "保存成功！"
+									})
+								}
+							})
+						}
+					}
+				});
 
-				fetch(url)
-					.then(response => response.blob())
-					.then(blob => {
-						const link = document.createElement('a');
-						link.href = URL.createObjectURL(blob);
-						link.download = fileName;
-						link.target = "_blank"; // 可选，如果希望在新窗口中下载文件，请取消注释此行
-						link.click();
-					});
+				// fetch(url)
+				// 	.then(response => response.blob())
+				// 	.then(blob => {
+				// 		const link = document.createElement('a');
+				// 		link.href = URL.createObjectURL(blob);
+				// 		link.download = fileName;
+				// 		link.target = "_blank"; // 可选，如果希望在新窗口中下载文件，请取消注释此行
+				// 		link.click();
+				// 	});
 			},
 			addSaveBtn() {
+				if (this.imgList == null||this.imgList.length == 0) {
+					uni.showToast({
+						title: "请提交处置报告",
+						icon: "none"
+					})
+					return
+				}
 				this.sendRequest({
 					url: 'xmgl/xzEmergencyRecord/edit',
 					method: 'post',
@@ -269,6 +304,7 @@
 			canversList(e) {
 				const that = this;
 				console.log(e);
+				that.imgList = that.imgList == null ? [] : that.imgList;
 				uni.uploadFile({
 					url: that.url_config + 'upload/image', //仅为示例，非真实的接口地址
 					filePath: e.tempFilePaths[0],
@@ -324,7 +360,7 @@
 						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);
+						this.imgList = (res.result.disposalReport && res.result.disposalReport != null) ? JSON.parse(res.result.disposalReport) : [];
 					}
 				})
 			},
@@ -442,8 +478,8 @@
 	}
 
 	.disposal-detail {
-		margin: 88rpx 0;
-		padding: 0 30rpx;
+		// margin: 88rpx 0;
+		padding: 0 30rpx 30rpx;
 		position: relative;
 
 		.rescue {
@@ -461,9 +497,9 @@
 				border-radius: 34rpx;
 				padding: 24rpx 24rpx;
 
-				view {
-					margin: 6rpx 0 !important;
-				}
+				// view {
+				// 	margin: 6rpx 0 !important;
+				// }
 			}
 
 			.rescue-item>view:last-child {
@@ -560,4 +596,13 @@
 			}
 		}
 	}
+
+	.imgBox_wrap,
+	.imgBox {
+		margin: 0 !important;
+
+		view {
+			margin: 0 !important;
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/pages/projectEnd/emergencyDisposal/index.vue b/pages/projectEnd/emergencyDisposal/index.vue
index 6bfe6dff..05b1fd7e 100644
--- a/pages/projectEnd/emergencyDisposal/index.vue
+++ b/pages/projectEnd/emergencyDisposal/index.vue
@@ -2,12 +2,12 @@
 	<view class="emergencyDisposal">
 		<headers class="fixedheader" :showBack="true">
 			<view class="headerName">
-				应急处置
+					{{this.getGoId == 2 ? '救援隐患审批' :'应急处置'}}
 			</view>
 		</headers>
-		<view class="problemOverview">
+		<view class="problemOverview" :style="{ 'margin-top': (statusBarHeight+52) + 'px' }">
 			<view class="overFlex">
-				<view class="overLeft">问题概览</view>
+				<view class="overLeft">{{this.getGoId == 2 ? '审批分析' :'处置分析'}}</view>
 				<view class="overRight">{{nowTime}}</view>
 			</view>
 			<view class="problemData">
@@ -18,7 +18,7 @@
 					<view class="num">{{statisticsValue.totalNum}}</view>
 					<view class="text">总数</view>
 				</view>
-				<view class="dataBox2 dataStyle">
+				<view class="dataBox2 dataStyle" v-if="this.getGoId != 2">
 					<!-- <view class="day" v-if="statisticsValue.oseNumDifferYesterday<0">
 						较昨日{{statisticsValue.oseNumDifferYesterday}}</view>
 					<view class="day" v-else>
@@ -210,7 +210,8 @@
 			//获取检查记录数据
 			getRecordList() {
 				let data = {
-					projectSn: this.projectSn
+					projectSn: this.projectSn,
+					inDispositionStatus:this.getGoId == 2 ? "2,3" : "1,2,3",
 				}
 				this.sendRequest({
 					url: 'xmgl/xzEmergencyRecord/statsDispositionStatus',
@@ -335,7 +336,7 @@
 		// box-sizing: border-box;
 		border-radius: 10px;
 		// border: 3px solid #fafbfc;
-		margin: 88rpx 2% 11% 2%;
+		margin: 0 2% 11% 2%;
 		padding: 3% 3%;
 
 
diff --git a/pages/projectEnd/emergencyDisposal/mymaps.vue b/pages/projectEnd/emergencyDisposal/mymaps.vue
index 0c7afee1..4d738a0b 100644
--- a/pages/projectEnd/emergencyDisposal/mymaps.vue
+++ b/pages/projectEnd/emergencyDisposal/mymaps.vue
@@ -2,8 +2,8 @@
 	<view>
 		<view class="page-body">
 			<view class="page-section page-section-gap">
-				<map style="width: 100%; height: 100%;" :markers="markersArr" :latitude="latitude"
-					:longitude="longitude">
+				<map style="width: 100%; height: 100vh;" :markers="markersArr" :latitude="latitude"
+					:longitude="longitude" @markertap="markTap">
 				</map>
 			</view>
 		</view>
@@ -26,29 +26,67 @@
 			this.latitude = option.latitude ? option.latitude : '39.909';
 			this.longitude = option.longitude ? option.longitude : '116.39742';
 			this.projectSn = JSON.parse(uni.getStorageSync('projectDetail')).projectSn;
+			this.getListData();
 		},
 		methods: {
+			markTap(e) {
+				console.log('ccccccc')
+				console.log(JSON.stringify(e))
+				console.log('ccccccc')
+				uni.openLocation({
+					// 目标位置的经纬度
+					latitude: e.target.latitude,
+					longitude: e.target.longitude,
+					// 调用成功时的回调函数
+					success: function(res) {
+						console.log('调用成功：', res)
+					},
+					// 调用失败时的回调函数
+					fail: function(res) {
+						console.log('调用失败：', res)
+					},
+					// 调用完成时的回调函数
+					complete: function(res) {
+						console.log('调用完成：', res)
+					}
+				})
+
+			},
 			//获取记录
 			getListData() {
 				let that = this;
 				//获取我整改的巡查记录数量
 				this.sendRequest({
-					url: 'xmgl/xzEmergencyRecord/page',
+					url: 'xmgl/xzEmergencyReliefGoods/list',
 					method: 'get',
 					data: {
 						projectSn: this.projectSn,
 					},
 					success: res => {
 						console.log(res)
-						that.markersArr = res.result.filter(item => item.longitude || item.latitude).map(
+						const newResult = res.result.filter(item => item.longitude || item.latitude).map(
 							(item, index) => {
 								return {
 									id: index + 1,
 									latitude: item.latitude ? item.latitude : 0,
 									longitude: item.longitude ? item.longitude : 0,
-									title: item.goodsName
+									title: item.goodsName,
+									label: {
+										content: item.goodsName,
+										textAlign:"center",
+									},
+									iconPath: '/static/address-logo1.png',
 								}
 							});
+
+						that.markersArr = newResult.concat([{
+							id: res.result.length + 2,
+							latitude: that.latitude,
+							longitude: that.longitude,
+							// title: item.goodsName,
+							iconPath: '/static/address-logo2.png',
+						}])
+
 					}
 				})
 			},
@@ -56,6 +94,5 @@
 	}
 </script>
 
-<style>
-
+<style scoped>
 </style>
\ No newline at end of file
diff --git a/pages/projectEnd/emergencyDisposal/reliefApprove.vue b/pages/projectEnd/emergencyDisposal/reliefApprove.vue
index b52990c2..3bc903d9 100644
--- a/pages/projectEnd/emergencyDisposal/reliefApprove.vue
+++ b/pages/projectEnd/emergencyDisposal/reliefApprove.vue
@@ -5,7 +5,7 @@
 				处置详情
 			</view>
 		</headers>
-		<view class="disposal-detail">
+		<view class="disposal-detail" :style="{ 'margin-top': (statusBarHeight+52) + 'px' }">
 			<view class="rescue">
 				<view class="title">
 					基本信息
@@ -120,13 +120,14 @@
 							<text>处置人：</text>
 							<text>{{item.disposalPersonName}}</text>
 						</view>
-						<view style="flex-direction: column;">
+						<!-- style="flex-direction: column;" -->
+						<view >
 							<text>现场情况视频：</text>
 							<view v-if="item.liveVideoSituation && JSON.parse(item.liveVideoSituation).length>0"
 								class="imgBox flex2" v-for="(ele,index) in JSON.parse(item.liveVideoSituation)"
 								:key="index">
 								<view
-									style="color: #4181FE;width: 50%;white-space: nowrap; overflow: hidden;text-overflow: ellipsis;"
+									style="color: #4181FE;width: 100%;white-space: nowrap; overflow: hidden;text-overflow: ellipsis;"
 									@click="playVideo(ele.url,'video')">
 									{{ele.name}}
 								</view>
@@ -167,7 +168,7 @@
 				</view>
 				<view v-if="this.imgList && this.imgList.length > 0"
 					style="color: #5181f6; cursor: pointer; height: 88rpx; justify-content: center; align-items: center;display: flex;"
-					@click="downloadReport(this.imgList)">
+					@click="downloadReport(imgList)">
 					下载处置报告
 				</view>
 			</view>
@@ -203,6 +204,7 @@
 		},
 		onLoad(options) {
 			this.id = options.id;
+			this.statusBarHeight = uni.getStorageSync('systemInfo').statusBarHeight;
 			this.projectSn = JSON.parse(uni.getStorageSync('projectDetail')).projectSn;
 			console.log(options);
 
@@ -213,18 +215,34 @@
 		},
 		methods: {
 			downloadReport(row) {
-				const url = row[0].url;
-				const fileName = row[0].name;
-
-				fetch(url)
-					.then(response => response.blob())
-					.then(blob => {
-						const link = document.createElement('a');
-						link.href = URL.createObjectURL(blob);
-						link.download = fileName;
-						link.target = "_blank"; // 可选，如果希望在新窗口中下载文件，请取消注释此行
-						link.click();
-					});
+				const url = row && row != "null" && row[0].url;
+				const fileName = row && row != "null" && row[0].name;
+				if (!url) {
+					uni.showToast({
+						title: "暂无下载文件！",
+						icon: "none"
+					})
+					return
+				}
+				uni.showLoading({
+					title: "保存中..."
+				})
+				uni.downloadFile({
+					url: url, //网络路径，下载下来  
+					success: (res) => {
+						if (res.statusCode === 200) {
+							uni.saveImageToPhotosAlbum({
+								filePath: res.tempFilePath, //下载后的临时路径  
+								success: res => { //下载完成后在相册里压根找不到  
+									uni.hideLoading()
+									uni.showToast({
+										title: "保存成功！"
+									})
+								}
+							})
+						}
+					}
+				});
 			},
 			onSubmitAll() {
 				this.sendRequest({
@@ -276,6 +294,7 @@
 			canversList(e) {
 				const that = this;
 				console.log(e);
+				that.imgList = that.imgList == null ? [] : that.imgList;
 				uni.uploadFile({
 					url: that.url_config + 'upload/image', //仅为示例，非真实的接口地址
 					filePath: e.tempFilePaths[0],
@@ -449,8 +468,7 @@
 	}
 
 	.disposal-detail {
-		margin: 88rpx 0;
-		padding: 0 30rpx;
+		padding: 0 30rpx 30rpx;
 		position: relative;
 
 		.rescue {
@@ -468,9 +486,9 @@
 				border-radius: 34rpx;
 				padding: 24rpx 24rpx;
 
-				view {
-					margin: 6rpx 0 !important;
-				}
+				// view {
+				// 	margin: 6rpx 0 !important;
+				// }
 			}
 
 			.rescue-item>view:last-child {
@@ -567,4 +585,11 @@
 			}
 		}
 	}
+
+	.imgBox_wrap,.imgBox  {
+		margin: 0 !important;
+		view {
+			margin: 0 !important;
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/pages/projectEnd/safeSame/index.vue b/pages/projectEnd/safeSame/index.vue
index 80433d33..eafb29c5 100644
--- a/pages/projectEnd/safeSame/index.vue
+++ b/pages/projectEnd/safeSame/index.vue
@@ -87,7 +87,7 @@
 					<view>特种验收</view>
 				</view>
 				<view class="menu" @click="reliefApprove">
-					<image class="icon" style="width: 30px; height: 30px;" src="@/static/safeMange/danger_check.png">
+					<image class="icon" style="width: 30px; height: 30px;" src="@/static/reliefApprove.png">
 					</image>
 					<view>新增隐患审批</view>
 				</view>
diff --git a/static/address-logo1.png b/static/address-logo1.png
new file mode 100644
index 0000000000000000000000000000000000000000..b98a214e198ba3cc5df01c8cff79aa154ffedb75
GIT binary patch
literal 1234
zcmV;@1TFiCP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px(j7da6RCr$Pn%z<3Fc5%OeglfQ&`IbZQ~+s&I5YxR0qFp!<Z?v-Z|sfa*eC0E
zwJSR?Br|!lZ0)E0*DCnoKlQ`qhZBI42K;aWM>T;}`?1)yXZvHG!E6Auu%JF~lu}DT
zSOA!R|LY(q*dyW#VDq|b&tB#LGbw;UXizOfm^}hM?lu=&##-`{NdO21cQ-#Ni0S~e
z@JivI#1V9AuHc~d&0oOJU)n5GqZWX$jI7-ws;k;Qqbh(^`>|9Cp92DrPtj;k151Ut
zar}gSE%`lE8>j|gb^mdz5FeZmvp1Xqfq-o--%tfW@Z=S|Jl&mNQBNZFT+E-;f*=ME
z628{vY$&Vk+eVF}iS`L=X}A;vxZb{_z0oOz@82JS@U%I<lxUd<fVZJaYM&Cw{U#zl
z?%Inr7lH_YbNYMgY4mn&Hm$S5rg?==*i+QmgxLlktZ*p`k8A*|_U%C_b=#9a#OP%D
znh29aN=(WA+=wI50yco_?YmBPx_q9X`T_fmYAwZ&T;IPx+gd=?KKG+60Nx2Gwcg#G
zJ;p=XSX->;_9i0?WPiC+^|iociNysJ4}h=!m$4L;5+<XuzDs?BLb)k7MQcI_!~$Te
zf9|A4rlNgbflxa2O{w<C3<zd8I{^3eDW~Lzxs(=+Op6?aY!F-x7?PiqPysuQn#z#u
zIMpO3{EGwYNB~kBbbQ6r=9~n4WMYZJhXYs~1xlO`_k^fE<|qI(K|2FXnt;<EKvY>1
z@ZL{10ibGF4IeNhL8&O<X$v854`i5$5PK{qSdfJ|85@*nOg0Q!*=Q~t$C5OXQ*sxV
zg(|;Cs3F*`Z%!gqVk)Uhkq5vHRhbr5q7KlFQTu*i*lR9lsNn#+GKTppDMm`$<T>FF
zr~khg17JBo5rEQyNPjF)%e(kVZ7%QIf+i_j0}dWux4?T9CO0OGM(A}7EV?^^va2w+
zzTkwvo;(|XIZ?kA&Pqp1tk8=pnNmFWZW#c-Jq6rwl-p=$LSA1%3|s_Yu<PzNXz=C~
zCq@z2ekLHiF0DzKW%V%V<pqKJz?u*u!m~O+;$kR9Gjugp142-Eq1}sXfhYw3_9mJ7
z=FDJf;YE4C)DY$nei8u2F$y(dF5xEw5Xlip<}jth3u&!545sY3)G^L2{G=MtgP}q=
zhVWGYXaQ|42;C6nAW((xr$%z$%SD$eVK6Za6|CrD5X^9tb;+tX7rH!2&L0T|CD=Z|
zElO;vu>>eGM>IOH*v(Pqa+O^ZumGflH<Mh6akdl$!nN6`<`|Ki>uM}At1}EkQReu9
z=8(8E92Z5VmtcN}kvvfmR-^&Jn_l9^y#lK1CFof|ZS$;Qr;r~itv|>BY6?Gu$O_Zq
zp{7g;P%;4Tnp@C^D+yDSXJckbF-H;r&*?E84n-L5GhQx1++!9%u&_alj>B*Tkgf|2
zT2uT%7JxelDc$JY>vL_hBmlzb``q#re@_HJf6aJVz?<SPe}M%E>UU~-tx7TU1>_WM
wA?pJ~Z~q31PXNBbAx*l)lLkzR_Zz(YAI<6YZf1c}n*aa+07*qoM6N<$f&!K%1^@s6

literal 0
HcmV?d00001

diff --git a/static/address-logo2.png b/static/address-logo2.png
new file mode 100644
index 0000000000000000000000000000000000000000..3bfcbf5576f81e2e79a58ce6d01881795e213cda
GIT binary patch
literal 1230
zcmV;<1Tp)GP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px(h)G02RCr$PT3u4yFbuXcWv7QI+vTZni{&K1NuVczo&-1r@I(qdL<d;Aqp(R6
zMYd(xPMBet;ca6}pME|`mR6tqPk(a#)eeB22Yhk_W(|S6)z{Tg{kNXe29p5*%2vjl
zSZmix>y=Up{@cHI5Uj1W);GqO+oL~kH&Xyp6o5`?r7i@@)LN;lA5Sko1>dqiDFQ&E
z;#l~iKx791l-I^QdQ1QcfqOS@Z>;@YY5g5S!dkmhTCW}7*0!pSbLWh#0Nj21ves2~
zO(?*&A^@m1o3+;Z9OVf(mVFL42C@Ngx4(C)wZ23biv{)pp_RJGl^e1EKw93~o5SbV
zW3DA!zjNi2Tp%O^Kq;R~xIQQk%f-1JvPo@?IZLI>WB~4$3)>g8g!1kA6bOe;F9#`J
zmIS~^piFM>QwZO=trgCsAS3~RtY34j(Z=;w=#{bd7OFswJ2y1D*<AMMGKn6=06Z)g
zmsY9M7I|yTaYz9VO?D+Qr~1Q;li~$p0PdFyD0bfKd4}r~@$2+jP9C}6-@ER60oVKR
zr6K^Z1+2AaN6)WUE{(9a^nO=^>r>TV$f_e57#>K;CjwyP{#AA0Dp5H!>Ee1{SmBbJ
z<2Bg;=(~T&QiD)|Xz^Hz=p(#|br1%OFq|9!Y<-TEaIWwHhCGqYLa1(uXV5<V`IH*P
zsV7ugDX<s#@(TiM9smLY4yf|*>4lYZP>4Aj9|^$8ED)1?q!!}lm{|Y-1lb{g<^z@y
z0{Hxh5KvqX%aH@RBFM)Agtx$q&s(?0Q0#n3Fro@W6&pN7xnp`fQS#GZuNn=}u`AWH
zk`n$nhN`F;A%M^yeM<_Vm{9TYoCtuJL<pCA`T!V=_TL9OSwl5Ljsysoi2!KOj|hX<
zF?mS&t@ZymV@in<U=jea4G~;M^zzs{Sz|7u9TpEs#U8K?0~mp~F3cWGG!x&qH+TbB
z!J9zrQyA_qB=pxJF9x8o=y((^Do10Aam*^ARy=fe8UW+*6eN`(*N23Pm@6a$o&-P_
z*T(ci!OQg-l~>%#GCK|816^F7>-C13C~;<x9I%r;plf4^r!fwlg@h!P4~*bKXD0Uo
zo*2ciH%Z}8TKS|ppfm_mC|?8sSLquQ4pS*#3;;)szzT<w36JvHY)OzhoZ1=idBW7n
z7xjQxc9=u?EC7I&`_`vkh(eygRleOC3Eejd4SJTL$d1khLbDvzdt?RSsUpX>f0VK)
zA<hA~DM7^r*`7M~hz168Rd|8NRdG)s0>Gy{Y;yV5*?b@{p3Me5#}GN$PEs@g<gQLt
zb<0qkJw6HqZf)P>f$g8p(1b++K*b?f@KFQx-aEi9AjG_A*(pa8#s(m#@*PEH*cPXT
zGBJR%0l;IZn9??emL$J*g(W8(SpbZZp71SRq8#^|Q7yrgF$e%fKQQ*<3O3d6s6}gz
zmj(gAi;z<(l<S_**vtz6WA#0koW;&b0-$Sal{zUVVZno~QonrLYgwA1g7QytbT9`@
sBE^iC>;RY%{10*U&I3M#8D<pXA6*E*ZuZNtVgLXD07*qoM6N<$g1^fq{{R30

literal 0
HcmV?d00001

diff --git a/static/reliefApprove.png b/static/reliefApprove.png
new file mode 100644
index 0000000000000000000000000000000000000000..0f6a9dea617a2ebac9ccc8603e322132f5700ba4
GIT binary patch
literal 994
zcmV<810DQ{P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px&oJmAMRCr$Pn_Y6+Fc5%ufxf5o0Hre}Gd)G&B!oxkArcNzcmz%Yx9CjhOniaT
zyf^iBWJ7Jsk|kNf$c*wB%R>8USKdD%2>$L?KL#Cm_XtD}qUV17k0QX%K88Pw*V&iI
zbZyALkO)t`7t@KZKc1o(|Bg)|lmPTsKiBQp`7&|>*#Djn$0nOm2C#g70l<ODB>s%0
z=s3UsWU?LsfCJ?xIL?QqF(yB7>9PH#-FgE6eur#{UV6t}uQzCbYob8|8YW<CvcUv`
z32+2dDs{Iyj5<W?%R5WVwZ-Y{Y`CwoD%E;b7HMn(@0W)i0*q7>yLqnm>~0!>j&I*M
z0A>P6@OXJG@YDp{sJ6RV8rJ}KOLsF<01%?VhQs0D2LwN$IY%h?0Y19IZa!Y_X34we
zIvT_OvT-cnZs~4j$~;pV=mbwU2f!9%>ouTp0QLO<z2L@HAk+7aHNY+(ppNf#1V}ak
z;OlWVT<DCi8q+9%I;S+h_*4U72f(VrxUq#`44{5Kz}^Ieg<FIt8wkb#Y*nt#`>bS-
z)LYAwF!kYj4L~h8hZAuV18r4_)cjjs0_d*}r|uM4nVwFaAmZojtmzPKe|@{(s5H(S
z0BKuJZvq5Qm5V;vyx#b8`;1&Gt_~pGZH3SY5wV@?AId3=<LvX)D-+;zdga~MJK#Qi
ze}0G&C#q~U-|%sL4d8NmDS-4FAH&<$wCPD@8r}myqN&c|r8?Xgh;G~+5#l;O)_VZ1
zdy-UXbMH(b0I1QGcJ6E?q5&Z+@{Z8WYe2cPwb(Iw(*VS6y~U9GW&uchnz`t(^#GWI
zLmm8>_X*^}v;08O(`z*V-c642E$IUmcC#nRk)rTyY|8;?cCJf=Z#{r4{Z--jRS4e_
z0LAuvrsjG7zcN}>2;T|-e3m&z81oq&Ap{NKlLIs#3kcq6@WO;RtmTE1WsVD3BF#i-
zDTS{Cz%K8viqXn-0g;`Hv_LhpJbj)$5zX7^r779&mZ8_X0F{T(=dS+9ep`4QCQB-?
zYjdvd56Lq-Ixek=28gs+rd8hD2NIw5=A|^D30IsM-T;u-0QAg3_P(kd=M4a+;#Cl;
z>VR@zL9Ibv0XRdDU)#-+rAbVX)DgtzlxpYCXNq?KG6)()64}Y9=_jz)y##QUEB!ij
zcluu<y&6JgVZ`Kf)5KU+p8x+E40gR$01Dawy$KPF(&`UI1Q;R0-ljj`A1~XCZilF}
QZ2$lO07*qoM6N<$g6X2sJOBUy

literal 0
HcmV?d00001