改版

components/bottomSheet/bottomSheet.vue

@@ -25,9 +25,9 @@
 							</view>
 
 							<view v-if="title=='打孔'">
-								<view class="uni-media-list-text-top">
+								<!-- <view class="uni-media-list-text-top">
 									<view class="tit-text">孔距:</view>{{value.zEngineeringMaterialBo[0].corrosionLevel}}
-								</view>
+								</view> -->
 								<view class="uni-media-list-text-top">
 									<view class="tit-text">施工时间:</view>{{value.createTime}}
 								</view>

components/bottomSheet/bottomSheetMoreNew.vue

@@ -72,7 +72,7 @@
 								<view class="normal-text">{{value.constructPhone}}</view>
 							</view>
 
-							<view v-if="title!='回填、撤场'">
+							<view v-if="title!='回填、撤场'&&title!='调压柜'">
 								<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px;">
 									<view v-for="(item,index) in value.zEngiineeringPhotoBoList" :key="index"
 										style="position: relative;">
@@ -91,6 +91,109 @@
 								</view>
 
 							</view>
+							<view v-else-if="title=='调压柜'">
+
+								<view class="uni-common-mt" style="width: 100%;">
+									<text class="uni-title uni-common-pl" style=" font-size: 13px;color:
+											#000;margin-top: 5px;margin-left: 8px;">调压箱名牌照片:</text>
+								</view>
+								<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px;">
+									<view v-for="(item,index) in value.boxBrand" :key="index"
+										style="position: relative;">
+										<view
+											v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'  || item.substring(item.length - 3) == 'jpeg'">
+											<image :src="item" mode=""
+												style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
+												@click="showPhoto(index,value.boxBrand)">
+											</image>
+										</view>
+										<view v-else>
+											<video :src="item"
+												style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+										</view>
+									</view>
+								</view>
+								<view class="uni-common-mt" style="width: 100%;">
+									<text class="uni-title uni-common-pl" style=" font-size: 13px;color:
+											#000;margin-top: 5px;margin-left: 8px;">调压箱内石粉回填照片:</text>
+								</view>
+								<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px;">
+									<view v-for="(item,index) in value.stonePowder" :key="index"
+										style="position: relative;">
+										<view
+											v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'  || item.substring(item.length - 3) == 'jpeg'">
+											<image :src="item" mode=""
+												style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
+												@click="showPhoto(index,value.stonePowder)">
+											</image>
+										</view>
+										<view v-else>
+											<video :src="item"
+												style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+										</view>
+									</view>
+								</view>
+								<view class="uni-common-mt" style="width: 100%;">
+									<text class="uni-title uni-common-pl" style=" font-size: 13px;color:
+											#000;margin-top: 5px;margin-left: 8px;">调压箱防雷接地照片:</text>
+								</view>
+								<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px;">
+									<view v-for="(item,index) in value.lightning" :key="index"
+										style="position: relative;">
+										<view
+											v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'  || item.substring(item.length - 3) == 'jpeg'">
+											<image :src="item" mode=""
+												style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
+												@click="showPhoto(index,value.lightning)">
+											</image>
+										</view>
+										<view v-else>
+											<video :src="item"
+												style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+										</view>
+									</view>
+								</view>
+								<view class="uni-common-mt" style="width: 100%;">
+									<text class="uni-title uni-common-pl" style=" font-size: 13px;color:
+											#000;margin-top: 5px;margin-left: 8px;">调压箱底腿连接照片:</text>
+								</view>
+								<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px;">
+									<view v-for="(item,index) in value.bottomLeg" :key="index"
+										style="position: relative;">
+										<view
+											v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'  || item.substring(item.length - 3) == 'jpeg'">
+											<image :src="item" mode=""
+												style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
+												@click="showPhoto(index,value.bottomLeg)">
+											</image>
+										</view>
+										<view v-else>
+											<video :src="item"
+												style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+										</view>
+									</view>
+								</view>
+								<view class="uni-common-mt" style="width: 100%;">
+									<text class="uni-title uni-common-pl" style=" font-size: 13px;color:
+											#000;margin-top: 5px;margin-left: 8px;">调压箱护栏及地面硬化（远景）照片:</text>
+								</view>
+								<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px;">
+									<view v-for="(item,index) in value.groundHardening" :key="index"
+										style="position: relative;">
+										<view
+											v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'  || item.substring(item.length - 3) == 'jpeg'">
+											<image :src="item" mode=""
+												style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
+												@click="showPhoto(index,value.groundHardening)">
+											</image>
+										</view>
+										<view v-else>
+											<video :src="item"
+												style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+										</view>
+									</view>
+								</view>
+							</view>
 							<view v-else>
 								<view class="uni-common-mt" style="width: 100%;">
 									<text class="uni-title uni-common-pl" style=" font-size: 13px;color:

config.js

@@ -1,10 +1,10 @@
 // 应用全局配置
 module.exports = {
 
-	baseUrl: 'https://www.xcx.cczdsz.cn/prod-api',
-	// baseUrl: 'http://192.168.4.88:8080',
+	//baseUrl: 'https://www.xcx.cczdsz.cn/prod-api',
+	//baseUrl: 'http://192.168.4.88:8080',
 	//baseUrl: 'http://192.168.4.23:8080',
-	//baseUrl: 'http://192.168.4.20:8080',
+	baseUrl: 'http://192.168.4.20:8080',
 	// baseUrl: 'http://192.168.4.6:8080',
 
 	baseIconUrl: 'https://www.xcx.cczdsz.cn/app/images/',

pages.json

@@ -186,6 +186,20 @@
 				"navigationBarTitleText": "带气封堵施工",
 				"enablePullDownRefresh": false
 			}
+		},
+		{
+			"path": "pages/pipe_jacking/pipe_jacking",
+			"style": {
+				"navigationBarTitleText": "顶管材料",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/DailyLog/daily_log",
+			"style": {
+				"navigationBarTitleText": "每日施工日志",
+				"enablePullDownRefresh": false
+			}
 		}
 
 	],

pages/DailyLog/daily_log.vue

