修改图片预览

pagesA/fire/architecture/architecture_details/architecture_details.vue

@@ -137,26 +137,39 @@
 			// 下载附件
 			down(dwpmtzmc) {
 				const fileExt = dwpmtzmc.substring(dwpmtzmc.lastIndexOf('.') + 1);
-				var that = this;
 				//加载框动画
 				uni.showLoading({
 					title: '正在下载……'
 				});
 				// #ifdef H5
-				let link = document.createElement('a');
-				link.href = dwpmtzmc;
-				link.download = '';
-				document.body.appendChild(link);
-				link.click();
-				link.remove();
-				uni.hideLoading();
-				uni.showToast({
-					icon: 'success',
-					mask: true,
-					title: '文件已下载',
-					duration: 2000
-				});
-
+				if (fileExt === 'png' || fileExt === 'jpg') {
+					// 预览图片
+					uni.previewImage({
+						urls: [dwpmtzmc],
+						// longPressActions: {
+						// itemList: ['发送给朋友', '保存图片', '收藏'],
+						success: function(data) {
+							uni.hideLoading();
+						},
+						fail: function(err) {
+						}
+						// }
+					})
+				} else {
+					const link = document.createElement('a');
+					link.href = dwpmtzmc;
+					link.download = dwpmtzmc;
+					document.body.appendChild(link);
+					link.click();
+					link.remove();
+					uni.hideLoading();
+					uni.showToast({
+						icon: 'success',
+						mask: true,
+						title: '文件已下载',
+						duration: 2000
+					});
+				}	
 				// #endif
 				// #ifdef MP-WEIXIN
 				// console.log(that.hostUrl + '/uploads'+ dwpmtzmc)

pagesA/fire/architecture/edit_architecture/edit_architecture.vue

@@ -133,7 +133,7 @@
 					<u-form-item label="燃气类型	">
 						<u-input v-model="formData.rqlx" placeholder="请输入燃气类型" />
 					</u-form-item>
-					<u-form-item label="总平面图纸名称	">
+					<u-form-item label="总平面图纸名称" v-if="formData.File">
 						<!-- 选择文件上传 -->
 						<uni-file-picker v-model="formData.File" del-icon limit="1" auto-upload file-mediatype="all"
 							@select="select" @delete="deleteFile">

pagesA/fire/architecture/index.vue

@@ -203,9 +203,9 @@
 					buildingName: this.keyword
 				}).then(response => {
 					this.isLoaded = true
-					this.tableData = [...this.tableData, ...response.data]
+					this.tableData = [...this.tableData, ...response.data.records]
 					this.loading = false
-					this.total=response.total
+					this.total=response.data.total
 					// this.tableData = response.data;
 				});
 			},

pagesA/fire/check_active/check_implement/check_implement.vue

@@ -56,9 +56,9 @@
 						<view class="uni-grid-wrap" v-if="item.attUrl.length!=0">
 							<view style="color: #8C8C8C;">设备图片</view>
 							<view style="position: relative;width: 180rpx;float: left;margin: 40rpx;"
-								v-for="(items,indexs) in item.attUrl" :key="indexs">
-								<image :src="items"
-									style="width: 160rpx;height: 160rpx;border-radius: 30rpx;float: left;">
+								v-for="(items,indexs) in item.attUrl" :key="indexs"
+								@click="viewImageBig(items,item.attUrl)">
+								<image :src=" items" style="width: 160rpx;height: 160rpx;border-radius: 30rpx;float: left;">
 								</image>
 								<u-icon name="close" color="#4CB2B6" size="19" @click="closeImage(item,indexs,index)">
 								</u-icon>
@@ -229,7 +229,8 @@
 					</view>
 					<view class="uni-grid-wraps">
 						<view style="position: relative;width: 180rpx;float: left;margin: 10rpx 15rpx 0 0rpx;"
-							v-for="(items,indexs) in item.attUrl" :key="indexs">
+							v-for="(items,indexs) in item.attUrl" :key="indexs"
+							@click="viewImageBig(items,item.attUrl)">
 							<image :src="items" style="width: 160rpx;height: 160rpx;border-radius: 30rpx;float: left;">
 								<u-icon name="close" color="#4CB2B6" size="19" @click="closeImage(item,indexs,index)">
 								</u-icon>
@@ -285,6 +286,9 @@
 	import {
 		getAccessToken
 	} from '@/utils/auth'
+	import {
+		viewImgBig
+	} from '@/utils/common.js';
 	import config from '@/config'
 	import store from "@/store"
 	import loadImage from 'blueimp-load-image';
