zhanghongrui 10 maanden geleden
bovenliggende
commit
77ce935ec5

+ 89 - 3
components/bottomSheet/bottomSheetMoreNew.vue

@@ -40,7 +40,7 @@
 								</view>
 							</view>
 							<view class="cz-style" v-for="(a,index) in value.zEngineeringMaterialBo" :key="index"
-								v-if="title=='焊接、防腐'||title=='下管'||title=='沟下连头'||title=='架空管线'||title=='焊接'">
+								v-if="title=='焊接、防腐'||title=='下管'||title=='沟下连头'||title=='架空管线'||title=='除锈刷油'||title=='顶管材料米数'||title=='焊接'">
 								<view class="uni-media-list-text-top" style=" ">
 									<view class="tit-text">材质:</view>
 									<view class="normal-text">{{a.materialQualityName}}</view>
@@ -72,7 +72,7 @@
 								<view class="normal-text">{{value.constructPhone}}</view>
 							</view>
 
-							<view v-if="title!='回填、撤场'&&title!='调压柜'">
+							<view v-if="title!='回填、撤场'&&title!='调压柜'&&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;">
@@ -194,7 +194,92 @@
 									</view>
 								</view>
 							</view>
-							<view v-else>
+
+							<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.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>
+								</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.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>
+								</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.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>
+								</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.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>
+								</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>
@@ -256,6 +341,7 @@
 									</view>
 								</view>
 							</view>
+
 						</view>
 					</view>
 				</view>

+ 2 - 2
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/',

+ 4 - 4
pages/TopPipeWork/TopPipeWork.vue

