市政工程 新增 历史 修改历史

config.js

@@ -2,9 +2,9 @@
 module.exports = {
 
 	//baseUrl: 'https://www.xcx.cczdsz.cn/prod-api',
-	baseUrl: 'http://192.168.4.88:8080',
+	//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/enginproject/enginproject.vue

@@ -1446,11 +1446,6 @@
 								groundHardening: this.imgHldmyhArr,
 
 
-								boxBrand: this.imgBoxArr,
-								stonePowder: this.imgSfhtArr,
-								lightning: this.imgFljdArr,
-								bottomLeg: this.imgDtljArr,
-								groundHardening: this.imgHldmyhArr,
 
 								cannula: this.imgTgArr,
 								wallPlaster: this.imgNbmhArr,

pages/municipal/municipal.vue

@@ -179,7 +179,8 @@
 						</view>
 
 						<!-- 焊接、防腐 下管 沟下连头 -->
-						<view v-if="objValue.Label=='焊接、防腐'||objValue.Label=='下管'||objValue.Label=='沟下连头'">
+						<view
+							v-if="objValue.Label=='焊接、防腐'||objValue.Label=='下管'||objValue.Label=='沟下连头'||objValue.Label=='顶管材料米数'">
 							<view v-for="(a,index) in czggslList" :key="index" class="num-style">
 								<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 									<view>
@@ -226,7 +227,7 @@
 					</view>
 
 
-					<view v-if="objValue.Label!='回填、撤场'">
+					<view v-if="objValue.Label!='回填、撤场'&&objValue.value!='阀井'&&objValue.value!='顶管材料米数'">
 						<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;">
@@ -253,7 +254,7 @@
 						</view>
 
 					</view>
-					<view v-else>
+					<view v-else-if="objValue.Label=='回填、撤场'">
 						<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;">
@@ -333,9 +334,117 @@
 						</view>
 					</view>
 
+
+					<view v-else-if="objValue.Label=='阀井'">
+						<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>
 			<view class="action-btn">
 				<button @click="submit" class="btn cu-btn block bg-blue lg round">确认上传</button>
 			</view>
@@ -452,6 +561,12 @@
 					enginId: '', //工程id
 					createTime: '',
 					infonId: '', //info id
+					//阀井
+					imgTgArr: [],
+					imgNbmhArr: [],
+					imgFhwArr: [],
+					imgBjArr: [],
+
 
 					enginName: '',
 					enginType: '',
@@ -478,8 +593,8 @@
 				getEngineeringDetails(this.enginId).then(
 					response => {
 						uni.hideLoading();
-						this.enginName=response.data.enginName;
-						this.enginType=response.data.enginType;
+						this.enginName = response.data.enginName;
+						this.enginType = response.data.enginType;
 						//	this.enginList = response.data
 						this.jlPhoneValue = response.data.supervisionPhone; //监理电话
 						this.jlfzrValue = response.data.supervisionHead; //监理负责人
@@ -607,6 +722,14 @@
 						typeArr = this.imgJspsArr;
 					} else if (e == 'hth') {
 						typeArr = this.imgHthArr;
+					} else if (e == 'Tg') {
+						typeArr = this.imgTgArr;
+					} else if (e == 'Nbmh') {
+						typeArr = this.imgNbmhArr;
+					} else if (e == 'Fhw') {
+						typeArr = this.imgFhwArr;
+					} else if (e == 'Bj') {
+						typeArr = this.imgBjArr;
 					}
 
 
@@ -645,6 +768,14 @@
 									_this.imgJspsArr.splice(index, 1)
 								} else if (e == 'hth') {
 									_this.imgHthArr.splice(index, 1)
+								} else if (e == 'Tg') {
+									this.imgTgArr.splice(index, 1)
+								} else if (e == 'Nbmh') {
+									this.imgNbmhArr.splice(index, 1)
+								} else if (e == 'Fhw') {
+									this.imgFhwArr.splice(index, 1)
+								} else if (e == 'Bj') {
+									this.imgBjArr.splice(index, 1)
 								}
 
 							}
@@ -700,6 +831,14 @@
 													_this.imgJspsArr.push(data.data.url)
 												} else if (e == 'hth') {
 													_this.imgHthArr.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('上传成功！')
 											}
