民用施工步骤历史、修改历史新版

api/common.js

@@ -468,13 +468,23 @@ export function getEnginMaterialQualityList(enginType, enginSort, enginNode, eng
 	const data = {
 		enginType
 	}
-	if (enginSort !== undefined) {
-		data['enginSort'] = enginSort
-		data['enginNode'] = enginNode
-		data['enginStep'] = enginStep
-	}
-	if (nameType !== undefined) {
-		data['nameType'] = nameType
+	if (enginType == '民用工程') {
+		if (enginSort == 'old_renovation') {
+			if (enginSort !== undefined) {
+				data['enginSort'] = enginSort
+				data['enginNode'] = enginNode
+				data['enginStep'] = enginStep
+			}
+			if (nameType !== undefined) {
+				data['nameType'] = nameType
+			}
+		} else {
+			if (enginSort !== undefined) {
+				data['enginSort'] = enginSort
+
+			}
+		}
+
 	}
 	return request({
 		'url': '/zdsz/enginMaterialQuality/getEnginMaterialQualityList',
@@ -607,4 +617,4 @@ export function getCollisionProjectScheduleDetails(id, type) {
 		'url': '/zdsz/touchOperationEngineering/query/' + id + '/' + type,
 		'method': 'get',
 	})
-}
+}

components/bottomSheet/bottomSheet.vue

@@ -68,7 +68,7 @@
 								<view class="uni-media-list-text-top">
 									<view class="tit-text">施工时间:</view>{{value.constructTime}}
 								</view>
-								<view class="uni-media-list-text-top" v-if="title!='管道施工记录'">
+								<view class="uni-media-list-text-top">
 									<view class="uni-common-mt" style="width: 100%;">
 										<text class="uni-title uni-common-pl" style=" font-size: 13px;color:
 											#000;margin-top: 5px;">施工内容:</text>

pages/oldrenovation/courtyard/courtyard.vue

@@ -413,6 +413,7 @@
 				},
 				showPhoto(index, type) {
 					let typeArr = [];
+					let newArr = [];
 					if (type == 'gspsdcl') {
 						typeArr = this.imgGuanArr;
 					} else if (type == 'gdsgjl') {
@@ -420,9 +421,15 @@
 					} else {
 						typeArr = this.imgArr;
 					}
+					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,
 					})
 
 				},

pages/oldrenovation/courtyard/newcourtyard.vue

@@ -102,7 +102,7 @@
 
 					</view>
 					<view
-						v-if="objValue.enginClassValue=='开挖前' || objValue.enginClassValue=='开挖后' ||objValue.enginClassValue=='焊口照片' ||objValue.enginClassValue== '隐蔽工程'"
+						v-if="objValue.enginClassValue=='开挖前' || objValue.enginClassValue=='开挖后' ||objValue.enginClassValue=='焊口照片' ||objValue.enginClassValue== '隐蔽工程'||objValue.enginClassValue== '管道施工记录'"
 						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;">

pages/oldrenovation/overhead/newoverhead.vue

@@ -367,9 +367,16 @@
 					this.shareState = false;
 				},
 				showPhoto(index) {
+					let newArr = [];
+					this.imgArr.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: this.imgArr,
+						urls: newArr,
 					})
 
 				},

pages/oldrenovation/overhead/overhead.vue

@@ -310,11 +310,18 @@
 					this.shareState = false;
 				},
 				showPhoto(index) {
+					let newArr = [];
+					this.imgArr.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: this.imgArr,
+						urls: newArr,
 					})
-
+					
 				},
 				remove(index) {
 					uni.showModal({

pages/statistics/historyDetailsCourtyard.vue

@@ -21,7 +21,7 @@
 						</view>
 					</view>
 					<view
-						v-if="title=='开挖前'||title=='开挖后'||title=='焊口照片'||title=='隐蔽工程'||title=='除锈刷油'||title=='打磨'||title=='全貌照片'">
+						v-if="title=='开挖前'||title=='开挖后'||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)">
@@ -465,12 +465,123 @@
 							</view>
 						</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('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>
+		</view>
 		<!-- <view class="gesture-area" v-show="playVideo" >
 			 <view @click="closeVideo()"
 			 	style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
@@ -721,6 +832,26 @@
 									.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)
+
 							}
 
 						}
@@ -855,6 +986,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('上传成功！')
@@ -948,6 +1103,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('上传成功！')
 									}
@@ -1091,6 +1262,27 @@
 						}
 					})
 