@@ -421,6 +425,9 @@
 		},
 		onShow() {},
 		methods: {
+			viewImageBig(i, imgList) {
+				viewImgBig(i, imgList)
+			},
 			// ----隐患
 			checkboxConfirm2(index) {
 				this.choiceDanger.map(i => {
@@ -491,7 +498,7 @@
 						this.insTypeData[0].dengerType = i.value
 					}
 				});
-				console.log(this.insTypeData[0].dengerType,'this.insTypeData[0].dengerType');
+				console.log(this.insTypeData[0].dengerType, 'this.insTypeData[0].dengerType');
 				this.description2 = this.checkedPopupDanger.toString()
 				if (this.description2.startsWith(',')) {
 					this.description2 = this.description2.slice(1);
@@ -951,8 +958,10 @@
 							// this.newInsTypeData = uni.getStorageSync('newInsTypeDatas')
 							this.tableData.map(i => {
 								if (i.id == this.checkTableDataId) {
-									i.dengerType=this.insTypeData[0].dengerType
-									i.hisFpdCreateReqVOList = [...i.hisFpdCreateReqVOList, ...this.insTypeData]
+									i.dengerType = this.insTypeData[0].dengerType
+									i.hisFpdCreateReqVOList = [...i.hisFpdCreateReqVOList, ...this
+										.insTypeData
+									]
 									i.hisFpdCreateReqVOList.map(k => {
 										k['broadId'] = that.formData.broadId
 										if (k.id == fpdId) {
@@ -1022,19 +1031,8 @@
 					sizeType: ['original', 'compressed'],
 					// sourceType: ['album','camera'], //打开系统相册
 					success(res) {
-						// that.loading = true
 						if (Array.isArray(res.tempFilePaths)) { //从相册选择有三张的情况
-							// if (res.tempFilePaths.length === 3) {
-							// 	pictures.length = 0
-							// } else if (res.tempFilePaths.length == 2 && pictures.length == 2) {
-							// 	pictures.splice(0, 1)
-							// }
 							res.tempFilePaths.forEach(item => {
-								// let picture = {
-								// 	url: item,
-								// 	show: false
-								// }
-								// pictures.push(picture)
 								loadImage(
 									item,
 									function(canvas) {
@@ -1113,11 +1111,6 @@
 													this.$modal.msg(err.msg)
 												}
 											})
-											// // 保存到本地
-											// uni.saveImageToPhotosAlbum({
-											// 	filePath: item,
-											// })
-											// 上传完毕后，释放临时URL
 											URL.revokeObjectURL(fileUrl);
 										}, 'image/jpeg', 0.6); // 设置压缩后的图片格式为 JPEG，压缩质量为 0.6
 									}, {

pagesA/fire/check_active/check_list/check_list.vue

@@ -109,7 +109,7 @@
 						</uni-row>
 						<uni-row class="demo-uni-row tupian-flex">
 							<view v-for="(items,indexs) in item.inspectHisSubDOList">
-								<image v-if="items.imgUrl" :key="indexs" :src="items.imgUrl" class="image-size"></image>
+								<image v-if="items.imgUrl" :key="indexs" :src="items.imgUrl" class="image-size" @click="viewImageBig(items.imgUrl)"></image>
 							</view>
 
 						</uni-row>
@@ -156,9 +156,9 @@
 								</uni-col>
 							</uni-row>
 							<uni-row class="demo-uni-row tupian-flex">
-								<image v-if="items.imgUrl1!=null" :src="items.imgUrl1" class="image-size"></image>
-								<image v-if="items.imgUrl2!=null" :src="items.imgUrl2" class="image-size"></image>
-								<image v-if="items.imgUr3!=null" :src="items.imgUrl3" class="image-size"></image>
+								<image v-if="items.imgUrl1!=null" :src="items.imgUrl1" class="image-size" @click="viewImageBig(items.imgUrl)"></image>
+								<image v-if="items.imgUrl2!=null" :src="items.imgUrl2" class="image-size" @click="viewImageBig(items.imgUrl)"></image>
+								<image v-if="items.imgUr3!=null" :src="items.imgUrl3" class="image-size" @click="viewImageBig(items.imgUrl)"></image>
 							</uni-row>
 						</view>
 					</view>
@@ -230,6 +230,14 @@
 		},
 
 		methods: {
+			viewImageBig(item){
+				let imgList=[]
+				imgList.push(item)
+				uni.previewImage({
+					urls: imgList,
+					current: item
+				});
+			},
 			// 下载附件
 			down(appendix) {
 				downSee(appendix)

pagesA/fire/check_inspection/check_inspection.vue

@@ -309,7 +309,8 @@
 		getOrgId //获取orgId
 	} from '@/api/fire_device';
 	import {
-		shijianc
+		shijianc,
+			viewImgBig
 	} from '@/utils/common.js'
 	//隐患弹框--
 	import {

pagesA/fire/check_inspection/inspect_detail/inspect_detail.vue

@@ -64,13 +64,13 @@
 								<view class="  flex flex-direction-row">
 									<view class="padding-lr-lg" v-if="formData.activeInspect">
 										<image v-if="formData.activeInspect.imgUrl1"
-											:src="formData.activeInspect.imgUrl1" style="width:120rpx;height: 120rpx;">
+											:src="formData.activeInspect.imgUrl1" style="width:120rpx;height: 120rpx;" @click="viewImageBig(formData.activeInspect.imgUrl1)">
 										</image>
 										<image v-if="formData.activeInspect.imgUrl2"
-											:src="formData.activeInspect.imgUrl2" style="width:120rpx;height: 120rpx;">
+											:src="formData.activeInspect.imgUrl2" style="width:120rpx;height: 120rpx;" @click="viewImageBig(formData.activeInspect.imgUrl1)">
 										</image>
 										<image v-if="formData.activeInspect.imgUrl3"
-											:src="formData.activeInspect.imgUrl3" style="width:120rpx;height: 120rpx;">
+											:src="formData.activeInspect.imgUrl3" style="width:120rpx;height: 120rpx;" @click="viewImageBig(formData.activeInspect.imgUrl1)">
 										</image>
 										<!-- <u-album :urls="item.imgUrl"></u-album> 不显示-->
 									</view>
@@ -150,6 +150,14 @@
 		},
 		onReady() {},
 		methods: {
+			viewImageBig(item){
+				let imgList=[]
+				imgList.push(item)
+				uni.previewImage({
+					urls: imgList,
+					current: item
+				});
+			},
 			// =================数据转换================== 
 			// =============获取数据===================s
 			// =============获取数据===================s
@@ -205,7 +213,7 @@
 		/* #ifdef  MP-WEIXIN*/
 		margin-top: 100rpx;
 		/* #endif */
-		z-index: 9999999;
+		z-index: 99;
 		position: relative;
 	}
 

pagesA/fire/fire_device/edit_device/edit_device.vue

@@ -18,7 +18,7 @@
 						<u-input v-model="formData.fpdCode" placeholder="请输入设施编号	" />
 					</u-form-item>
 					<u-form-item label="设施二维码">
-						<img :src="formData.fpdQcode" alt="设施二维码" style='width: 300upx;height: 300upx;'>
+						<img :src="formData.fpdQcode" alt="设施二维码" style='width: 300upx;height: 300upx;'  @click="viewImageBig(formData.fpdQcode)">
 					</u-form-item>
 
 <!-- 					<u-form-item label="设备状态" @click="
@@ -56,7 +56,7 @@
 					<view v-for="(items,indexs) in formData.picVOList" :key="indexs">
 						<view style="display:flex;align-items:center;justify-content:space-between;">
 							<view style="position: relative;width: 180rpx;float: left;margin: 10rpx 15rpx 0 0rpx;">
-								<image :src="items.url"
+								<image :src="items.url"  @click="viewImageBig(items.url)"
 									style="width: 160rpx;height: 160rpx;border-radius: 30rpx;float: left;">
 									<u-icon name="close" color="#4CB2B6" size="19" @click="closeImage(items,indexs)">
 									</u-icon>
@@ -236,6 +236,15 @@
 		},
 
 		methods: {
+			viewImageBig(i) {
+				let imgList=[]
+				imgList.push(i)
+				uni.previewImage({
+					urls: imgList,
+					current: i
+				});
+			},
+			// ===
 			closeImage(val, index) {
 				this.formData.picVOList.splice(index, 1)
 		

pagesA/fire/hidden_trouble/trouble_details/trouble_details.vue

@@ -42,7 +42,7 @@
 							</view>
 						<view class="  flex flex-direction-row"> 
 							<view class="padding-lr-lg" v-for="(item,index) in formData.imgUrlList" :key="index">
-								<image :src="item.imgUrl" style="width:120rpx;height: 120rpx;"></image>
+								<image :src="item.imgUrl" style="width:120rpx;height: 120rpx;"  @click="viewImageBig(item.imgUrl)"></image>
 								 <!-- <u-album :urls="item.imgUrl"></u-album> 不显示-->
 							</view>
 						</view>
@@ -72,6 +72,9 @@
 		DICT_TYPE,
 		getDictDatas
 	} from "@/utils/dict";
+	import {
+		viewImgBig
+	} from '@/utils/common.js';
 	let that = null;
 	import config from '@/config'
 	const baseUrlImg=config.baseUrlImg
@@ -117,6 +120,14 @@
 		}, 
 		onReady() {},
 		methods: {
+			viewImageBig(i) {
+				let imgList=[]
+				imgList.push(i)
+				uni.previewImage({
+					urls: imgList,
+					current: i
+				});
+			},
 			// =================数据转换================== 
 			// =============获取数据===================s
 			// =============获取数据===================s
@@ -166,7 +177,7 @@
 		/* #ifdef  MP-WEIXIN*/
 		margin-top: 100rpx;
 		/* #endif */
-		z-index: 9999999;
+		z-index: 99;
 		position: relative;
 	}
 </style>

pagesB/fire/check_record/picture/picture.vue

@@ -115,7 +115,7 @@
 					</uni-row>
 					<uni-row class="demo-uni-row tupian-flex">
 						<view v-for="(items,indexs) in tableData.imgList">
-							<image v-if="items.imgUrl" :key="indexs" :src="items.imgUrl" class="image-size"></image>
+							<image v-if="items.imgUrl" :key="indexs" :src="items.imgUrl" class="image-size" @click="viewImageBig(items.imgUrl)"></image>
 						</view>
 
 					</uni-row>
@@ -166,9 +166,9 @@
 							</uni-row>
 
 							<uni-row class="demo-uni-row tupian-flex">
-								<image v-if="item.img_url1" :src="item.img_url1" class="image-size"></image>
-								<image v-if="item.img_url2" :src="item.img_url2" class="image-size"></image>
-								<image v-if="item.img_url3" :src="item.img_url3" class="image-size"></image>
+								<image v-if="item.img_url1" :src="item.img_url1" class="image-size"  @click="viewImageBig(item.imgUrl)"></image>
+								<image v-if="item.img_url2" :src="item.img_url2" class="image-size"  @click="viewImageBig(item.imgUrl)"></image>
+								<image v-if="item.img_url3" :src="item.img_url3" class="image-size"  @click="viewImageBig(item.imgUrl)"></image>
 							</uni-row>
 						</view>
 					</view>
@@ -232,6 +232,14 @@
 
 		},
 		methods: {
+			viewImageBig(i) {
+				let imgList=[]
+				imgList.push(i)
+				uni.previewImage({
+					urls: imgList,
+					current: i
+				});
+			},
 			down(val){
 				downSee(val)
 			},

utils/common.js

@@ -332,4 +332,12 @@ export function uploadFile(tempFilePaths, i, that) {
 			}
 		});
 	});
+}
+// 图片放大
+export function viewImgBig(i, imgList) {
+	uni.previewImage({
+		urls: imgList,
+		current: i
+	});
+	
 }

utils/request.js

@@ -66,28 +66,10 @@ const request = config => {
 							refreshToken({
 								refreshToken: getRefreshToken() // 刷新token的令牌存在token的对象里面，需要传给后端
 							}).then(reshRespore => {
-								// console.log(reshRespore,
-								// 	'reshResporereshResporereshRespore');
-								// 请求成功把新的token存到本地
 								setToken(reshRespore.data);
 								// 已经刷新了token，将所有队列中的请求进行重试
 								requests.forEach((item) => item(reshRespore.data
 									.accessToken))
-								// requests = []
-								// // 每个接口请求都要存入队列，等刷新完以后都需要执行
-								// return new Promise((resolve) => {
-								// 	// 将resolve放进队列，用一个函数形式来保存，等token刷新后直接执行
-								// 	requests.push((token) => {
-								// 		//这一步一定要有，刷新token，因为存入的信息是旧的token
-								// 		response.config.header[
-								// 				'Authorization'] =
-								// 			'Bearer ' + token;
-								// 		resolve(uni.$u.http.request(response
-								// 			.config)) //执行请求
-
-								// 	})
-								// that.$forceUpdate()
-								// })
 								requests = []
 								// 刷新完token后重新调用上一次的接口
 								resolve(uni.$u.http.request(config)) // 执行请求
@@ -103,7 +85,6 @@ const request = config => {
 							})
                            
 						} catch {
-							// 		uni.$u.toast('未知错误')
 							showConfirm('登录状态已过期，您可以继续留在该页面，或者重新登录?').then(res => {
 								if (res.confirm) {
 									uni.navigateTo({
@@ -116,11 +97,13 @@ const request = config => {
 							isRefreshing = false
 						}
 					} else {
-						// 添加到请求队列中
-						requests.push(token => {
-							config.header['Authorization'] = 'Bearer ' + token;
-							resolve(uni.$u.http.request(config)) // 执行请求
-						})
+						showConfirm('登录状态已过期，您可以继续留在该页面，或者重新登录?').then(res => {
+							if (res.confirm) {
+								uni.navigateTo({
+									url: '/pages/login'
+								})
+							}
+						});
 					}
 				} else if (code === 500) {
 					toast(msg)