@@ -766,6 +905,14 @@
 												_this.imgJspsArr.push(data.data.url)
 											} else if (e == 'hth') {
 												_this.imgHthArr.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('上传成功！')
 										}
@@ -989,7 +1136,8 @@
 					// 	this.$modal.msg('请选择工程名称')
 					// 	return
 					// }
-					if (this.objValue.title == '焊接、防腐' || this.objValue.title == '下管' || this.objValue.title == ' 沟下连头') {
+					if (this.objValue.title == '焊接、防腐' || this.objValue.title == '下管' || this.objValue.title == ' 沟下连头' ||
+						this.objValue.title == '顶管材料米数') {
 						try {
 							this.czggslList.forEach((list) => {
 								if (this.isEmpty(list.cz.id)) {
@@ -1040,16 +1188,36 @@
 						// 	this.$modal.msg('请上传回填后照片')
 						// 	return
 						// }
-					} else {
-						if (this.imgArr.length <= 0) {
-							this.$modal.msg('请上传照片或视频')
+					} else if (this.objValue.title == '阀井') {
+						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.objValue.title != '顶管材料米数') {
+							if (this.imgArr.length <= 0) {
+								this.$modal.msg('请上传照片或视频')
+								return
+							}
+						}
 					}
-					if (this.loading == false) {
-						this.$modal.msg('照片或视频未上传完毕，无法提交！')
-						return
-					}
+					// if (this.loading == false) {
+					// 	this.$modal.msg('照片或视频未上传完毕，无法提交！')
+					// 	return
+					// }
 
 
 					let param = {
@@ -1078,6 +1246,12 @@
 								zEngiineeringPhotoBoListThree: this.imgHthArr,
 
 
+								cannula: this.imgTgArr,
+								wallPlaster: this.imgNbmhArr,
+								protectiveNet: this.imgFhwArr,
+								starAnise: this.imgBjArr,
+
+
 								zEngineeringMaterialBo: this.zEngineeringMaterialBo // 用料对象
 							}
 						}

pages/statistics/historyDetailMunicipal.vue

@@ -13,7 +13,8 @@
 							未通过</view>
 						<view class="tit-text" v-if="value.zEngineeringReviewBo.reviewStatus=='1'">通过</view>
 						<view :style="value.zEngineeringReviewBo.reviewStatus=='0'?'color: red;':''">
-							{{value.zEngineeringReviewBo.reviewContent}}</view>
+							{{value.zEngineeringReviewBo.reviewContent}}
+						</view>
 					</view>
 					<view class="uni-media-list-text-top">
 						<view class="tit-text">施工时间:</view>{{value.constructTime}}
@@ -32,7 +33,7 @@
 					</view>
 
 
-					<view v-if="title=='焊接、防腐'||title=='下管'||title=='沟下连头'">
+					<view v-if="title=='焊接、防腐'||title=='下管'||title=='沟下连头'||title=='顶管材料米数'">
 						<view class="cz-style" v-for="(a,index) in value.zEngineeringMaterialBo" :key="index">
 							<view class="uni-media-list-text-top" style=" ">
 								<view class="tit-text">材质:</view>
@@ -76,7 +77,7 @@
 					</view>
 				</view>
 
-				<view v-if="title!='回填、撤场'">
+				<view v-if="title!='回填、撤场'&&title!='阀井'&&title!='顶管材料米数'">
 
 
 
@@ -105,9 +106,9 @@
 
 
 				</view>
-				<view v-else>
+				<view v-if="title=='回填、撤场'">
 
-					<view class="uni-common-mt" style="width: 100%;">
+					<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>
@@ -188,8 +189,122 @@
 							</view>
 						</view>
 					</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;">
+						<image :src="loadImgSrc('updateimg.png')" mode=""
+							style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="choose('Tg',key)">
+						</image>
+						<view v-for="(item,index) in value.cannula" :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.cannula)">
+								</image>
+							</view>
+							<view v-else>
+								<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+							</view>
+							<view @click="removeht(index,key,'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 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('Nbmh',key)">
+						</image>
+						<view v-for="(item,index) in value.wallPlaster" :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.wallPlaster)">
+								</image>
+							</view>
+							<view v-else>
+								<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+							</view>
+							<view @click="removeht(index,key,'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="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('Fhw',key)">
+						</image>
+						<view v-for="(item,index) in value.protectiveNet" :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.protectiveNet)">
+								</image>
+							</view>
+							<view v-else>
+								<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+							</view>
+							<view @click="removeht(index,key,'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="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('Bj',key)">
+						</image>
+						<view v-for="(item,index) in value.starAnise" :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.starAnise)">
+								</image>
+							</view>
+							<view v-else>
+								<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+							</view>
+							<view @click="removeht(index,key,'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>
@@ -399,8 +514,29 @@
 								this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList[key]
 									.zEngiineeringPhotoBoListThree
 									.splice(index, 1)