@@ -0,0 +1,533 @@
+	<template>
+		<scroll-view>
+			
+
+			<view class="background">
+				<view>
+					<view class="uni-list">
+						<view
+							style="font-size: 16px;margin-left: 10px;margin-top: 10px;display: flex; justify-content: space-between;margin-bottom: 10px;">
+							{{objValue.enginClassValue}}
+
+							<span
+								style="color: blue;font-size: 14px;  display: flex;justify-content:flex-end; margin-right: 10px;"
+								@click="history">历史</span>
+						</view>
+						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
+
+							<view>
+								施工时间
+							</view>
+							<view @click="openDatetimePicker('sg')">
+								<span style="color: black;">{{time}}</span>
+								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+							</view>
+						</view>
+
+
+
+						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
+							<view class="uni-common-mt" style="width: 100%;">
+								<text class="uni-title uni-common-pl">施工内容</text>
+								<view style="width: 100%;box-sizing: border-box;">
+									<textarea class="textarea" placeholder="请输入施工内容" maxlength="255"
+										placeholder-style="padding: 10rpx;"
+										style="width: 100%;height: 100%;border: 1rpx solid #cccccc; border-radius: 15rpx;padding: 10rpx;line-height:normal;"
+										auto-height v-model="projectContent"></textarea>
+								</view>
+							</view>
+						</view>
+
+
+
+
+					</view>
+
+					<view class="align-items" style="margin-top: 20px;margin-bottom: 20px;">
+						<view class="container" style="color: #b2b2b2;">*请上传照片</view>
+						<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px; margin-left: 10px;">
+							<image :src="loadImgSrc('updateimg.png')" mode=""
+								style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="choose()"
+								v-show="reviewStatus!='1'"></image>
+							<view v-for="(item,index) in imgArr" :key="index" style="position: relative;">
+								<view
+									v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'||item.substring(item.length-4)=='jpeg' ">
+									<image :src="item" mode="" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
+										@click="showPhoto(index)">
+									</image>
+								</view>
+								<view v-else>
+									<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+								</view>
+								<view @click="remove(index)"
+									style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
+									<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
+									</image>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="action-btn" v-show="reviewStatus!='1'">
+				<button @click="submit" class="btn cu-btn block bg-blue lg round">确认上传</button>
+			</view>
+
+			<bottom-sheet ref="refShare" :data="historyList"></bottom-sheet>
+			<yt-dateTimePicker ref="myPicker" @submit="handleSubmit" :start-year="2024" :end-year="2099"
+				:time-hide="[true, true, true, true, true, true]" :time-label="['年', '月', '日', '时', '分', '秒']" />
+		</scroll-view>
+	</template>
+
+
+
+	<script>
+		import bottomSheet from '../../components/bottomSheet/bottomSheet.vue'
+		import {
+			getDicts
+		} from "@/api/system/dict/data";
+		import {
+		
+			addTearOldPipe,
+		
+		} from '@/api/common'
+		import {
+			getToken
+		} from '../../utils/auth';
+
+
+		export default {
+			components: {
+				
+				bottomSheet,
+			},
+			data() {
+
+				return {
+					headers: {
+						Authorization: "Bearer " + getToken()
+					},
+					reviewStatus: '', //是否可以点击
+					startDate: '2022-02-04',
+					endDate: '2025-02-04',
+					mode: 4,
+					type: '',
+					
+					objValue: '', //上一页面传过来的值  新增接口用
+					
+					imgArr: [],
+				
+				
+					time: '', //施工时间
+					timeType: '', //时间类型
+				
+					showTime: false,
+				
+					progress: 0, //上传图片进度百分比
+					loading: false,
+				
+					title: '',
+					historyList: {} //历史数据
+
+				}
+			},
+
+			created() {
+				this.time = this.traversalTime(new Date().getTime()) //在data里定义变量-nowTime
+			},
+
+			onLoad(options) {
+				if ('params' in options) {
+					this.objValue = JSON.parse(decodeURIComponent(options.params));
+					
+				}
+
+
+			},
+			methods: {
+
+				// 打开picker
+				openDatetimePicker(type) {
+					this.timeType = type;
+					this.$refs.myPicker.show();
+				},
+
+				// 关闭picker
+				closeDatetimePicker() {
+					this.$refs.myPicker.hide();
+				},
+
+				handleSubmit(e) {
+					if (this.timeType == 'ht') {
+						this.BackfillingTime = `${e.year}-${e.month}-${e.day} ${e.hour}:${e.minute}:${e.second}`;
+					} else {
+						this.time = `${e.year}-${e.month}-${e.day} ${e.hour}:${e.minute}:${e.second}`;
+					}
+				},
+
+				//获取当前时间
+				traversalTime(timestamp) {
+					//timestamp(时间戳)是整数，否则要parseInt转换
+					let time = new Date(timestamp);
+					let y = time.getFullYear();
+					let m = time.getMonth() + 1;
+					let d = time.getDate();
+					let h = time.getHours();
+					let mm = time.getMinutes();
+					let s = time.getSeconds();
+					return y + '-' + this.addTimes(m) + '-' + this.addTimes(d) + ' ' + this.addTimes(h) + ':' + this.addTimes(
+						mm) + ':' + this.addTimes(s);
+
+
+				},
+				addTimes(m) {
+					return m < 10 ? '0' + m : m
+				},
+				//判断是否选择
+
+				isEmpty(str) {
+
+					return (!str || 0 === str.length);
+
+				},
+
+				// 显示历史弹窗
+				handleShowSheet() {
+					this.shareState = true;
+				},
+				// 隐藏历史弹窗
+				handleHiddenShare() {
+					this.shareState = false;
+				},
+				showPhoto(index) {
+					uni.previewImage({
+						current: index,
+						urls: this.imgArr,
+					})
+
+				},
+				remove(index) {
+					uni.showModal({
+						title: '提示',
+						content: '是否删除该图片或视频？',
+						success: (res) => {
+							if (res.confirm) {
+								this.imgArr.splice(index, 1)
+								if (this.imgArr.length <= 0) {
+									this.photo = true;
+								}
+							}
+						}
+					})
+				},
+				choose() {
+					let _this = this;
+					uni.showActionSheet({
+						title: '上传',
+						itemList: ['图片', '视频'],
+						success: (res) => {
+							if (res.tapIndex == 0) {
+								this.chooseimage()
+							} else {
+								this.choosevideo()
+							}
+						}
+					})
+				},
+				chooseimage() {
+
+					let _this = this;
+					uni.chooseImage({
+						sizeType: ['album', 'camera'],
+						success(resp) {
+							resp.tempFiles.forEach((item, index) => {
+								const task = uni.uploadFile({
+									url: _this.$HTTP + `/obs`,
+									filePath: item.path,
+									name: 'file',
+									formData: {},
+									header: _this.headers,
+
+									success: res => {
+										// 判断是否json字符串，将其转为json格式
+										// let data = _this.$u.test.jsonString(res
+										// 	.data) ? JSON.parse(res.data) : res.data;
+										let data = JSON.parse(res.data);
+										if (![200].includes(data.code)) {
+											// this.uploadError(index, data);
+											_this.$modal.msg(data.msg)
+										} else {
+											if (_this.progress === 100) {
+												_this.imgArr.push(data.data.url)
+												_this.$modal.msg('上传成功！')
+												_this.photo = false;
+											}
+										}
+									},
+									fail: e => {
+										_this.$modal.msg('上传失败！')
+										//_this.uploadError(index, e);
+									},
+									complete: res => {
+										uni.hideLoading();
+										_this.uploading = false;
+
+									}
+								});
+								task.onProgressUpdate(res => {
+									_this.progress = res.progress;
+									uni.showLoading({
+										title: '上传中'
+									})
+									if (_this.progress != 100) {
+										_this.loading = false
+									} else {
+										_this.loading = true
+									}
+								});
+
+							})
+
+						},
+					})
+				},
+
+				choosevideo() {
+					let _this = this;
+					uni.chooseVideo({
+						sourceType: ['album', 'camera'],
+						maxDuration: 30,
+						success(resp) {
+							const task = uni.uploadFile({
+								url: _this.$HTTP + `/obs`,
+								filePath: resp.tempFilePath,
+								name: 'file',
+								formData: {},
+								header: _this.headers,
+								success: res => {
+									// 判断是否json字符串，将其转为json格式
+									let data = JSON.parse(res.data);
+									if (![200].includes(res.statusCode)) {
+										this.uploadError(index, data);
+									} else {
+										//上传成功
+										if (_this.progress === 100) {
+											_this.imgArr.push(data.data.url)
+											_this.$modal.msg('上传成功！')
+											_this.photo = false;
+										}
+									}
+								},
+								fail: e => {
+									_this.$modal.msg('上传失败！')
+									this.uploadError(index, e);
+								},
+								complete: res => {
+									uni.hideLoading();
+									_this.uploading = false;
+								}
+							});
+							task.onProgressUpdate(res => {
+								_this.progress = res.progress;
+								uni.showLoading({
+									title: '上传中'
+								})
+								if (_this.progress != 100) {
+									_this.loading = false
+								} else {
+									_this.loading = true
+								}
+							});
+
+						},
+					})
+
+				},
+
+				
+
+
+				
+			
+				
+				//提交数据
+				submit() {
+
+
+					if (this.imgArr.length <= 0) {
+						this.$modal.msg('请上传照片或视频')
+						return
+					}
+					if (this.loading == false) {
+						this.$modal.msg('照片或视频未上传完毕，无法提交！')
+						return
+					}
+					//提交
+					this.onsubmit();
+
+				},
+
+
+				onsubmit() {
+					
+					//提交
+					let param = {
+					
+
+						enginType: this.objValue.enginType, //写死 上一页面传过来的  新建/旧改
+						enginClassification: this.objValue.enginClassification, //写死  上一页面传过来的  //室内 - 庭院 - 架空
+						enginCycle: this.projectValue.dictValue, //工程周期
+						zEngineeringNodeBo: {
+							type: this.objValue.enginClassValue, //写死 上一页面传过来的  (拆旧管等 字典值)
+							zEngineeringInfoBo: {
+								//constructAccordingDrawings: this.isCheck, //是否按图纸施工
+								segmentedCompressionQualified: this.isOkValue, // 分段打压是否台格
+								zEngiineeringPhotoBoList: this.imgArr, //照片集合
+								constructTime: this.time, //施工时间
+								backfillTime: this.BackfillingTime, // 回填时间
+								remark: this.projectContent, //施工内容
+								// headName: this.user.nickName, // 负责人名称
+								// headPhone: this.user.phonenumber, // 负责人电话
+								zEngineeringMaterialBo: [{
+									materialQuality: this.materialValue.id, //材质
+									specifications: this.specificationValue.id, //规格
+									number: this.inputNumberValue //数量
+								}]
+							}
+
+						}
+
+					}
+					uni.showLoading()
+					addTearOldPipe(param).then(res => {
+						if (res.code == '200') {
+							uni.hideLoading()
+							uni.showToast({
+								title: res.msg,
+								icon: 'none',
+								//显示持续时间为 3秒
+								duration: 2000
+							});
+							setTimeout(function() {
+								uni.navigateBack();
+							}, 1000)
+
+						}
+
+						//this.$modal.closeLoading()
+					})
+
+				},
+				history() {
+				
+					let param = {
+						
+						enginType: this.objValue.enginType, //写死 上一页面传过来的  新建/旧改
+						enginClassification: this.objValue.enginClassification, //写死  上一页面传过来的  //室内 - 庭院 - 架空
+					}
+					getRoomProjectId(param).then(res => {
+
+						if (res.code == '200') {
+
+							if (res.data != null) {
+
+								getRoomProjectList(res.data.id, this.objValue.enginClassValue).then(
+									res => {
+
+										this.historyList = res.data
+										if (res.data.zEngineeringNodeBo != null) {
+											this.showHistoryList();
+										} else {
+											this.$modal.msg("暂无历史信息")
+										}
+
+									})
+
+							} else {
+								this.$modal.msg("暂无工程信息")
+							}
+						} else {
+							this.$modal.msg(res.msg)
+						}
+					})
+				},
+				showHistoryList() {
+					this.$refs.refShare.handleShowShare();
+				}
+			}
+		}
+	</script>
+
+	<style lang="scss">
+		.container {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			padding: 10px;
+			position: relative;
+
+		}
+
+		.uni-list {
+			border: 1xp solid #eee;
+		}
+
+		.to-right-icon {
+			width: 15px;
+			height: 15px;
+			position: absolute;
+			top: 50%;
+			transform: translateY(-50%);
+		}
+
+		.text {
+			font-size: 16px;
+			color: #333;
+		}
+
+		.background {
+			// border: 15px solid hsla(0, 0%, 100%, .5);
+			background: white;
+			background-clip: padding-box;
+			padding: 20rpx;
+			border-radius: 20rpx;
+			margin: 20rpx;
+			/*从padding开始往外面裁剪背景*/
+
+
+		}
+
+
+		.btn {
+			width: 715rpx;
+			height: 69rpx;
+			background: #79A4F0;
+			border-radius: 6rpx;
+			font-size: 25rpx;
+			font-family: Microsoft YaHei;
+			font-weight: 400;
+			color: #FFFFFF;
+			line-height: 69rpx;
+			margin-top: 40rpx;
+			margin-bottom: 100rpx;
+		}
+
+		.number {
+			display: flex;
+			/* 水平居中显示子元素 */
+			align-items: flex-start;
+			/* 垂直居中显示子元素 */
+			justify-content: space-between;
+			/* 左右间距等于间距大小 */
+			padding: 10px;
+			/* 设置padding以提高视觉效果 */
+		}
+
+		.textarea {
+			margin-top: 10upx;
+			width: 100%;
+			border: 1rpx solid red;
+			min-height: 100upx;
+			line-height: 20px;
+		}
+	</style>

pages/enginproject/enginproject.vue

@@ -226,9 +226,9 @@
 
 						</view>
 					</view>
-					<view v-if="objValue.value!='回填、撤场'">
+					<view v-if="objValue.value!='回填、撤场'&&objValue.value!='调压柜'">
 						<view class="align-items" style="margin-top: 20px;margin-bottom: 20px;">
-							<view class="container" style="color: #b2b2b2;">*请上传照片</view>
+							<view class="container" style="color: #b2b2b2;">*请上传照片{{objValue.value}}</view>
 							<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px; margin-left: 10px;">
 								<image :src="loadImgSrc('updateimg.png')" mode=""
 									style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="choose('other')">
@@ -252,7 +252,8 @@
 							</view>
 						</view>
 					</view>
-					<view v-else>
+
+					<view v-else-if="objValue.value=='回填、撤场'">
 
 						<view class="align-items" style="margin-top: 20px;margin-bottom: 20px;">
 							<view class="container" style="color: #b2b2b2;">*请上传回填前照片</view>
@@ -332,6 +333,143 @@
 							</view>
 						</view>
 					</view>