@@ -740,10 +740,10 @@
 			},
 			//提交
 			submit() {
-				if (this.isEmpty(this.projectName.id)) {
-					this.$modal.msg('请选择工程名称')
-					return
-				}
+				// if (this.isEmpty(this.projectName.id)) {
+				// 	this.$modal.msg('请选择工程名称')
+				// 	return
+				// }
 				try {
 					this.czggslList.forEach((list) => {
 						if (this.isEmpty(list.cz.id)) {

+ 199 - 19
pages/enginproject/enginproject.vue

@@ -179,7 +179,7 @@
 
 
 						<view
-							v-if="objValue.value=='焊接、防腐'||objValue.value=='架空管线'||objValue.value=='下管'||objValue.value=='沟下连头'||objValue.value=='焊接'">
+							v-if="objValue.value=='焊接、防腐'||objValue.value=='架空管线'||objValue.value=='下管'||objValue.value=='沟下连头'||objValue.value=='全貌照片'||objValue.value=='顶管材料米数'||objValue.value=='焊接'">
 							<view v-for="(a,index) in czggslList" :key="index" class="num-style">
 								<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 									<view>
@@ -225,9 +225,10 @@
 
 						</view>
 					</view>
-					<view v-if="objValue.value!='回填、撤场'&&objValue.value!='调压柜'">
+					<view
+						v-if="objValue.value!='回填、撤场'&&objValue.value!='调压柜'&&objValue.value!='阀井'&&objValue.value!='顶管材料米数'">
 						<view class="align-items" style="margin-top: 20px;margin-bottom: 20px;">
-							<view class="container" style="color: #b2b2b2;">*请上传照片{{objValue.value}}</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('other')">
@@ -332,7 +333,7 @@
 							</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>
 							<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px; margin-left: 10px;">
@@ -467,12 +468,117 @@
 							</view>
 						</view>
 					</view>
+					<view v-else-if="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;">
+								<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>
@@ -589,13 +695,19 @@
 					imgJspsArr: [],
 					imgHthArr: [],
 
-
+					//调压柜
 					imgSfhtArr: [],
 					imgFljdArr: [],
 					imgBoxArr: [],
 					imgDtljArr: [],
 					imgHldmyhArr: [],
 
+					//阀井
+					imgTgArr: [],
+					imgNbmhArr: [],
+					imgFhwArr: [],
+					imgBjArr: [],
+
 					enginName: '',
 					enginType: '',
 					enginTitle: '',
@@ -748,16 +860,24 @@
 						typeArr = this.imgJspsArr;
 					} else if (e == 'hth') {
 						typeArr = this.imgHthArr;
-					} else if (type == 'Box') {
+					} else if (e == 'Box') {
 						typeArr = this.imgBoxArr;
-					} else if (type == 'Sfht') {
+					} else if (e == 'Sfht') {
 						typeArr = this.imgSfhtArr;
-					} else if (type == 'Fljd') {
+					} else if (e == 'Fljd') {
 						typeArr = this.imgFljdArr;
-					} else if (type == 'Dtlj') {
+					} else if (e == 'Dtlj') {
 						typeArr = this.imgDtljArr;
-					} else if (type == 'Hldmyh') {
+					} else if (e == 'Hldmyh') {
 						typeArr = this.imgHldmyhArr;
+					} 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;
 					}
 					typeArr.forEach((item, index) => {
 						if (item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg' ||
@@ -797,6 +917,14 @@
 									this.imgDtljArr.splice(index, 1)
 								} else if (e == 'Hldmyh') {
 									this.imgHldmyhArr.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)
 								}
 							}
 						}
@@ -855,6 +983,14 @@
 													_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('上传成功!')
 											}
@@ -925,6 +1061,14 @@
 												_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;
@@ -1151,7 +1295,8 @@
 					// }
 
 					if (this.objValue.value == '焊接、防腐' || this.objValue.value == '架空管线' || this.objValue.value == '下管' || this
-						.objValue.value == '沟下连头' || this.objValue.value == '焊接') {
+						.objValue.value == '沟下连头' || this.objValue.value == '全貌照片' || this.objValue.value == '顶管材料米数' || this
+						.objValue.value == '焊接') {
 
 						try {
 							this.czggslList.forEach((list) => {
@@ -1233,16 +1378,38 @@
 							this.$modal.msg('请上传调压箱护栏及地面硬化(远景)照片')
 							return
 						}
-					} else {
-						if (this.imgArr.length <= 0) {
-							this.$modal.msg('请上传照片或视频')
+					} else if (this.objValue.value == '阀井') {
+						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.value != '顶管材料米数') {
+
+
+							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 = {
 						id: this.enginId, //工程id
@@ -1277,6 +1444,19 @@
 								lightning: this.imgFljdArr,
 								bottomLeg: this.imgDtljArr,
 								groundHardening: this.imgHldmyhArr,
+
+
+								boxBrand: this.imgBoxArr,
+								stonePowder: this.imgSfhtArr,
+								lightning: this.imgFljdArr,
+								bottomLeg: this.imgDtljArr,
+								groundHardening: this.imgHldmyhArr,
+
+								cannula: this.imgTgArr,
+								wallPlaster: this.imgNbmhArr,
+								protectiveNet: this.imgFhwArr,
+								starAnise: this.imgBjArr,
+
 								zEngineeringMaterialBo: this.zEngineeringMaterialBo // 用料对象
 							}
 						}

+ 4 - 3
pages/infrastructure/infrastructure.vue

@@ -205,9 +205,7 @@
 					}})" class="tj-btn">添加</button>
 				</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;">
@@ -231,6 +229,9 @@
 			</view>
 		</view>
 		</view>
+		</view>
+		</view>
+		
 		<view class="action-btn">
 			<button @click="submit" class="btn cu-btn block bg-blue lg round">确认上传</button>
 		</view>

+ 11 - 1
pages/statistics/historyDetailMunicipal.vue

@@ -5,8 +5,18 @@
 
 			<view class="uni-media-list-body">
 				<view>
+					<view class="uni-media-list-text-top" v-if="value.zEngineeringReviewBo!=null">
+						<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=='1'">通过</view>
+						<view :style="value.zEngineeringReviewBo.reviewStatus=='0'?'color: red;':''">
+							{{value.zEngineeringReviewBo.reviewContent}}</view>
+					</view>
 					<view class="uni-media-list-text-top">
-						<view class="tit-text">施工时间:</view>{{value.updateTime}}
+						<view class="tit-text">施工时间:</view>{{value.constructTime}}
 					</view>
 					<view class="uni-media-list-text-top">
 						<view class="uni-common-mt" style="width: 100%;">

+ 10 - 1
pages/statistics/historyDetailsCourtyard.vue

@@ -5,8 +5,17 @@
 
 			<view class="uni-media-list-body">
 				<view>
+					<view class="uni-media-list-text-top" v-if="value.zEngineeringReviewBo!=null">
+						<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=='1'">通过</view>
+						<view :style="value.zEngineeringReviewBo.reviewStatus=='0'?'color: red;':''">{{value.zEngineeringReviewBo.reviewContent}}</view>
+					</view>
 					<view class="uni-media-list-text-top">
-						<view class="tit-text">施工时间:</view>{{value.updateTime}}
+						<view class="tit-text">施工时间:</view>{{value.constructTime}}
 					</view>
 					<view class="uni-media-list-text-top">
 						<view class="uni-common-mt" style="width: 100%;">

+ 246 - 69
pages/statistics/historyDetailsEnginproject.vue

@@ -5,8 +5,17 @@
 
 			<view class="uni-media-list-body">
 				<view>
+					<view class="uni-media-list-text-top" v-if="value.zEngineeringReviewBo!=null">
+						<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=='1'">通过</view>
+						<view :style="value.zEngineeringReviewBo.reviewStatus=='0'?'color: red;':''">
+							{{value.zEngineeringReviewBo.reviewContent}}</view>
+					</view>
 					<view class="uni-media-list-text-top">
-						<view class="tit-text">施工时间:</view>{{value.updateTime}}
+						<view class="tit-text">施工时间:</view>{{value.constructTime}}
 					</view>
 					<view class="uni-media-list-text-top">
 						<view class="uni-common-mt" style="width: 100%;">
@@ -23,7 +32,8 @@
 
 
 
-					<view v-if="title=='焊接、防腐'||title=='架空管线'||title=='下管'||title=='沟下连头'||title=='焊接'">
+					<view
+						v-if="title=='焊接、防腐'||title=='架空管线'||title=='下管'||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=" ">
@@ -66,7 +76,7 @@
 						<button @click="btnAdd(key,index)" class="tj-btn">添加</button>
 					</view>
 				</view>
-				<view v-if="title!='回填、撤场'&&title!='调压柜'">
+				<view v-if="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)">
@@ -181,7 +191,7 @@
 
 				</view>
 
-				<view v-else>
+				<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:
@@ -322,10 +332,121 @@
 						</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>
 		</view>
@@ -661,6 +782,30 @@
 													.groundHardening.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('上传成功!')
 										}