+				} else if (this.title == '阀井') {
+					this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList.forEach((res) => {
+						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 == '全貌照片') {

pages/statistics/history_details_bottom_leg.vue

@@ -40,28 +40,29 @@
 						</view>
 
 					</view>
+
 					<view class="uni-media-list-text-top">
 						<view class="uni-common-mt" style="width: 100%;">
-							<text class="tit-text">沟上部分照片:</text>
+							<text class="tit-text">开挖前照片:</text>
 							<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="chooseimage(0,key)">
+									@click="chooseimage(1,key)">
 								</image>
-								<view v-for="(item,index) in  value.onTheDitch" :key="index"
+								<view v-for="(item,index) in  value.beforeBottom" :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,value.onTheDitch)">
+											@click="showPhoto(index,value.beforeBottom)">
 										</image>
 									</view>
 									<view v-else>
 										<video :src="item"
 											style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
 									</view>
-									<view @click="removeht(index,key,0)"
+									<view @click="removeht(index,key,1)"
 										style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
 										<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
 										</image>
@@ -70,28 +71,31 @@
 							</view>
 						</view>
 					</view>
+
+
 					<view class="uni-media-list-text-top">
 						<view class="uni-common-mt" style="width: 100%;">
-							<text class="tit-text">开挖前照片:</text>
+							<text class="tit-text" style=" font-size: 13px;color:
+							#000;margin-top: 5px;">下沟照片:</text>
 							<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="chooseimage(1,key)">
+									@click="chooseimage(2,key)">
 								</image>
-								<view v-for="(item,index) in  value.beforeBottom" :key="index"
+								<view v-for="(item,index) in  value.legBackfilling" :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,value.beforeBottom)">
+											@click="showPhoto(index,value.legBackfilling)">
 										</image>
 									</view>
 									<view v-else>
 										<video :src="item"
 											style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
 									</view>
-									<view @click="removeht(index,key,1)"
+									<view @click="removeht(index,key,2)"
 										style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
 										<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
 										</image>
@@ -101,30 +105,29 @@
 						</view>
 					</view>
 
-
 					<view class="uni-media-list-text-top">
 						<view class="uni-common-mt" style="width: 100%;">
 							<text class="tit-text" style=" font-size: 13px;color:
-							#000;margin-top: 5px;">下沟照片:</text>
+							#000;margin-top: 5px;">回填照片:</text>
 							<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="chooseimage(2,key)">
+									@click="chooseimage(3,key)">
 								</image>
-								<view v-for="(item,index) in  value.legBackfilling" :key="index"
+								<view v-for="(item,index) in  value.inferiorSulcus" :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,value.legBackfilling)">
+											@click="showPhoto(index,value.inferiorSulcus)">
 										</image>
 									</view>
 									<view v-else>
 										<video :src="item"
 											style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
 									</view>
-									<view @click="removeht(index,key,2)"
+									<view @click="removeht(index,key,3)"
 										style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
 										<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
 										</image>
@@ -136,27 +139,26 @@
 
 					<view class="uni-media-list-text-top">
 						<view class="uni-common-mt" style="width: 100%;">
-							<text class="tit-text" style=" font-size: 13px;color:
-							#000;margin-top: 5px;">回填照片:</text>
+							<text class="tit-text">安装完成照片:</text>
 							<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="chooseimage(3,key)">
+									@click="chooseimage(0,key)">
 								</image>
-								<view v-for="(item,index) in  value.inferiorSulcus" :key="index"
+								<view v-for="(item,index) in  value.onTheDitch" :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,value.inferiorSulcus)">
+											@click="showPhoto(index,value.onTheDitch)">
 										</image>
 									</view>
 									<view v-else>
 										<video :src="item"
 											style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
 									</view>
-									<view @click="removeht(index,key,3)"
+									<view @click="removeht(index,key,0)"
 										style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
 										<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
 										</image>

pages/statistics/statistics.vue

@@ -1059,18 +1059,22 @@
 									obj))
 						})
 
-					} 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.nodeType == 'pressure_regulating') { //调压柜
+					// 	let obj = {
+					// 		id: this.nodeId,
+					// 		type: item.enginClassificationName
+					// 	};
+					// 	uni.navigateTo({
+					// 		url: '/pages/statistics/historyDetailsCourtyard?params=' + encodeURIComponent(
+					// 			JSON
+					// 			.stringify(
+					// 				obj))
+					// 	})
+
+					// }
+					 else {
+						this.handleShowSheet();
 					}
 				} else if (this.EngineeringValue == '开栓') {