+					<view v-else>
+						<view class="align-items" style="margin-top: 20px;margin-bottom: 20px;">
+							<view class="container" style="color: #b2b2b2;">*请上传调压箱铭牌照片</view>
+							<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px; margin-left: 10px;">
+								<image :src="loadImgSrc('updateimg.png')" mode=""
+									style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="choose('Box')"
+									v-show="reviewStatus!='1'"></image>
+								<view v-for="(item,index) in imgBoxArr" :key="index" style="position: relative;">
+									<view
+										v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'||item.substring(item.length-4)=='jpeg' ">
+										<image :src="item" mode="" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
+											@click="showPhoto(index,'Box')">
+										</image>
+									</view>
+									<view v-else>
+										<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+									</view>
+									<view @click="remove(index,'Box')"
+										style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
+										<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
+										</image>
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="align-items" style="margin-top: 20px;margin-bottom: 20px;">
+							<view class="container" style="color: #b2b2b2;">*请上传调压箱内石粉回填照片</view>
+							<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px; margin-left: 10px;">
+								<image :src="loadImgSrc('updateimg.png')" mode=""
+									style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="choose('Sfht')"
+									v-show="reviewStatus!='1'"></image>
+								<view v-for="(item,index) in imgSfhtArr" :key="index" style="position: relative;">
+									<view
+										v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'||item.substring(item.length-4)=='jpeg' ">
+										<image :src="item" mode="" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
+											@click="showPhoto(index,'Sfht')">
+										</image>
+									</view>
+									<view v-else>
+										<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+									</view>
+									<view @click="remove(index,'Sfht')"
+										style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
+										<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
+										</image>
+									</view>
+								</view>
+							</view>
+
+							<view class="align-items" style="margin-top: 20px;margin-bottom: 20px;">
+								<view class="container" style="color: #b2b2b2;">*请上传调压箱防雷接地照片</view>
+								<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px; margin-left: 10px;">
+									<image :src="loadImgSrc('updateimg.png')" mode=""
+										style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="choose('Fljd')"
+										v-show="reviewStatus!='1'"></image>
+									<view v-for="(item,index) in imgFljdArr" :key="index" style="position: relative;">
+										<view
+											v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'||item.substring(item.length-4)=='jpeg' ">
+											<image :src="item" mode=""
+												style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
+												@click="showPhoto(index,'Fljd')">
+											</image>
+										</view>
+										<view v-else>
+											<video :src="item"
+												style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+										</view>
+										<view @click="remove(index,'Fljd')"
+											style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
+											<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
+											</image>
+										</view>
+									</view>
+								</view>
+
+								<view class="align-items" style="margin-top: 20px;margin-bottom: 20px;">
+									<view class="container" style="color: #b2b2b2;">*请上传调压箱底腿连接照片</view>
+									<view class=""
+										style="display: flex; flex-wrap: wrap;margin-top: 10px; margin-left: 10px;">
+										<image :src="loadImgSrc('updateimg.png')" mode=""
+											style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; "
+											@click="choose('Dtlj')" v-show="reviewStatus!='1'"></image>
+										<view v-for="(item,index) in imgDtljArr" :key="index" style="position: relative;">
+											<view
+												v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'||item.substring(item.length-4)=='jpeg' ">
+												<image :src="item" mode=""
+													style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
+													@click="showPhoto(index,'Dtlj')">
+												</image>
+											</view>
+											<view v-else>
+												<video :src="item"
+													style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+											</view>
+											<view @click="remove(index,'Dtlj')"
+												style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
+												<image :src="loadImgSrc('icon_close.png')"
+													style=" width: 15px; height: 15px;">
+												</image>
+											</view>
+										</view>
+									</view>
+								</view>
+								<view class="align-items" style="margin-top: 20px;margin-bottom: 20px;">
+									<view class="container" style="color: #b2b2b2;">*请上传调压箱护栏及地面硬化（远景）照片</view>
+									<view class=""
+										style="display: flex; flex-wrap: wrap;margin-top: 10px; margin-left: 10px;">
+										<image :src="loadImgSrc('updateimg.png')" mode=""
+											style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; "
+											@click="choose('Hldmyh')" v-show="reviewStatus!='1'"></image>
+										<view v-for="(item,index) in imgHldmyhArr" :key="index"
+											style="position: relative;">
+											<view
+												v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'||item.substring(item.length-4)=='jpeg' ">
+												<image :src="item" mode=""
+													style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
+													@click="showPhoto(index,'Hldmyh')">
+												</image>
+											</view>
+											<view v-else>
+												<video :src="item"
+													style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+											</view>
+											<view @click="remove(index,'Hldmyh')"
+												style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
+												<image :src="loadImgSrc('icon_close.png')"
+													style=" width: 15px; height: 15px;">
+												</image>
+											</view>
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+
+
 
 				</view>
 			</view>
@@ -452,6 +590,13 @@
 					imgHthArr: [],
 
 
+					imgSfhtArr: [],
+					imgFljdArr: [],
+					imgBoxArr: [],
+					imgDtljArr: [],
+					imgHldmyhArr: [],
+
+
 				}
 			},
 
@@ -574,6 +719,16 @@
 						typeArr = this.imgJspsArr;
 					} else if (e == 'hth') {
 						typeArr = this.imgHthArr;
+					} else if (type == 'Box') {
+						typeArr = this.imgBoxArr;
+					} else if (type == 'Sfht') {
+						typeArr = this.imgSfhtArr;
+					} else if (type == 'Fljd') {
+						typeArr = this.imgFljdArr;
+					} else if (type == 'Dtlj') {
+						typeArr = this.imgDtljArr;
+					} else if (type == 'Hldmyh') {
+						typeArr = this.imgHldmyhArr;
 					}
 					typeArr.forEach((item, index) => {
 						if (item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg' ||
@@ -603,6 +758,16 @@
 									_this.imgJspsArr.splice(index, 1)
 								} else if (e == 'hth') {
 									_this.imgHthArr.splice(index, 1)
+								} else if (e == 'Box') {
+									this.imgBoxArr.splice(index, 1)
+								} else if (e == 'Sfht') {
+									this.imgSfhtArr.splice(index, 1)
+								} else if (e == 'Fljd') {
+									this.imgFljdArr.splice(index, 1)
+								} else if (e == 'Dtlj') {
+									this.imgDtljArr.splice(index, 1)
+								} else if (e == 'Hldmyh') {
+									this.imgHldmyhArr.splice(index, 1)
 								}
 							}
 						}
@@ -651,6 +816,16 @@
 													_this.imgJspsArr.push(data.data.url)
 												} else if (e == 'hth') {
 													_this.imgHthArr.push(data.data.url)
+												} else if (e == 'Box') {
+													_this.imgBoxArr.push(data.data.url)
+												} else if (e == 'Sfht') {
+													_this.imgSfhtArr.push(data.data.url)
+												} else if (e == 'Fljd') {
+													_this.imgFljdArr.push(data.data.url)
+												} else if (e == 'Dtlj') {
+													_this.imgDtljArr.push(data.data.url)
+												} else if (e == 'Hldmyh') {
+													_this.imgHldmyhArr.push(data.data.url)
 												}
 												_this.$modal.msg('上传成功！')
 											}
@@ -711,6 +886,16 @@
 												_this.imgJspsArr.push(data.data.url)
 											} else if (e == 'hth') {
 												_this.imgHthArr.push(data.data.url)
+											} else if (e == 'Box') {
+												_this.imgBoxArr.push(data.data.url)
+											} else if (e == 'Sfht') {
+												_this.imgSfhtArr.push(data.data.url)
+											} else if (e == 'Fljd') {
+												_this.imgFljdArr.push(data.data.url)
+											} else if (e == 'Dtlj') {
+												_this.imgDtljArr.push(data.data.url)
+											} else if (e == 'Hldmyh') {
+												_this.imgHldmyhArr.push(data.data.url)
 											}
 											_this.$modal.msg('上传成功！')
 											//_this.photo = false;
@@ -996,6 +1181,30 @@
 						// 	return
 						// }
 
+					}
+
+					if (this.objValue.value == '调压柜') {
+
+						if (this.imgBoxArr.length <= 0) {
+							this.$modal.msg('请上传调压箱铭牌照片')
+							return
+						}
+						if (this.imgSfhtArr.length <= 0) {
+							this.$modal.msg('请上传调压箱内石粉回填照片')
+							return
+						}
+						if (this.imgFljdArr.length <= 0) {
+							this.$modal.msg('请上传调压箱防雷接地照片')
+							return
+						}
+						if (this.imgDtljArr.length <= 0) {
+							this.$modal.msg('请上传调压箱底腿连接照片')
+							return
+						}
+						if (this.imgHldmyhArr.length <= 0) {
+							this.$modal.msg('请上传调压箱护栏及地面硬化（远景）照片')
+							return
+						}
 					} else {
 						if (this.imgArr.length <= 0) {
 							this.$modal.msg('请上传照片或视频')
@@ -1034,6 +1243,12 @@
 								zEngiineeringPhotoBoListOne: this.imgHtqArr,
 								zEngiineeringPhotoBoListTwo: this.imgJspsArr,
 								zEngiineeringPhotoBoListThree: this.imgHthArr,
+
+								boxBrand: this.imgBoxArr,
+								stonePowder: this.imgSfhtArr,
+								lightning: this.imgFljdArr,
+								bottomLeg: this.imgDtljArr,
+								groundHardening: this.imgHldmyhArr,
 								zEngineeringMaterialBo: this.zEngineeringMaterialBo // 用料对象
 							}
 						}

pages/oldrenovation/courtyard/newcourtyard.vue

@@ -209,6 +209,252 @@
 							</view>
 						</view>
 					</view>