@@ -749,6 +894,22 @@
 											_this.dataJson.zEngineeringNodeBo
 												.zEngineeringInfoBoList[_this.dataIndex]
 												.groundHardening.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('上传成功!')
 									}
@@ -820,87 +981,103 @@
 			},
 			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) => {
 
-					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 (res.createBy == this.$user.state.name) {
 
+						if (this.title == '调压柜') {
+							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 == '阀井') {
+							if (res.cannula.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('请上传照片')
+							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 == '焊接、防腐' || this.title == '架空管线' || this.title ==
+							'下管' || this.title == '沟下连头' || this.title == '焊接' || this.title == '顶管材料米数' ||
+							this.title == '全貌照片') {
+							res.zEngineeringMaterialBo.forEach((itme) => {
+								if (itme.specifications == '') {
+									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 (itme.number == '') {
+									this.$modal.msg("请输入米数");
+									isSubmit = false;
+								}
+								if (this.getIntegerPart(itme.number, 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('请上传照片')
+								isSubmit = false;
+							}
+							// if (res.zEngiineeringPhotoBoListTwo.length <= 0) {
+							// 	this.$modal.msg('请上传警示带铺设照片')
+							// 	isSubmit = false;
+							// }
+							// if (res.zEngiineeringPhotoBoListThree.length <= 0) {
+							// 	this.$modal.msg('请上传回填后照片')
+							// 	isSubmit = false;
+							// }
+						} else {
+							if (this.title != '顶管材料米数') {
 								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
 				}

+ 31 - 21
pages/statistics/historyDetailsInfrastructure.vue

@@ -4,8 +4,17 @@
 			<view class="uni-media-list-body">
 				<view v-for="(value, key) in dataJson.zEngineeringNodeBo.zEngineeringInfoBoList" :key="key"
 					v-if="isEdit(value)">
+					<view class="uni-media-list-text-top" v-if="value.zEngineeringReviewBo!=null">
+						<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=='1'">通过</view>
+						<view :style="value.zEngineeringReviewBo.reviewStatus=='0'?'color: red;':''">
+							{{value.zEngineeringReviewBo.reviewContent}}</view>
+					</view>
 					<view class="uni-media-list-text-top">
-						<view class="tit-text">施工时间:</view>{{value.updateTime}}
+						<view class="tit-text">施工时间:</view>{{value.constructTime}}
 					</view>
 
 					<view class="cz-style" v-for="(a,index) in value.zEngineeringMaterialBo" :key="index">
@@ -189,23 +198,24 @@
 
 									// this.selectList.forEach((item, index2) => {
 
-										val.zEngineeringMaterialBo.forEach((itemEnd, indexEnd) => {
-
-											if (this.selectList.some(item => item.id === itemEnd.materialQuality)) {
-												this.dataJson.zEngineeringNodeBo
-													.zEngineeringInfoBoList[
-														index]
-													.zEngineeringMaterialBo[indexEnd]
-													.isNew = false
-
-											} else {
-												this.dataJson.zEngineeringNodeBo
-													.zEngineeringInfoBoList[
-														index]
-													.zEngineeringMaterialBo[indexEnd]
-													.isNew = true
-											}
-										})
+									val.zEngineeringMaterialBo.forEach((itemEnd, indexEnd) => {
+
+										if (this.selectList.some(item => item.id === itemEnd
+												.materialQuality)) {
+											this.dataJson.zEngineeringNodeBo
+												.zEngineeringInfoBoList[
+													index]
+												.zEngineeringMaterialBo[indexEnd]
+												.isNew = false
+
+										} else {
+											this.dataJson.zEngineeringNodeBo
+												.zEngineeringInfoBoList[
+													index]
+												.zEngineeringMaterialBo[indexEnd]
+												.isNew = true
+										}
+									})
 									// })
 
 								}
@@ -496,8 +506,8 @@
 					this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList[this.dataIndex].zEngineeringMaterialBo[this
 							.selectIndex]
 						.specificationsName = '';
-				
-				
+
+
 				} else if (this.chooseType == 'gg') {
 					this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList[this.dataIndex].zEngineeringMaterialBo[this
 							.selectIndex]
@@ -543,7 +553,7 @@
 				let isSubmit = true;
 				this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList.forEach((res) => {
 					if (res.createBy == this.$user.state.name) {
-						
+
 						res.zEngineeringMaterialBo.forEach((itme) => {
 							if (itme.materialQuality == '') {
 								this.$modal.msg("请选择材质或输入材质");

+ 10 - 1
pages/statistics/historyDetailsMouth.vue

@@ -5,8 +5,17 @@
 
 			<view class="uni-media-list-body">
 				<view>
+					<view class="uni-media-list-text-top" v-if="value.zEngineeringReviewBo!=null">
+						<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=='1'">通过</view>
+					<view :style="value.zEngineeringReviewBo.reviewStatus=='0'?'color: red;':''">
+						{{value.zEngineeringReviewBo.reviewContent}}</view>
+					</view>
 					<view class="uni-media-list-text-top">
-						<view class="tit-text">施工时间:</view>{{value.updateTime}}
+						<view class="tit-text">施工时间:</view>{{value.constructTime}}
 					</view>
 					<view class="uni-list" v-if="title=='管道压力'||title=='原有管线压力'">
 						<view class="container" style="border-bottom: 1px solid #f8f8f8;">

+ 12 - 1
pages/statistics/historyDetailsTopTube.vue

@@ -4,8 +4,19 @@
 			<view class="uni-media-list-body">
 				<view v-for="(value, key) in dataJson.zEngineeringNodeBo.zEngineeringInfoBoList" :key="key"
 					v-if="isEdit(value)">
+
+					<view class="uni-media-list-text-top" v-if="value.zEngineeringReviewBo!=null">
+						<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=='1'">通过</view>
+						<view :style="value.zEngineeringReviewBo.reviewStatus=='0'?'color: red;':''">
+							{{value.zEngineeringReviewBo.reviewContent}}</view>
+					</view>
 					<view class="uni-media-list-text-top">
-						<view class="tit-text">施工时间:</view>{{value.updateTime}}
+						<view class="tit-text">施工时间:</view>{{value.constructTime}}
 					</view>
 
 

+ 12 - 1
pages/statistics/history_details_bottom_leg.vue

@@ -5,8 +5,19 @@
 
 			<view class="uni-media-list-body">
 				<view>
+					<view class="uni-media-list-text-top" v-if="value.zEngineeringReviewBo!=null">
+						<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=='1'">通过</view>
+						<view :style="value.zEngineeringReviewBo.reviewStatus=='0'?'color: red;':''">
+							{{value.zEngineeringReviewBo.reviewContent}}
+						</view>
+					</view>
 					<view class="uni-media-list-text-top">
-						<view class="tit-text">施工时间:</view>{{value.updateTime}}
+						<view class="tit-text">施工时间:</view>{{value.constructTime}}
 					</view>
 					<view class="uni-media-list-text-top">
 						<view class="uni-common-mt" style="width: 100%;">

+ 10 - 1
pages/statistics/history_gas_sealing.vue

@@ -5,8 +5,17 @@
 
 			<view class="uni-media-list-body">
 				<view>
+					<view class="uni-media-list-text-top" v-if="value.zEngineeringReviewBo!=null">
+						<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=='1'">通过</view>
+					<view :style="value.zEngineeringReviewBo.reviewStatus=='0'?'color: red;':''">
+						{{value.zEngineeringReviewBo.reviewContent}}</view>
+					</view>
 					<view class="uni-media-list-text-top">
-						<view class="tit-text">施工时间:</view>{{value.updateTime}}
+						<view class="tit-text">施工时间:</view>{{value.constructTime}}
 					</view>
 					<view class="uni-media-list-text-top">
 						<view class="uni-common-mt" style="width: 100%;">

+ 14 - 21
pages/work/index.vue

@@ -205,6 +205,7 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 				enginName: '',
 				enginType: '',
 				address: '',
+				GYClassification: [],
 			}
 		},
 
@@ -219,9 +220,12 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 					this.enginName = item.name;
 					this.enginType = item.enginType;
 					// //工业工程
-					getDicts("engin_classification").then(response => {
-						this.typeList = response.data;
-					});
+					// getDicts("engin_classification").then(response => {
+					// 	this.typeList = response.data;
+					// });
+					// this.handleShowSheet();
+					this.GYClassification = item.enginClassification;
+					this.typeList = this.GYClassification;
 					this.handleShowSheet();
 				} else if (this.projectType == 'ShiZheng') {
 					this.id = item.id;
@@ -533,6 +537,7 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 				} else if (this.projectType == 'ShiZheng') {
 					let obj = {
 						id: this.id,
+						Label: item.dictLabel,
 						value: item.dictValue,
 						title: item.dictLabel
 					};
@@ -542,22 +547,11 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 					});
 				} else if (this.projectType == 'GongYe') {
 
-					let label = '';
-					if (item.dictLabel == '室内管线' || item.dictLabel == '室外管线') {
-						switch (item.dictLabel) {
-							case '室内管线':
-								label = 'gy_inner '
-								break
-							case '室外管线':
-								label = 'gy_out'
-								break
-							case '调压柜':
-								label = 'gy_tyg'
-								break
-						}
+					if (item.dictLabel == '室内管线' || item.dictLabel == '庭院' || item.dictLabel == '架空管线') {
+
 						this.handleHiddenShare();
 						this.title_lebel = item.dictValue;
-						getDicts(label).then(response => {
+						getDicts(item.dictType).then(response => {
 
 							this.typeList = response.data;
 						});
@@ -565,7 +559,7 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 						this.handleShowSheet();
 					} else {
 						let obj = ''
-						if (item.dictLabel == '调压柜') {
+						if (item.dictLabel == '每日施工日志') {
 							obj = {
 								value: item.dictValue,
 								title: item.dictLabel,
@@ -588,8 +582,6 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 						})
 					}
 
-
-
 				} else if (this.projectType == 'PengKou') {
 					let obj = {
 						id: this.id,
@@ -656,7 +648,8 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 						mList.push({
 							name: item.name,
 							enginType: item.enginType,
-							title: item.name + " - " + item.enginType
+							title: item.name + " - " + item.enginType,
+							enginClassification: item.enginClassification
 						})
 					})
 					this.selectList = mList;