+							} else if (type == 'Tg') {
+								this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList[key]
+									.cannula
+									.splice(index, 1)
+
+							} else if (type == 'Nbmh') {
+								this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList[key]
+									.wallPlaster
+									.splice(index, 1)
+
+							} else if (type == 'Fhw') {
+								this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList[key]
+									.protectiveNet
+									.splice(index, 1)
+
+							} else if (type == 'Bj') {
+								this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList[key]
+									.starAnise
+									.splice(index, 1)
+
 							}
 
+
 						}
 					}
 				})
@@ -479,6 +615,30 @@
 													.zEngiineeringPhotoBoListThree.push(data
 														.data
 														.url);
+											} else if (e == 'Tg') {
+												_this.dataJson.zEngineeringNodeBo
+													.zEngineeringInfoBoList[_this.dataIndex]
+													.cannula.push(data
+														.data
+														.url);
+											} else if (e == 'Nbmh') {
+												_this.dataJson.zEngineeringNodeBo
+													.zEngineeringInfoBoList[_this.dataIndex]
+													.wallPlaster.push(data
+														.data
+														.url);
+											} else if (e == 'Fhw') {
+												_this.dataJson.zEngineeringNodeBo
+													.zEngineeringInfoBoList[_this.dataIndex]
+													.protectiveNet.push(data
+														.data
+														.url);
+											} else if (e == 'Bj') {
+												_this.dataJson.zEngineeringNodeBo
+													.zEngineeringInfoBoList[_this.dataIndex]
+													.starAnise.push(data
+														.data
+														.url);
 											}
 
 											_this.$modal.msg('上传成功！')
@@ -548,6 +708,22 @@
 											_this.dataJson.zEngineeringNodeBo
 												.zEngineeringInfoBoList[_this.dataIndex]
 												.zEngiineeringPhotoBoListThree.push(data.data.url);
+										} else if (e == 'Tg') {
+											_this.dataJson.zEngineeringNodeBo
+												.zEngineeringInfoBoList[_this.dataIndex]
+												.cannula.push(data.data.url);
+										} else if (e == 'Nbmh') {
+											_this.dataJson.zEngineeringNodeBo
+												.zEngineeringInfoBoList[_this.dataIndex]
+												.wallPlaster.push(data.data.url);
+										} else if (e == 'Fhw') {
+											_this.dataJson.zEngineeringNodeBo
+												.zEngineeringInfoBoList[_this.dataIndex]
+												.protectiveNet.push(data.data.url);
+										} else if (e == 'Bj') {
+											_this.dataJson.zEngineeringNodeBo
+												.zEngineeringInfoBoList[_this.dataIndex]
+												.starAnise.push(data.data.url);
 										}
 										_this.$modal.msg('上传成功！')
 									}