+					<view v-if="objValue.enginClassValue=='调压柜'">
+						<view class="align-items" style="margin-top: 20px;margin-bottom: 20px;">
+							<view class="container" style="color: #b2b2b2;">*请上传调压箱名牌照片</view>
+							<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px; margin-left: 10px;">
+								<image :src="loadImgSrc('updateimg.png')" mode=""
+									style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="choose('Box')"
+									v-show="reviewStatus!='1'"></image>
+								<view v-for="(item,index) in imgBoxArr" :key="index" style="position: relative;">
+									<view
+										v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'||item.substring(item.length-4)=='jpeg' ">
+										<image :src="item" mode="" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
+											@click="showPhoto(index,'Box')">
+										</image>
+									</view>
+									<view v-else>
+										<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+									</view>
+									<view @click="remove(index,'Box')"
+										style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
+										<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
+										</image>
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="align-items" style="margin-top: 20px;margin-bottom: 20px;">
+							<view class="container" style="color: #b2b2b2;">*请上传调压箱内石粉回填照片</view>
+							<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px; margin-left: 10px;">
+								<image :src="loadImgSrc('updateimg.png')" mode=""
+									style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="choose('Sfht')"
+									v-show="reviewStatus!='1'"></image>
+								<view v-for="(item,index) in imgSfhtArr" :key="index" style="position: relative;">
+									<view
+										v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'||item.substring(item.length-4)=='jpeg' ">
+										<image :src="item" mode="" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
+											@click="showPhoto(index,'Sfht')">
+										</image>
+									</view>
+									<view v-else>
+										<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+									</view>
+									<view @click="remove(index,'Sfht')"
+										style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
+										<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
+										</image>
+									</view>
+								</view>
+							</view>
+
+							<view class="align-items" style="margin-top: 20px;margin-bottom: 20px;">
+								<view class="container" style="color: #b2b2b2;">*请上传调压箱防雷接地照片</view>
+								<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px; margin-left: 10px;">
+									<image :src="loadImgSrc('updateimg.png')" mode=""
+										style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="choose('Fljd')"
+										v-show="reviewStatus!='1'"></image>
+									<view v-for="(item,index) in imgFljdArr" :key="index" style="position: relative;">
+										<view
+											v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'||item.substring(item.length-4)=='jpeg' ">
+											<image :src="item" mode=""
+												style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
+												@click="showPhoto(index,'Fljd')">
+											</image>
+										</view>
+										<view v-else>
+											<video :src="item"
+												style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+										</view>
+										<view @click="remove(index,'Fljd')"
+											style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
+											<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
+											</image>
+										</view>
+									</view>
+								</view>
+
+								<view class="align-items" style="margin-top: 20px;margin-bottom: 20px;">
+									<view class="container" style="color: #b2b2b2;">*请上传调压箱底腿连接照片</view>
+									<view class=""
+										style="display: flex; flex-wrap: wrap;margin-top: 10px; margin-left: 10px;">
+										<image :src="loadImgSrc('updateimg.png')" mode=""
+											style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; "
+											@click="choose('Dtlj')" v-show="reviewStatus!='1'"></image>
+										<view v-for="(item,index) in imgDtljArr" :key="index" style="position: relative;">
+											<view
+												v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'||item.substring(item.length-4)=='jpeg' ">
+												<image :src="item" mode=""
+													style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
+													@click="showPhoto(index,'Dtlj')">
+												</image>
+											</view>
+											<view v-else>
+												<video :src="item"
+													style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+											</view>
+											<view @click="remove(index,'Dtlj')"
+												style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
+												<image :src="loadImgSrc('icon_close.png')"
+													style=" width: 15px; height: 15px;">
+												</image>
+											</view>
+										</view>
+									</view>
+								</view>
+								<view class="align-items" style="margin-top: 20px;margin-bottom: 20px;">
+									<view class="container" style="color: #b2b2b2;">*请上传调压箱护栏及地面硬化（远景）照片</view>
+									<view class=""
+										style="display: flex; flex-wrap: wrap;margin-top: 10px; margin-left: 10px;">
+										<image :src="loadImgSrc('updateimg.png')" mode=""
+											style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; "
+											@click="choose('Hldmyh')" v-show="reviewStatus!='1'"></image>
+										<view v-for="(item,index) in imgHldmyhArr" :key="index"
+											style="position: relative;">
+											<view
+												v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'||item.substring(item.length-4)=='jpeg' ">
+												<image :src="item" mode=""
+													style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
+													@click="showPhoto(index,'Hldmyh')">
+												</image>
+											</view>
+											<view v-else>
+												<video :src="item"
+													style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+											</view>
+											<view @click="remove(index,'Hldmyh')"
+												style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
+												<image :src="loadImgSrc('icon_close.png')"
+													style=" width: 15px; height: 15px;">
+												</image>
+											</view>
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+
+					<view v-if="objValue.enginClassValue=='阀井'">
+						<view class="align-items" style="margin-top: 20px;margin-bottom: 20px;">
+							<view class="container" style="color: #b2b2b2;">*请上传套管照片</view>
+							<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px; margin-left: 10px;">
+								<image :src="loadImgSrc('updateimg.png')" mode=""
+									style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="choose('Tg')"
+									v-show="reviewStatus!='1'"></image>
+								<view v-for="(item,index) in imgTgArr" :key="index" style="position: relative;">
+									<view
+										v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'||item.substring(item.length-4)=='jpeg' ">
+										<image :src="item" mode="" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
+											@click="showPhoto(index,'Tg')">
+										</image>
+									</view>
+									<view v-else>
+										<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+									</view>
+									<view @click="remove(index,'Tg')"
+										style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
+										<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
+										</image>
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="align-items" style="margin-top: 20px;margin-bottom: 20px;">
+							<view class="container" style="color: #b2b2b2;">*请上传内壁抹灰照片</view>
+							<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px; margin-left: 10px;">
+								<image :src="loadImgSrc('updateimg.png')" mode=""
+									style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="choose('Nbmh')"
+									v-show="reviewStatus!='1'"></image>
+								<view v-for="(item,index) in imgNbmhArr" :key="index" style="position: relative;">
+									<view
+										v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'||item.substring(item.length-4)=='jpeg' ">
+										<image :src="item" mode="" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
+											@click="showPhoto(index,'Nbmh')">
+										</image>
+									</view>
+									<view v-else>
+										<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+									</view>
+									<view @click="remove(index,'Nbmh')"
+										style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
+										<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
+										</image>
+									</view>
+								</view>
+							</view>
+
+							<view class="align-items" style="margin-top: 20px;margin-bottom: 20px;">
+								<view class="container" style="color: #b2b2b2;">*请上传防护网照片</view>
+								<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px; margin-left: 10px;">
+									<image :src="loadImgSrc('updateimg.png')" mode=""
+										style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="choose('Fhw')"
+										v-show="reviewStatus!='1'"></image>
+									<view v-for="(item,index) in imgFhwArr" :key="index" style="position: relative;">
+										<view
+											v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'||item.substring(item.length-4)=='jpeg' ">
+											<image :src="item" mode=""
+												style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
+												@click="showPhoto(index,'Fhw')">
+											</image>
+										</view>
+										<view v-else>
+											<video :src="item"
+												style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+										</view>
+										<view @click="remove(index,'Fhw')"
+											style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
+											<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
+											</image>
+										</view>
+									</view>
+								</view>
+
+								<view class="align-items" style="margin-top: 20px;margin-bottom: 20px;">
+									<view class="container" style="color: #b2b2b2;">*请上传调八角照片</view>
+									<view class=""
+										style="display: flex; flex-wrap: wrap;margin-top: 10px; margin-left: 10px;">
+										<image :src="loadImgSrc('updateimg.png')" mode=""
+											style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="choose('Bj')"
+											v-show="reviewStatus!='1'"></image>
+										<view v-for="(item,index) in imgBjArr" :key="index" style="position: relative;">
+											<view
+												v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'||item.substring(item.length-4)=='jpeg' ">
+												<image :src="item" mode=""
+													style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
+													@click="showPhoto(index,'Bj')">
+												</image>
+											</view>
+											<view v-else>
+												<video :src="item"
+													style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+											</view>
+											<view @click="remove(index,'Bj')"
+												style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
+												<image :src="loadImgSrc('icon_close.png')"
+													style=" width: 15px; height: 15px;">
+												</image>
+											</view>
+										</view>
+									</view>
+								</view>
+
+
+							</view>
+						</view>
+					</view>
+
+
 				</view>
 			</view>
 			<view class="action-btn" v-show="reviewStatus!='1'">
@@ -294,7 +540,20 @@
 					loading: false,
 					inputNumberValue: '',
 					title: '',
-					historyList: {} //历史数据
+					historyList: {}, //历史数据
+
+
+					imgSfhtArr: [],
+					imgFljdArr: [],
+					imgBoxArr: [],
+					imgDtljArr: [],
+					imgHldmyhArr: [],
+
+					imgTgArr: [],
+					imgNbmhArr: [],
+					imgFhwArr: [],
+					imgBjArr: [],
+
 
 				}
 			},
@@ -377,6 +636,7 @@
 				},
 				showPhoto(index, type) {
 					let typeArr = [];
+					let newArr = [];
 					if (type == 'other') {
 						typeArr = this.imgArr;
 					} else if (type == 'sfht') {
@@ -385,10 +645,34 @@
 						typeArr = this.warningtTapeArr;
 					} else if (type == 'hth') {
 						typeArr = this.photosAfterArr;
+					} else if (type == 'Box') {
+						typeArr = this.imgBoxArr;
+					} else if (type == 'Sfht') {
+						typeArr = this.imgSfhtArr;
+					} else if (type == 'Fljd') {
+						typeArr = this.imgFljdArr;
+					} else if (type == 'Dtlj') {
+						typeArr = this.imgDtljArr;
+					} else if (type == 'Hldmyh') {
+						typeArr = this.imgHldmyhArr;
+					} else if (type == 'Tg') {
+						typeArr = this.imgTgArr;
+					} else if (type == 'Nbmh') {
+						typeArr = this.imgNbmhArr;
+					} else if (type == 'Fhw') {
+						typeArr = this.imgFhwArr;
+					} else if (type == 'Bj') {
+						typeArr = this.imgBjArr;
 					}
+					typeArr.forEach((item, index) => {
+						if (item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg' ||
+							item.substring(item.length - 4) == 'jpeg') {
+							newArr.push(item)
+						}
+					});
 					uni.previewImage({
 						current: index,
-						urls: typeArr,
+						urls: newArr,
 					})
 
 				},
@@ -419,6 +703,24 @@
 									if (this.photosAfterArr.length <= 0) {
 										this.photo = true;
 									}
+								} else if (type == 'Box') {
+									this.imgBoxArr.splice(index, 1)
+								} else if (type == 'Sfht') {
+									this.imgSfhtArr.splice(index, 1)
+								} else if (type == 'Fljd') {
+									this.imgFljdArr.splice(index, 1)
+								} else if (type == 'Dtlj') {
+									this.imgDtljArr.splice(index, 1)
+								} else if (type == 'Hldmyh') {
+									this.imgHldmyhArr.splice(index, 1)
+								} else if (type == 'Tg') {
+									this.imgTgArr.splice(index, 1)
+								} else if (type == 'Nbmh') {
+									this.imgNbmhArr.splice(index, 1)
+								} else if (type == 'Fhw') {
+									this.imgFhwArr.splice(index, 1)
+								} else if (type == 'Bj') {
+									this.imgBjArr.splice(index, 1)
 								}
 							}
 						}
@@ -473,6 +775,24 @@
 													_this.warningtTapeArr.push(data.data.url)
 												} else if (e == 'hth') {
 													_this.photosAfterArr.push(data.data.url)
+												} else if (e == 'Box') {
+													_this.imgBoxArr.push(data.data.url)
+												} else if (e == 'Sfht') {
+													_this.imgSfhtArr.push(data.data.url)
+												} else if (e == 'Fljd') {
+													_this.imgFljdArr.push(data.data.url)
+												} else if (e == 'Dtlj') {
+													_this.imgDtljArr.push(data.data.url)
+												} else if (e == 'Hldmyh') {
+													_this.imgHldmyhArr.push(data.data.url)
+												} else if (e == 'Tg') {
+													_this.imgTgArr.push(data.data.url)
+												} else if (e == 'Nbmh') {
+													_this.imgNbmhArr.push(data.data.url)
+												} else if (e == 'Fhw') {
+													_this.imgFhwArr.push(data.data.url)
+												} else if (e == 'Bj') {
+													_this.imgBjArr.push(data.data.url)
 												}
 
 												_this.$modal.msg('上传成功！')
@@ -541,6 +861,24 @@
 												_this.warningtTapeArr.push(data.data.url)
 											} else if (e == 'hth') {
 												_this.photosAfterArr.push(data.data.url)
+											} else if (e == 'Box') {
+												_this.imgBoxArr.push(data.data.url)
+											} else if (e == 'Sfht') {
+												_this.imgSfhtArr.push(data.data.url)
+											} else if (e == 'Fljd') {
+												_this.imgFljdArr.push(data.data.url)
+											} else if (e == 'Dtlj') {
+												_this.imgDtljArr.push(data.data.url)
+											} else if (e == 'Hldmyh') {
+												_this.imgHldmyhArr.push(data.data.url)
+											} else if (e == 'Tg') {
+												_this.imgTgArr.push(data.data.url)
+											} else if (e == 'Nbmh') {
+												_this.imgNbmhArr.push(data.data.url)
+											} else if (e == 'Fhw') {
+												_this.imgFhwArr.push(data.data.url)
+											} else if (e == 'Bj') {
+												_this.imgBjArr.push(data.data.url)
 											}
 											_this.$modal.msg('上传成功！')
 											_this.photo = false;
@@ -797,6 +1135,47 @@
 							return
 						}
 
+					} else if (this.objValue.enginClassValue == '调压柜') {
+						if (this.imgBoxArr.length <= 0) {
+							this.$modal.msg('请上传调压箱名牌照片')
+							return
+						}
+						if (this.imgSfhtArr.length <= 0) {
+							this.$modal.msg('请上传调压箱内石粉回填照片')
+							return
+						}
+						if (this.imgFljdArr.length <= 0) {
+							this.$modal.msg('请上传调压箱防雷接地照片')
+							return
+						}
+						if (this.imgDtljArr.length <= 0) {
+							this.$modal.msg('请上传调压箱底腿连接照片')
+							return
+						}
+						if (this.imgHldmyhArr.length <= 0) {
+							this.$modal.msg('请上传调压箱护栏及地面硬化（远景）照片')
+							return
+						}
+
+					} else if (this.objValue.enginClassValue == '阀井') {
+						if (this.imgTgArr.length <= 0) {
+							this.$modal.msg('请上传套管照片')
+							return
+						}
+						if (this.imgNbmhArr.length <= 0) {
+							this.$modal.msg('请上传内壁抹灰照片')
+							return
+						}
+						if (this.imgFhwArr.length <= 0) {
+							this.$modal.msg('请上传防护网照片')
+							return
+						}
+						if (this.imgBjArr.length <= 0) {
+							this.$modal.msg('请上传八角照片')
+							return
+						}
+
+
 					} else {
 
 						if (this.imgArr.length <= 0) {

pages/oldrenovation/indoor/indoor.vue

@@ -274,7 +274,7 @@
 								@click="history">{{historyName}}</span>
 						</view>
 
-						<view class="container" style="margin-bottom: 20PX;border-bottom: 1px solid #f8f8f8;">
+						<!-- <view class="container" style="margin-bottom: 20PX;border-bottom: 1px solid #f8f8f8;">
 
 							<view>
 								孔距
@@ -288,7 +288,7 @@
 								<span style="color: black;">{{LevelValue.name}}</span>
 								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
 							</view>
-						</view>
+						</view> -->
 					</view>
 				</view>
 				<!--立杠-->
@@ -1268,11 +1268,11 @@
 						}
 
 					} else if (this.objValue.enginClassValue == '打孔') {
-						if (this.isEmpty(this.LevelValue.id)) {
-							this.$modal.msg("请选择孔距") //打孔  判断孔距
-						} else {
+						// if (this.isEmpty(this.LevelValue.id)) {
+						// 	this.$modal.msg("请选择孔距") //打孔  判断孔距
+						// } else {
 							this.onsubmit();
-						}
+						//}
 					} else if (this.objValue.enginClassValue == '拆旧管') {
 
 						if (this.currentResidentsPhoe.length == 0) {
@@ -1464,9 +1464,9 @@
 									constructAccordingDrawings: this.isCheck, //是否按图纸施工
 									zEngiineeringPhotoBoList: this.imgArr, //照片集合
 
-									zEngineeringMaterialBo: [{
-										corrosionLevel: this.LevelValue.id //腐蚀等级 //孔距
-									}]
+									// zEngineeringMaterialBo: [{
+									// 	corrosionLevel: this.LevelValue.id //腐蚀等级 //孔距
+									// }]
 								}
 							}
 

pages/statistics/historyDetails.vue

@@ -21,13 +21,13 @@
 							{{getSelectName(value.zEngineeringMaterialBo[0].corrosionLevel)}}
 						</view>
 					</view>
-					<view class="uni-media-list-text-top" v-if="title=='打孔'">
+				<!-- 	<view class="uni-media-list-text-top" v-if="title=='打孔'">
 						<view class="tit-text">孔距:</view>
 						<view @click="pickerShow('kj',key)">
-							<!-- 123 -->
+							
 							{{getSelectName(value.zEngineeringMaterialBo[0].corrosionLevel)}}
 						</view>
-					</view>
+					</view> -->
 					<view class="uni-media-list-text-top" v-if="title=='挂表'">
 						<view class="tit-text">品牌:</view>
 						<view @click="pickerShow('brand',key)">

pages/statistics/historyDetailsCourtyard.vue

@@ -21,7 +21,7 @@
 						</view>
 					</view>
 					<view
-						v-if="title=='开挖前'||title=='开挖后'||title=='焊口照片'||title=='隐蔽工程'||title=='除锈刷油'||title=='打磨'||title=='全貌照片'||enginClassification=='pressure_regulating'">
+						v-if="title=='开挖前'||title=='开挖后'||title=='焊口照片'||title=='隐蔽工程'||title=='除锈刷油'||title=='打磨'||title=='全貌照片'">
 						<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px; margin-left: 10px;">
 							<image :src="loadImgSrc('updateimg.png')" mode=""
 								style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="choose('other',key)">
@@ -324,6 +324,150 @@
 
 						</view>
 					</view>
+					<view v-if="title=='调压柜'">
+						<view class="uni-common-mt" style="width: 100%;">
+							<text class="uni-title uni-common-pl" style=" font-size: 13px;color:
+												#000;margin-top: 5px; margin-left: 8px;">调压箱铭牌照片:</text>
+						</view>
+
+						<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px;">
+							<image :src="loadImgSrc('updateimg.png')" mode=""
+								style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="choose('Box',key)">
+							</image>
+							<view v-for="(item,index) in value.boxBrand" :key="index" style="position: relative;">
+								<view
+									v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'  || item.substring(item.length - 3) == 'jpeg'">
+									<image :src="item" mode="" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
+										@click="showPhoto(index,value.boxBrand)">
+									</image>
+								</view>
+								<view v-else>
+									<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+								</view>
+								<view @click="removeht(index,key,'Box')"
+									style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
+									<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
+									</image>
+								</view>
+							</view>
+						</view>
+
+
+						<view class="uni-common-mt" style="width: 100%;">
+							<text class="uni-title uni-common-pl" style=" font-size: 13px;color:
+												#000;margin-top: 5px; margin-left: 8px;">调压箱内石粉回填照片:</text>
+						</view>
+
+						<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px;">
+							<image :src="loadImgSrc('updateimg.png')" mode=""
+								style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="choose('Sfht',key)">
+							</image>
+							<view v-for="(item,index) in value.stonePowder" :key="index" style="position: relative;">
+								<view
+									v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'  || item.substring(item.length - 3) == 'jpeg'">
+									<image :src="item" mode="" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
+										@click="showPhoto(index,value.stonePowder)">
+									</image>
+								</view>
+								<view v-else>
+									<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+								</view>
+								<view @click="removeht(index,key,'Sfht')"
+									style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
+									<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
+									</image>
+								</view>
+							</view>
+						</view>
+
+
+						<view class="uni-common-mt" style="width: 100%;">
+							<text class="uni-title uni-common-pl" style=" font-size: 13px;color:
+												#000;margin-top: 5px; margin-left: 8px;">调压箱防雷接地照片:</text>
+						</view>
+
+						<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px;">
+							<image :src="loadImgSrc('updateimg.png')" mode=""
+								style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="choose('Fljd',key)">
+							</image>
+							<view v-for="(item,index) in value.lightning" :key="index" style="position: relative;">
+								<view
+									v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'  || item.substring(item.length - 3) == 'jpeg'">
+									<image :src="item" mode="" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
+										@click="showPhoto(index,value.lightning)">
+									</image>
+								</view>
+								<view v-else>
+									<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+								</view>
+								<view @click="removeht(index,key,'Fljd')"
+									style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
+									<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
+									</image>
+								</view>
+							</view>
+						</view>
+
+
+						<view class="uni-common-mt" style="width: 100%;">
+							<text class="uni-title uni-common-pl" style=" font-size: 13px;color:
+												#000;margin-top: 5px; margin-left: 8px;">调压箱底腿连接照片:</text>
+						</view>
+
+						<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px;">
+							<image :src="loadImgSrc('updateimg.png')" mode=""
+								style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="choose('Fljd',key)">
+							</image>
+							<view v-for="(item,index) in value.bottomLeg" :key="index" style="position: relative;">
+								<view
+									v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'  || item.substring(item.length - 3) == 'jpeg'">
+									<image :src="item" mode="" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
+										@click="showPhoto(index,value.bottomLeg)">
+									</image>
+								</view>
+								<view v-else>
+									<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+								</view>
+								<view @click="removeht(index,key,'Fljd')"
+									style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
+									<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
+									</image>
+								</view>
+							</view>
+						</view>
+
+
+						<view class="uni-common-mt" style="width: 100%;">
+							<text class="uni-title uni-common-pl" style=" font-size: 13px;color:
+												#000;margin-top: 5px; margin-left: 8px;">调压箱护栏及地面硬化（远景）照片:</text>
+						</view>
+
+						<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px;">
+							<image :src="loadImgSrc('updateimg.png')" mode=""
+								style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="choose('Hldmyh',key)">
+							</image>
+							<view v-for="(item,index) in value.groundHardening" :key="index"
+								style="position: relative;">
+								<view
+									v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'  || item.substring(item.length - 3) == 'jpeg'">
+									<image :src="item" mode="" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
+										@click="showPhoto(index,value.groundHardening)">
+									</image>
+								</view>
+								<view v-else>
+									<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+								</view>
+								<view @click="removeht(index,key,'Hldmyh')"
+									style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
+									<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
+									</image>
+								</view>
+							</view>
+						</view>
+
+
+
+					</view>
 				</view>
 			</view>
 		</view>
@@ -552,6 +696,31 @@
 								this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList[key]
 									.video
 									.splice(index, 1)
+							} else if (type == 'Box') {
+								this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList[key]
+									.boxBrand
+									.splice(index, 1)
+
+							} else if (type == 'Sfht') {
+								this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList[key]
+									.stonePowder
+									.splice(index, 1)
+
+							} else if (type == 'Fljd') {
+								this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList[key]
+									.lightning
+									.splice(index, 1)
+
+							} else if (type == 'Dtlj') {
+								this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList[key]
+									.bottomLeg
+									.splice(index, 1)
+
+							} else if (type == 'Hldmyh') {
+								this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList[key]
+									.groundHardening
+									.splice(index, 1)
+
 							}
 
 						}
@@ -656,6 +825,36 @@
 													.zEngineeringInfoBoList[_this.dataIndex]
 													.trenchProspect.push(data.data
 														.url);
+											} else if (e == 'Box') {
+												_this.dataJson.zEngineeringNodeBo
+													.zEngineeringInfoBoList[_this.dataIndex]
+													.boxBrand.push(data
+														.data
+														.url);
+											} else if (e == 'Sfht') {
+												_this.dataJson.zEngineeringNodeBo
+													.zEngineeringInfoBoList[_this.dataIndex]
+													.stonePowder.push(data
+														.data
+														.url);
+											} else if (e == 'Fljd') {
+												_this.dataJson.zEngineeringNodeBo
+													.zEngineeringInfoBoList[_this.dataIndex]
+													.lightning.push(data
+														.data
+														.url);
+											} else if (e == 'Dtlj') {
+												_this.dataJson.zEngineeringNodeBo
+													.zEngineeringInfoBoList[_this.dataIndex]
+													.bottomLeg.push(data
+														.data
+														.url);
+											} else if (e == 'Hldmyh') {
+												_this.dataJson.zEngineeringNodeBo
+													.zEngineeringInfoBoList[_this.dataIndex]
+													.groundHardening.push(data
+														.data
+														.url);
 											}
 
 											_this.$modal.msg('上传成功！')
@@ -729,6 +928,26 @@
 											_this.dataJson.zEngineeringNodeBo
 												.zEngineeringInfoBoList[_this.dataIndex]
 												.video.push(data.data.url);