@@ -624,7 +800,7 @@
 				this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList.forEach((res) => {
 					if (res.createBy == this.$user.state.name) {
 						if (this.title == '焊接、防腐' || this.title == '下管' || this.title ==
-							' 沟下连头') {
+							' 沟下连头' || this.title == '顶管材料米数') {
 							res.zEngineeringMaterialBo.forEach((itme) => {
 								if (itme.specifications == '') {
 									this.$modal.msg("请选择规格");
@@ -641,9 +817,24 @@
 
 							})
 
-						}
-
-						if (this.title == '回填、撤场') {
+						} else if (this.title == '阀井') {
+							if (res.cannula.length == 0) {
+								this.$modal.msg("请上传套管照片");
+								isSubmit = false;
+							}
+							if (res.wallPlaster.length == 0) {
+								this.$modal.msg("请上传内壁抹灰照片");
+								isSubmit = false;
+							}
+							if (res.protectiveNet.length == 0) {
+								this.$modal.msg("请上传防护网照片");
+								isSubmit = false;
+							}
+							if (res.starAnise.length == 0) {
+								this.$modal.msg("请上传八角照片");
+								isSubmit = false;
+							}
+						} else if (this.title == '回填、撤场') {
 							if (res.zEngiineeringPhotoBoListOne.length <= 0 && res.zEngiineeringPhotoBoListTwo
 								.length <= 0 && res.zEngiineeringPhotoBoListThree.length <= 0) {
 								this.$modal.msg('请上传照片')
@@ -658,9 +849,11 @@
 							// 	isSubmit = false;
 							// }
 						} else {
-							if (res.zEngiineeringPhotoBoList.length == 0) {
-								this.$modal.msg("请上传照片");
-								isSubmit = false;
+							if (this.title != '顶管材料米数') {
+								if (res.zEngiineeringPhotoBoList.length == 0) {
+									this.$modal.msg("请上传照片");
+									isSubmit = false;
+								}
 							}
 						}
 					}

pages/statistics/historyDetailsEnginproject.vue

@@ -9,10 +9,12 @@
 						<view class="tit-text"
 							v-if="value.zEngineeringReviewBo.reviewStatus==''||value.zEngineeringReviewBo==null">未审核
 						</view>
-						<view class="tit-text" v-if="value.zEngineeringReviewBo.reviewStatus=='0'"  style="color: red;">未通过</view>
+						<view class="tit-text" v-if="value.zEngineeringReviewBo.reviewStatus=='0'" style="color: red;">
+							未通过</view>
 						<view class="tit-text" v-if="value.zEngineeringReviewBo.reviewStatus=='1'">通过</view>
 						<view :style="value.zEngineeringReviewBo.reviewStatus=='0'?'color: red;':''">
-							{{value.zEngineeringReviewBo.reviewContent}}</view>
+							{{value.zEngineeringReviewBo.reviewContent}}
+						</view>
 					</view>
 					<view class="uni-media-list-text-top">
 						<view class="tit-text">施工时间:</view>{{value.constructTime}}
@@ -674,8 +676,29 @@
 									.groundHardening
 									.splice(index, 1)
 
+							} else if (type == 'Tg') {
+								this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList[key]
+									.cannula
+									.splice(index, 1)
+
+							} else if (type == 'Nbmh') {
+								this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList[key]
+									.wallPlaster
+									.splice(index, 1)
+
+							} else if (type == 'Fhw') {
+								this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList[key]
+									.protectiveNet
+									.splice(index, 1)
+
+							} else if (type == 'Bj') {
+								this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList[key]
+									.starAnise
+									.splice(index, 1)
+
 							}
 
+
 						}
 					}
 				})

pages/statistics/statistics.vue

@@ -2260,7 +2260,9 @@
 					enginClassification: 'courtyard',
 				};
 				getObtainUnitCompletionInformationList(param).then(res => {
-					this.CourtyardRoomList = res.data[0].buildingStatusVoList;
+					if (res.hasOwnProperty('data') && res.data != null && res.data.length > 0) {
+						this.CourtyardRoomList = res.data[0].buildingStatusVoList;
+					}
 				})
 			},
 			getOverheadList() {
@@ -2271,7 +2273,9 @@
 					enginClassification: 'overhead',
 				};
 				getObtainUnitCompletionInformationList(param).then(res => {
-					this.OverheadRoomList = res.data[0].unitStatusVoList;
+					if (res.hasOwnProperty('data') && res.data != null && res.data.length > 0) {
+						this.OverheadRoomList = res.data[0].unitStatusVoList;
+					}
 
 				})
 			},
@@ -2283,7 +2287,9 @@
 					enginClassification: 'bottom_leg',
 				};
 				getObtainUnitCompletionInformationList(param).then(res => {
-					this.BottomLegRoomList = res.data[0].unitStatusVoList;
+					if (res.hasOwnProperty('data') && res.data != null && res.data.length > 0) {
+						this.BottomLegRoomList = res.data[0].unitStatusVoList;
+					}
 				})
 			},
 			close(e) {