+										} else if (e == 'Box') {
+											_this.dataJson.zEngineeringNodeBo
+												.zEngineeringInfoBoList[_this.dataIndex]
+												.boxBrand.push(data.data.url);
+										} else if (e == 'Sfht') {
+											_this.dataJson.zEngineeringNodeBo
+												.zEngineeringInfoBoList[_this.dataIndex]
+												.stonePowder.push(data.data.url);
+										} else if (e == 'Fljd') {
+											_this.dataJson.zEngineeringNodeBo
+												.zEngineeringInfoBoList[_this.dataIndex]
+												.lightning.push(data.data.url);
+										} else if (e == 'Dtlj') {
+											_this.dataJson.zEngineeringNodeBo
+												.zEngineeringInfoBoList[_this.dataIndex]
+												.bottomLeg.push(data.data.url);
+										} else if (e == 'Hldmyh') {
+											_this.dataJson.zEngineeringNodeBo
+												.zEngineeringInfoBoList[_this.dataIndex]
+												.groundHardening.push(data.data.url);
 										}
 										_this.$modal.msg('上传成功！')
 									}
@@ -848,6 +1067,30 @@
 							isSubmit = false;
 						}
 					})
+				} else if (this.title == '调压柜') {
+					this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList.forEach((res) => {
+						if (res.boxBrand.length == 0) {
+							this.$modal.msg("请上传调压箱铭牌照片");
+							isSubmit = false;
+						}
+						if (res.stonePowder.length == 0) {
+							this.$modal.msg("请上传调压箱内石粉回填照片");
+							isSubmit = false;
+						}
+						if (res.lightning.length == 0) {
+							this.$modal.msg("请上传调压箱防雷接地照片");
+							isSubmit = false;
+						}
+						if (res.bottomLeg.length == 0) {
+							this.$modal.msg("请上传调压箱底腿连接照片");
+							isSubmit = false;
+						}
+						if (res.groundHardening.length == 0) {
+							this.$modal.msg("请上传调压箱护栏及地面硬化（远景）照片");
+							isSubmit = false;
+						}
+					})
+
 				} else {
 
 					if (this.title == '全貌照片') {

pages/statistics/historyDetailsEnginproject.vue

@@ -66,7 +66,7 @@
 						<button @click="btnAdd(key,index)" class="tj-btn">添加</button>
 					</view>
 				</view>
-				<view v-if="title!='回填、撤场'">
+				<view v-if="title!='回填、撤场'&&title!='调压柜'">
 					<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px; margin-left: 10px;">
 						<image :src="loadImgSrc('updateimg.png')" mode=""
 							style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="choose('other',key)">
@@ -91,7 +91,7 @@
 
 					</view>
 				</view>
-				<view v-else>
+				<view v-if="title=='回填、撤场'">
 
 					<view class="uni-common-mt" style="width: 100%;">
 						<text class="uni-title uni-common-pl" style=" font-size: 13px;color:
@@ -181,6 +181,151 @@
 
 				</view>
 
+				<view v-else>
+
+					<view class="uni-common-mt" style="width: 100%;">
+						<text class="uni-title uni-common-pl" style=" font-size: 13px;color:
+											#000;margin-top: 5px; margin-left: 8px;">调压箱铭牌照片:</text>
+					</view>
+
+					<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px;">
+						<image :src="loadImgSrc('updateimg.png')" mode=""
+							style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="choose('Box',key)">
+						</image>
+						<view v-for="(item,index) in value.boxBrand" :key="index" style="position: relative;">
+							<view
+								v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'  || item.substring(item.length - 3) == 'jpeg'">
+								<image :src="item" mode="" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
+									@click="showPhoto(index,value.boxBrand)">
+								</image>
+							</view>
+							<view v-else>
+								<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+							</view>
+							<view @click="removeht(index,key,'Box')"
+								style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
+								<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
+								</image>
+							</view>
+						</view>
+					</view>
+
+
+					<view class="uni-common-mt" style="width: 100%;">
+						<text class="uni-title uni-common-pl" style=" font-size: 13px;color:
+											#000;margin-top: 5px; margin-left: 8px;">调压箱内石粉回填照片:</text>
+					</view>
+
+					<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px;">
+						<image :src="loadImgSrc('updateimg.png')" mode=""
+							style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="choose('Sfht',key)">
+						</image>
+						<view v-for="(item,index) in value.stonePowder" :key="index" style="position: relative;">
+							<view
+								v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'  || item.substring(item.length - 3) == 'jpeg'">
+								<image :src="item" mode="" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
+									@click="showPhoto(index,value.stonePowder)">
+								</image>
+							</view>
+							<view v-else>
+								<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+							</view>
+							<view @click="removeht(index,key,'Sfht')"
+								style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
+								<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
+								</image>
+							</view>
+						</view>
+					</view>
+
+
+					<view class="uni-common-mt" style="width: 100%;">
+						<text class="uni-title uni-common-pl" style=" font-size: 13px;color:
+											#000;margin-top: 5px; margin-left: 8px;">调压箱防雷接地照片:</text>
+					</view>
+
+					<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px;">
+						<image :src="loadImgSrc('updateimg.png')" mode=""
+							style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="choose('Fljd',key)">
+						</image>
+						<view v-for="(item,index) in value.lightning" :key="index" style="position: relative;">
+							<view
+								v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'  || item.substring(item.length - 3) == 'jpeg'">
+								<image :src="item" mode="" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
+									@click="showPhoto(index,value.lightning)">
+								</image>
+							</view>
+							<view v-else>
+								<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+							</view>
+							<view @click="removeht(index,key,'Fljd')"
+								style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
+								<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
+								</image>
+							</view>
+						</view>
+					</view>
+
+
+					<view class="uni-common-mt" style="width: 100%;">
+						<text class="uni-title uni-common-pl" style=" font-size: 13px;color:
+											#000;margin-top: 5px; margin-left: 8px;">调压箱底腿连接照片:</text>
+					</view>
+
+					<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px;">
+						<image :src="loadImgSrc('updateimg.png')" mode=""
+							style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="choose('Fljd',key)">
+						</image>
+						<view v-for="(item,index) in value.bottomLeg" :key="index" style="position: relative;">
+							<view
+								v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'  || item.substring(item.length - 3) == 'jpeg'">
+								<image :src="item" mode="" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
+									@click="showPhoto(index,value.bottomLeg)">
+								</image>
+							</view>
+							<view v-else>
+								<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+							</view>
+							<view @click="removeht(index,key,'Fljd')"
+								style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
+								<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
+								</image>
+							</view>
+						</view>
+					</view>
+
+
+					<view class="uni-common-mt" style="width: 100%;">
+						<text class="uni-title uni-common-pl" style=" font-size: 13px;color:
+											#000;margin-top: 5px; margin-left: 8px;">调压箱护栏及地面硬化（远景）照片:</text>
+					</view>
+
+					<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px;">
+						<image :src="loadImgSrc('updateimg.png')" mode=""
+							style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="choose('Hldmyh',key)">
+						</image>
+						<view v-for="(item,index) in value.groundHardening" :key="index" style="position: relative;">
+							<view
+								v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'  || item.substring(item.length - 3) == 'jpeg'">
+								<image :src="item" mode="" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
+									@click="showPhoto(index,value.groundHardening)">
+								</image>
+							</view>
+							<view v-else>
+								<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+							</view>
+							<view @click="removeht(index,key,'Hldmyh')"
+								style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
+								<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
+								</image>
+							</view>
+						</view>
+					</view>
+
+
+
+
+				</view>
 			</view>
 		</view>
 		</view>
@@ -383,6 +528,31 @@
 									.zEngiineeringPhotoBoListThree
 									.splice(index, 1)
 
+							} else if (type == 'Box') {
+								this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList[key]
+									.boxBrand
+									.splice(index, 1)
+
+							} else if (type == 'Sfht') {
+								this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList[key]
+									.stonePowder
+									.splice(index, 1)
+
+							} else if (type == 'Fljd') {
+								this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList[key]
+									.lightning
+									.splice(index, 1)
+
+							} else if (type == 'Dtlj') {
+								this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList[key]
+									.bottomLeg
+									.splice(index, 1)
+
+							} else if (type == 'Hldmyh') {
+								this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList[key]
+									.groundHardening
+									.splice(index, 1)
+
 							}
 
 						}
@@ -461,6 +631,36 @@
 													.zEngiineeringPhotoBoListThree.push(data
 														.data
 														.url);
+											} else if (e == 'Box') {
+												_this.dataJson.zEngineeringNodeBo
+													.zEngineeringInfoBoList[_this.dataIndex]
+													.boxBrand.push(data
+														.data
+														.url);
+											} else if (e == 'Sfht') {
+												_this.dataJson.zEngineeringNodeBo
+													.zEngineeringInfoBoList[_this.dataIndex]
+													.stonePowder.push(data
+														.data
+														.url);
+											} else if (e == 'Fljd') {
+												_this.dataJson.zEngineeringNodeBo
+													.zEngineeringInfoBoList[_this.dataIndex]
+													.lightning.push(data
+														.data
+														.url);
+											} else if (e == 'Dtlj') {
+												_this.dataJson.zEngineeringNodeBo
+													.zEngineeringInfoBoList[_this.dataIndex]
+													.bottomLeg.push(data
+														.data
+														.url);
+											} else if (e == 'Hldmyh') {
+												_this.dataJson.zEngineeringNodeBo
+													.zEngineeringInfoBoList[_this.dataIndex]
+													.groundHardening.push(data
+														.data
+														.url);
 											}
 											_this.$modal.msg('上传成功！')
 										}
@@ -529,6 +729,26 @@
 											_this.dataJson.zEngineeringNodeBo
 												.zEngineeringInfoBoList[_this.dataIndex]
 												.zEngiineeringPhotoBoListThree.push(data.data.url);
+										} else if (e == 'Box') {
+											_this.dataJson.zEngineeringNodeBo
+												.zEngineeringInfoBoList[_this.dataIndex]
+												.boxBrand.push(data.data.url);
+										} else if (e == 'Sfht') {
+											_this.dataJson.zEngineeringNodeBo
+												.zEngineeringInfoBoList[_this.dataIndex]
+												.stonePowder.push(data.data.url);
+										} else if (e == 'Fljd') {
+											_this.dataJson.zEngineeringNodeBo
+												.zEngineeringInfoBoList[_this.dataIndex]
+												.lightning.push(data.data.url);
+										} else if (e == 'Dtlj') {
+											_this.dataJson.zEngineeringNodeBo
+												.zEngineeringInfoBoList[_this.dataIndex]
+												.bottomLeg.push(data.data.url);
+										} else if (e == 'Hldmyh') {
+											_this.dataJson.zEngineeringNodeBo
+												.zEngineeringInfoBoList[_this.dataIndex]
+												.groundHardening.push(data.data.url);
 										}
 										_this.$modal.msg('上传成功！')
 									}
@@ -600,87 +820,87 @@
 			},
 			submit() {
 				let isSubmit = true;
-				// if (this.title == '调压柜') {
-				// 	this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList.forEach((res) => {
-				// 		if (res.boxBrand.length == 0) {
-				// 			this.$modal.msg("请上传调压箱铭牌照片");
-				// 			isSubmit = false;
-				// 		}
-				// 		if (res.stonePowder.length == 0) {
-				// 			this.$modal.msg("请上传调压箱内石粉回填照片");
-				// 			isSubmit = false;
-				// 		}
-				// 		if (res.lightning.length == 0) {
-				// 			this.$modal.msg("请上传调压箱防雷接地照片");
-				// 			isSubmit = false;
-				// 		}
-				// 		if (res.bottomLeg.length == 0) {
-				// 			this.$modal.msg("请上传调压箱底腿连接照片");
-				// 			isSubmit = false;
-				// 		}
-				// 		if (res.groundHardening.length == 0) {
-				// 			this.$modal.msg("请上传调压箱护栏及地面硬化（远景）照片");
-				// 			isSubmit = false;
-				// 		}
-				// 	})
-
-				// } else {
-
-
-				this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList.forEach((res) => {
-
-					if (res.createBy == this.$user.state.name) {
-						if (this.title == '焊接、防腐' || this.title == '架空管线' || this.title ==
-							'下管' || this.title == '沟下连头' || this.title == '焊接') {
-							res.zEngineeringMaterialBo.forEach((itme) => {
-								if (itme.specifications == '') {
-									this.$modal.msg("请选择规格");
-									isSubmit = false;
-								}
-								if (itme.number == '') {
-									this.$modal.msg("请输入米数");
+				if (this.title == '调压柜') {
+					this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList.forEach((res) => {
+						if (res.boxBrand.length == 0) {
+							this.$modal.msg("请上传调压箱铭牌照片");
+							isSubmit = false;
+						}
+						if (res.stonePowder.length == 0) {
+							this.$modal.msg("请上传调压箱内石粉回填照片");
+							isSubmit = false;
+						}
+						if (res.lightning.length == 0) {
+							this.$modal.msg("请上传调压箱防雷接地照片");
+							isSubmit = false;
+						}
+						if (res.bottomLeg.length == 0) {
+							this.$modal.msg("请上传调压箱底腿连接照片");
+							isSubmit = false;
+						}
+						if (res.groundHardening.length == 0) {
+							this.$modal.msg("请上传调压箱护栏及地面硬化（远景）照片");
+							isSubmit = false;
+						}
+					})
+
+				} else {
+
+
+					this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList.forEach((res) => {
+
+						if (res.createBy == this.$user.state.name) {
+							if (this.title == '焊接、防腐' || this.title == '架空管线' || this.title ==
+								'下管' || this.title == '沟下连头' || this.title == '焊接') {
+								res.zEngineeringMaterialBo.forEach((itme) => {
+									if (itme.specifications == '') {
+										this.$modal.msg("请选择规格");
+										isSubmit = false;
+									}
+									if (itme.number == '') {
+										this.$modal.msg("请输入米数");
+										isSubmit = false;
+									}
+									if (this.getIntegerPart(itme.number, 0) == '') {
+										this.$modal.msg("请输入米数");
+										isSubmit = false;
+									}
+								})
+
+							}
+							if (this.title == '回填、撤场') {
+								if (res.zEngiineeringPhotoBoListOne.length <= 0 && res.zEngiineeringPhotoBoListTwo
+									.length <= 0 && res.zEngiineeringPhotoBoListThree.length <= 0) {
+									this.$modal.msg('请上传照片')
 									isSubmit = false;
 								}
-								if (this.getIntegerPart(itme.number, 0) == '') {
-									this.$modal.msg("请输入米数");
+								// if (res.zEngiineeringPhotoBoListTwo.length <= 0) {
+								// 	this.$modal.msg('请上传警示带铺设照片')
+								// 	isSubmit = false;
+								// }
+								// if (res.zEngiineeringPhotoBoListThree.length <= 0) {
+								// 	this.$modal.msg('请上传回填后照片')
+								// 	isSubmit = false;
+								// }
+							} else {
+								if (res.zEngiineeringPhotoBoList.length == 0) {
+									this.$modal.msg("请上传照片");
 									isSubmit = false;
 								}
-							})
-
-						}
-						if (this.title == '回填、撤场') {
-							if (res.zEngiineeringPhotoBoListOne.length <= 0 && res.zEngiineeringPhotoBoListTwo
-								.length <= 0 && res.zEngiineeringPhotoBoListThree.length <= 0) {
-								this.$modal.msg('请上传照片')
-								isSubmit = false;
-							}
-							// if (res.zEngiineeringPhotoBoListTwo.length <= 0) {
-							// 	this.$modal.msg('请上传警示带铺设照片')
-							// 	isSubmit = false;
-							// }
-							// if (res.zEngiineeringPhotoBoListThree.length <= 0) {
-							// 	this.$modal.msg('请上传回填后照片')
-							// 	isSubmit = false;
-							// }
-						} else {
-							if (res.zEngiineeringPhotoBoList.length == 0) {
-								this.$modal.msg("请上传照片");
-								isSubmit = false;
 							}
-						}
 
-					}
-				})
+						}
+					})
 
 
-				// this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList.forEach((res) => {
-				// 	if (res.zEngiineeringPhotoBoList.length == 0) {
-				// 		this.$modal.msg("请上传照片");
-				// 		isSubmit = false;
-				// 	}
+					// this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList.forEach((res) => {
+					// 	if (res.zEngiineeringPhotoBoList.length == 0) {
+					// 		this.$modal.msg("请上传照片");
+					// 		isSubmit = false;
+					// 	}
 
-				// })
-				//}
+					// })
+				}
 				if (!isSubmit) {
 					return
 				}

pages/statistics/statistics.vue

@@ -1059,8 +1059,18 @@
 									obj))
 						})
 
-					} else {
-						this.handleShowSheet();
+					} else if (this.nodeType == 'pressure_regulating') { //调压柜
+						let obj = {
+							id: this.nodeId,
+							type: item.enginClassificationName
+						};
+						uni.navigateTo({
+							url: '/pages/statistics/historyDetailsCourtyard?params=' + encodeURIComponent(
+								JSON
+								.stringify(
+									obj))
+						})
+
 					}
 				} else if (this.EngineeringValue == '开栓') {
 
@@ -1077,10 +1087,25 @@
 					})
 				} else if (this.EngineeringValue == '市政工程' || this.EngineeringValue == '基建工程' || this.EngineeringValue ==
 					'顶管工程' || this.EngineeringValue == '工业工程' || this.EngineeringValue == '碰口作业') {
+					console.log("=====", item)
 					this.nodeId = item.id;
 					let result = JSON.parse(JSON.stringify(item.status).replace(/type/g, 'Type'));
 					this.typeList = result;
-					this.handleShowSheet();
+					if (item.enginClassification == '调压柜') {
+						let obj = {
+							id: this.nodeId,
+							type: '调压柜',
+						};
+						console.log("===", obj)
+						uni.navigateTo({
+							url: '/pages/statistics/historyDetailsEnginproject?params=' + encodeURIComponent(JSON
+								.stringify(
+									obj))
+						})
+					} else {
+
+						this.handleShowSheet();
+					}
 				}
 				// else if (this.EngineeringValue == '工业工程') {
 				// 	this.nodeId = item.id;
@@ -1183,17 +1208,6 @@
 									.stringify(
 										obj))
 							})
-						} else if (this.nodeType == 'pressure_regulating') { //调压柜
-
-							uni.navigateTo({
-								url: '/pages/statistics/historyDetailsCourtyard?params=' + encodeURIComponent(
-									JSON
-									.stringify(
-										obj))
-							})
-							this.handleHiddenShare();
-
-
 						}
 					} else if (this.EngineeringValue == '顶管工程') {
 						let obj = {
@@ -2328,4 +2342,4 @@
 
 
 	}
-</style>
+</style>

pages/surge_tank/surge_tank.vue

@@ -97,22 +97,22 @@
 					</view>
 
 					<view class="align-items" style="margin-top: 20px;margin-bottom: 20px;">
-						<view class="container" style="color: #b2b2b2;">*请上传照片</view>
+						<view class="container" style="color: #b2b2b2;">*请上传调压箱名牌照片</view>
 						<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px; margin-left: 10px;">
 							<image :src="loadImgSrc('updateimg.png')" mode=""
-								style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="choose()"
+								style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="choose('Box')"
 								v-show="reviewStatus!='1'"></image>
-							<view v-for="(item,index) in imgArr" :key="index" style="position: relative;">
+							<view v-for="(item,index) in imgBoxArr" :key="index" style="position: relative;">
 								<view
 									v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'||item.substring(item.length-4)=='jpeg' ">
 									<image :src="item" mode="" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
-										@click="showPhoto(index)">
+										@click="showPhoto(index,'Box')">
 									</image>
 								</view>
 								<view v-else>
 									<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
 								</view>
-								<view @click="remove(index)"
+								<view @click="remove(index,'Box')"
 									style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
 									<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
 									</image>
@@ -120,10 +120,110 @@
 							</view>
 						</view>
 					</view>
+					<view class="align-items" style="margin-top: 20px;margin-bottom: 20px;">
+						<view class="container" style="color: #b2b2b2;">*请上传调压箱内石粉回填照片</view>
+						<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px; margin-left: 10px;">
+							<image :src="loadImgSrc('updateimg.png')" mode=""
+								style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="choose('Sfht')"
+								v-show="reviewStatus!='1'"></image>
+							<view v-for="(item,index) in imgSfhtArr" :key="index" style="position: relative;">
+								<view
+									v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'||item.substring(item.length-4)=='jpeg' ">
+									<image :src="item" mode="" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
+										@click="showPhoto(index,'Sfht')">
+									</image>
+								</view>
+								<view v-else>
+									<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+								</view>
+								<view @click="remove(index,'Sfht')"
+									style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
+									<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
+									</image>
+								</view>
+							</view>
+						</view>
+
+						<view class="align-items" style="margin-top: 20px;margin-bottom: 20px;">
+							<view class="container" style="color: #b2b2b2;">*请上传调压箱防雷接地照片</view>
+							<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px; margin-left: 10px;">
+								<image :src="loadImgSrc('updateimg.png')" mode=""
+									style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="choose('Fljd')"
+									v-show="reviewStatus!='1'"></image>
+								<view v-for="(item,index) in imgFljdArr" :key="index" style="position: relative;">
+									<view
+										v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'||item.substring(item.length-4)=='jpeg' ">
+										<image :src="item" mode="" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
+											@click="showPhoto(index,'Fljd')">
+										</image>
+									</view>
+									<view v-else>
+										<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+									</view>
+									<view @click="remove(index,'Fljd')"
+										style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
+										<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
+										</image>
+									</view>
+								</view>
+							</view>
+
+							<view class="align-items" style="margin-top: 20px;margin-bottom: 20px;">
+								<view class="container" style="color: #b2b2b2;">*请上传调压箱底腿连接照片</view>
+								<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px; margin-left: 10px;">
+									<image :src="loadImgSrc('updateimg.png')" mode=""
+										style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="choose('Dtlj')"
+										v-show="reviewStatus!='1'"></image>
+									<view v-for="(item,index) in imgDtljArr" :key="index" style="position: relative;">
+										<view
+											v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'||item.substring(item.length-4)=='jpeg' ">
+											<image :src="item" mode=""
+												style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
+												@click="showPhoto(index,'Dtlj')">
+											</image>
+										</view>
+										<view v-else>
+											<video :src="item"
+												style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+										</view>
+										<view @click="remove(index,'Dtlj')"
+											style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
+											<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
+											</image>
+										</view>
+									</view>
+								</view>
+							</view>
+							<view class="align-items" style="margin-top: 20px;margin-bottom: 20px;">
+								<view class="container" style="color: #b2b2b2;">*请上传调压箱护栏及地面硬化（远景）照片</view>
+								<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px; margin-left: 10px;">
+									<image :src="loadImgSrc('updateimg.png')" mode=""
+										style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="choose('Hldmyh')"
+										v-show="reviewStatus!='1'"></image>
+									<view v-for="(item,index) in imgHldmyhArr" :key="index" style="position: relative;">
+										<view
+											v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'||item.substring(item.length-4)=='jpeg' ">
+											<image :src="item" mode=""
+												style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
+												@click="showPhoto(index,'Hldmyh')">
+											</image>
+										</view>
+										<view v-else>
+											<video :src="item"
+												style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+										</view>
+										<view @click="remove(index,'Hldmyh')"
+											style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
+											<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
+											</image>
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
 				</view>
 			</view>
-			</view>
-			</view>
 			<view class="action-btn" v-show="reviewStatus!='1'">
 				<button @click="submit" class="btn cu-btn block bg-blue lg round">确认上传</button>
 			</view>
@@ -138,7 +238,7 @@
 
 	<script>
 		import SelectPicker from '../../components/selectPicker/select_picker.vue'
-		import bottomSheet from '../../components/bottomSheet/bottomSheetMoreNew.vue'
+		import bottomSheet from '../../components/bottomSheet/bottomSheetMore.vue'
 
 		import {
 			getDicts
@@ -177,7 +277,11 @@
 					selectList: [],
 					dictOptions: [],
 
-					imgArr: [],
+					imgSfhtArr: [],
+					imgFljdArr: [],
+					imgBoxArr: [],
+					imgDtljArr: [],
+					imgHldmyhArr: [],
 
 					videoArr: [],
 					XQValue: {},
@@ -288,10 +392,22 @@
 				handleHiddenShare() {
 					this.shareState = false;
 				},
-				showPhoto(index) {
-
+				showPhoto(index, type) {
+					let typeArr = [];
 					let newArr = [];
-					this.imgArr.forEach((item, index) => {
+					if (type == 'Box') {
+						typeArr = this.imgBoxArr;
+					} else if (type == 'Sfht') {
+						typeArr = this.imgSfhtArr;
+					} else if (type == 'Fljd') {
+						typeArr = this.imgFljdArr;
+					} else if (type == 'Dtlj') {
+						typeArr = this.imgDtljArr;
+					} else if (type == 'Hldmyh') {
+						typeArr = this.imgHldmyhArr;
+					}
+
+					typeArr.forEach((item, index) => {
 						if (item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg' ||
 							item.substring(item.length - 4) == 'jpeg') {
 							newArr.push(item)
@@ -303,20 +419,32 @@
 					})
 
 				},
-				remove(index) {
+				remove(index, e) {
 
 					uni.showModal({
 						title: '提示',
 						content: '是否删除该图片或视频',
 						success: (res) => {
 							if (res.confirm) {
-								this.imgArr.splice(index, 1)
+
+								if (e == 'Box') {
+									this.imgBoxArr.splice(index, 1)
+								} else if (e == 'Sfht') {
+									this.imgSfhtArr.splice(index, 1)
+								} else if (e == 'Fljd') {
+									this.imgFljdArr.splice(index, 1)
+								} else if (e == 'Dtlj') {
+									this.imgDtljArr.splice(index, 1)
+								} else if (e == 'Hldmyh') {
+									this.imgHldmyhArr.splice(index, 1)
+								}
+
 
 							}
 						}
 					})
 				},
-				choose() {
+				choose(e) {
 
 
 					uni.showActionSheet({
@@ -324,14 +452,14 @@
 						itemList: ['图片', '视频'],
 						success: (res) => {
 							if (res.tapIndex == 0) {
-								this.chooseimage()
+								this.chooseimage(e)
 							} else {
-								this.choosevideo()
+								this.choosevideo(e)
 							}
 						}
 					})
 				},
-				chooseimage() {
+				chooseimage(e) {
 
 					let _this = this;
 					uni.chooseImage({
@@ -352,7 +480,18 @@
 											_this.$modal.msg(data.msg)
 										} else {
 											if (_this.progress === 100) {
-												_this.imgArr.push(data.data.url)
+												if (e == 'Box') {
+													_this.imgBoxArr.push(data.data.url)
+												} else if (e == 'Sfht') {
+													_this.imgSfhtArr.push(data.data.url)
+												} else if (e == 'Fljd') {
+													_this.imgFljdArr.push(data.data.url)
+												} else if (e == 'Dtlj') {
+													_this.imgDtljArr.push(data.data.url)
+												} else if (e == 'Hldmyh') {
+													_this.imgHldmyhArr.push(data.data.url)
+												}
+
 												_this.$modal.msg('上传成功！')
 											}
 										}
@@ -385,7 +524,7 @@
 					})
 				},
 
-				choosevideo() {
+				choosevideo(e) {
 					let _this = this;
 					uni.chooseVideo({
 						sourceType: ['album', 'camera'],
@@ -405,7 +544,17 @@
 									} else {
 										//上传成功
 										if (_this.progress === 100) {
-											_this.imgArr.push(data.data.url)
+											if (e == 'Box') {
+												_this.imgBoxArr.push(data.data.url)
+											} else if (e == 'Sfht') {
+												_this.imgSfhtArr.push(data.data.url)
+											} else if (e == 'Fljd') {
+												_this.imgFljdArr.push(data.data.url)
+											} else if (e == 'Dtlj') {
+												_this.imgDtljArr.push(data.data.url)
+											} else if (e == 'Hldmyh') {
+												_this.imgHldmyhArr.push(data.data.url)
+											}
 											_this.$modal.msg('上传成功！')
 										}
 									}
@@ -477,11 +626,8 @@
 
 					} else if (e == 'xq') { //小区
 						if (this.isEmpty(this.XZQValue.dictValue)) {
-							getAreaList('').then(res => {
-								this.XQList = res.data;
-								this.open = true;
-								this.selectList = this.XQList;
-							})
+							this.$modal.msg('请选择行政区')
+
 						} else {
 							this.open = true;
 							this.selectList = this.XQList;
@@ -534,10 +680,6 @@
 
 
 					if (this.type == 'xq') {
-						this.XZQValue = {
-							dictValue: item.district,
-							dictLabel: item.districtName
-						};
 						this.XQValue = item;
 						if (!this.isEmpty(this.projectValue.dictValue)) {
 
@@ -641,8 +783,24 @@
 
 
 
-					if (this.imgArr.length <= 0) {
-						this.$modal.msg('请上传照片')
+					if (this.imgBoxArr.length <= 0) {
+						this.$modal.msg('请上传调压箱名牌照片')
+						return
+					}
+					if (this.imgSfhtArr.length <= 0) {
+						this.$modal.msg('请上传调压箱内石粉回填照片')
+						return
+					}
+					if (this.imgFljdArr.length <= 0) {
+						this.$modal.msg('请上传调压箱防雷接地照片')
+						return
+					}
+					if (this.imgDtljArr.length <= 0) {
+						this.$modal.msg('请上传调压箱底腿连接照片')
+						return
+					}
+					if (this.imgHldmyhArr.length <= 0) {
+						this.$modal.msg('请上传调压箱护栏及地面硬化（远景）照片')
 						return
 					}
 
@@ -683,7 +841,11 @@
 
 								constructTime: this.time, //施工时间
 								remark: this.projectContent, //施工内容
-								zEngiineeringPhotoBoList: this.imgArr,
+								boxBrand: this.imgBoxArr,
+								stonePowder: this.imgSfhtArr,
+								lightning: this.imgFljdArr,
+								bottomLeg: this.imgDtljArr,
+								groundHardening: this.imgHldmyhArr,
 
 							}
 

pages/work/index.vue

@@ -302,10 +302,21 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 
 				} else if (e.dictValue == 'pressure_regulating') {
 					//调压柜
-					getDicts("gy_tyg").then(response => {
-						this.typeList = response.data;
-					});
-					this.handleShowSheet();
+					const obj = {
+						enginClassValue: this.enginClassValue, //(拆旧管等 字典值)
+						enginType: this.enginType, //旧改 还是新建  写死
+						enginClassification: this.enginClassification //室内  庭院  架空
+
+					};
+					uni.navigateTo({
+						url: '/pages/surge_tank/surge_tank?params=' + encodeURIComponent(JSON
+							.stringify(
+								obj))
+					})
+					// getDicts("gy_tyg").then(response => {
+					// 	this.typeList = response.data;
+					// });
+					// this.handleShowSheet();
 				}
 
 			},
@@ -365,10 +376,27 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 					})
 				} else if (e.dictValue == 'pressure_regulating') {
 					//调压柜
-					getDicts("gy_tyg").then(response => {
-						this.typeList = response.data;
-					});
-					this.handleShowSheet();
+					const obj = {
+						enginClassValue: this.enginClassValue, //(拆旧管等 字典值)
+						enginType: this.enginType, //旧改 还是新建  写死
+						enginClassification: this.enginClassification //室内  庭院  架空
+
+					};
+					uni.navigateTo({
+						url: '/pages/surge_tank/surge_tank?params=' + encodeURIComponent(JSON
+							.stringify(
+								obj))
+					})
+
+					// uni.navigateTo({
+					// 	url: '/pages/DailyLog/daily_log?params=' + encodeURIComponent(JSON
+					// 		.stringify(
+					// 			obj))
+					// })
+					// getDicts("gy_tyg").then(response => {
+					// 	this.typeList = response.data;
+					// });
+					// this.handleShowSheet();
 
 				}
 
@@ -411,7 +439,7 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 							})
 						}
 					} else if (this.enginClassification == 'overhead') { //架空
-						if (this.enginClassValue == '全貌照片') {
+						if (this.enginClassValue == '全貌照片' || this.enginClassValue == '焊接') {
 							uni.navigateTo({
 								url: '/pages/oldrenovation/overhead/newoverhead?params=' + encodeURIComponent(JSON
 									.stringify(
@@ -424,14 +452,15 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 										obj))
 							})
 						}
-					} else {
-						//调压柜
-						uni.navigateTo({
-							url: '/pages/surge_tank/surge_tank?params=' + encodeURIComponent(JSON
-								.stringify(
-									obj))
-						})
 					}
+					//  else {
+					// 	//调压柜
+					// 	uni.navigateTo({
+					// 		url: '/pages/surge_tank/surge_tank?params=' + encodeURIComponent(JSON
+					// 			.stringify(
+					// 				obj))
+					// 	})
+					// }
 				} else if (this.projectType == 'ShiZheng') {
 					let obj = {
 						Label: item.dictLabel,
@@ -445,7 +474,7 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 				} else if (this.projectType == 'GongYe') {
 
 					let label = '';
-					if (item.dictLabel == '室内管线' || item.dictLabel == '室外管线' || item.dictLabel == '调压柜') {
+					if (item.dictLabel == '室内管线' || item.dictLabel == '室外管线') {
 						switch (item.dictLabel) {
 							case '室内管线':
 								label = 'gy_inner '
@@ -466,10 +495,18 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 
 						this.handleShowSheet();
 					} else {
-						let obj = {
-							value: item.dictValue,
-							title: this.title_lebel
-						};
+						let obj = ''
+						if (item.dictLabel == '调压柜') {
+							obj = {
+								value: item.dictValue,
+								title: item.dictLabel
+							};
+						} else {
+							obj = {
+								value: item.dictValue,
+								title: this.title_lebel
+							};
+						}
 
 						uni.navigateTo({
 							url: '/pages/enginproject/enginproject?params=' + encodeURIComponent(JSON