menchuang 1 rok pred
rodič
commit
9d68eb12e9

+ 626 - 0
components/bottomSheet/bottomSheetGasSealing.vue

@@ -0,0 +1,626 @@
+<template>
+	<view class="share">
+		<view :class="{'share-box': shareState}" @click="handleHiddenShare"></view>
+		<view class="share-item" :class="{'share-show': shareState}">
+			<view class="share-to">
+				<text style="font-size: 16px;color: #000;">{{title}}</text>
+			</view>
+			<scroll-view scroll-y="true" class="scroll-Y">
+				<view class="uni-list-cell" hover-class="uni-list-cell-hover" v-for="(value, key) in historyList"
+					:key="key">
+					<view class="uni-media-list">
+						<view class="uni-media-list-body">
+							<view class="uni-media-list-text-top">
+								<view class="tit-text">施工时间:</view>
+								<view class="normal-text">{{value.constructTime}}</view>
+							</view>
+							<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>
+									<view style="width: 100%;padding-right: 20rpx;box-sizing: border-box;">
+										<textarea class="textarea" maxlength="255" :disabled="true"
+											placeholder-style="padding: 10rpx;"
+											style="width: 100%;height: 100%;border: 1rpx solid #cccccc; border-radius: 15rpx;padding: 10rpx;line-height:normal;"
+											auto-height>{{value.remark}}</textarea>
+									</view>
+								</view>
+							</view>
+							<view class="uni-media-list-text-top">
+								<view class="tit-text">负责人:</view>
+								<view class="normal-text">{{value.constructUser}}</view>
+							</view>
+							<view class="uni-media-list-text-top">
+								<view class="tit-text">负责人联系电话:</view>
+								<view class="normal-text">{{value.constructPhone}}</view>
+							</view>
+
+							<view class="uni-media-list-text-top-no" v-if="type==='pe'">
+								<!-- 开孔照片 -->
+								<view class="uni-common-mt" style="width: 100%;margin-top: 5px;">
+									<text class="uni-title uni-common-pl"
+										style=" font-size: 13px;color: #000;margin-top: 5px; margin-left: 8px;">开孔照片:</text>
+								</view>
+								<view style="display: flex; flex-wrap: wrap;margin-top: 10px;">
+									<view v-for="(item,index) in value.peHolesOpening" :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.peHolesOpening)">
+											</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%;margin-top: 5px;#000;margin-top:
+									5px; margin-left: 8px;">封堵照片:</text>
+								</view>
+								<view style="display: flex; flex-wrap: wrap;margin-top: 10px;">
+									<view v-for="(item,index) in value.pePlugging" :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.pePlugging)">
+											</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%;margin-top: 5px;">
+									<text class="uni-title uni-common-pl"
+										style=" font-size: 13px;color: #000;margin-top: 5px; margin-left: 8px;">作业完成照片:</text>
+								</view>
+								<view style="display: flex; flex-wrap: wrap;margin-top: 10px;">
+									<view v-for="(item,index) in value.peHomeworkDone" :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.peHomeworkDone)">
+											</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%;margin-top: 5px;">
+									<text class="uni-title uni-common-pl" style=" font-size: 13px;color:
+																										#000;margin-top: 5px; margin-left: 8px;">鞍型焊接照片:</text>
+								</view>
+								<view style="display: flex; flex-wrap: wrap;margin-top: 10px;">
+									<view v-for="(item,index) in value.peSaddleWelding" :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.peSaddleWelding)">
+											</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%;margin-top: 5px;">
+									<text class="uni-title uni-common-pl" style=" font-size: 13px;color:
+																										#000;margin-top: 5px; margin-left: 8px;">气密实验照片:</text>
+								</view>
+								<view style="display: flex; flex-wrap: wrap;margin-top: 10px;">
+									<view v-for="(item,index) in value.peAirtightTest" :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.peAirtightTest)">
+											</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%;margin-top: 5px;">
+									<text class="uni-title uni-common-pl"
+										style=" font-size: 13px;color: #000;margin-top: 5px; margin-left: 8px;">碰口作业照片:</text>
+								</view>
+								<view style="display: flex; flex-wrap: wrap;margin-top: 10px;">
+									<view v-for="(item,index) in value.peCollisionOperating" :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.peCollisionOperating)">
+											</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%;margin-top: 5px;">
+									<text class="uni-title uni-common-pl"
+										style=" font-size: 13px;color: #000;margin-top: 5px; margin-left: 8px;">恢复通气捡漏照片:</text>
+								</view>
+								<view style="display: flex; flex-wrap: wrap;margin-top: 10px;">
+									<view v-for="(item,index) in value.peAirrecovering" :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.peAirrecovering)">
+											</image>
+										</view>
+										<view v-else>
+											<video :src="item"
+												style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+										</view>
+									</view>
+								</view>
+							</view>
+
+							<view class="uni-media-list-text-top-no" v-else>
+
+								<!-- 开孔照片 -->
+								<view class="uni-common-mt" style="width: 100%;margin-top: 5px;">
+									<text class="uni-title uni-common-pl"
+										style=" font-size: 13px;color: #000;margin-top: 5px; margin-left: 8px;">开孔照片:</text>
+								</view>
+								<view style="display: flex; flex-wrap: wrap;margin-top: 10px;">
+									<view v-for="(item,index) in value.ironHolesOpening" :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.ironHolesOpening)">
+											</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%;margin-top: 5px;#000;margin-top:
+									5px; margin-left: 8px;">封堵照片:</text>
+								</view>
+								<view style="display: flex; flex-wrap: wrap;margin-top: 10px;">
+									<view v-for="(item,index) in value.ironCleaning" :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.ironCleaning)">
+											</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%;margin-top: 5px;">
+									<text class="uni-title uni-common-pl"
+										style=" font-size: 13px;color: #000;margin-top: 5px; margin-left: 8px;">作业完成照片:</text>
+								</view>
+								<view style="display: flex; flex-wrap: wrap;margin-top: 10px;">
+									<view v-for="(item,index) in value.ironHomeworkDone" :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.ironHomeworkDone)">
+											</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%;margin-top: 5px;">
+									<text class="uni-title uni-common-pl"
+										style=" font-size: 13px;color: #000;margin-top: 5px; margin-left: 8px;">管道壁厚照片:</text>
+								</view>
+								<view style="display: flex; flex-wrap: wrap;margin-top: 10px;">
+									<view v-for="(item,index) in value.ironPipelineThickness" :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.ironPipelineThickness)">
+											</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%;margin-top: 5px;">
+									<text class="uni-title uni-common-pl"
+										style=" font-size: 13px;color: #000;margin-top: 5px; margin-left: 8px;">焊接四通照片:</text>
+								</view>
+								<view style="display: flex; flex-wrap: wrap;margin-top: 10px;">
+									<view v-for="(item,index) in value.iron4Welding" :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.iron4Welding)">
+											</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%;margin-top: 5px;">
+									<text class="uni-title uni-common-pl"
+										style=" font-size: 13px;color: #000;margin-top: 5px; margin-left: 8px;">焊接旁通照片:</text>
+								</view>
+								<view style="display: flex; flex-wrap: wrap;margin-top: 10px;">
+									<view v-for="(item,index) in value.ironBypassWelding" :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.ironBypassWelding)">
+											</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%;margin-top: 5px;">
+									<text class="uni-title uni-common-pl"
+										style=" font-size: 13px;color: #000;margin-top: 5px; margin-left: 8px;">氮气吹扫照片:</text>
+								</view>
+								<view style="display: flex; flex-wrap: wrap;margin-top: 10px;">
+									<view v-for="(item,index) in value.ironNitrogenPurging" :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.ironNitrogenPurging)">
+											</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%;margin-top: 5px;">
+									<text class="uni-title uni-common-pl"
+										style=" font-size: 13px;color: #000;margin-top: 5px; margin-left: 8px;">管道置换照片:</text>
+								</view>
+								<view style="display: flex; flex-wrap: wrap;margin-top: 10px;">
+									<view v-for="(item,index) in value.ironPipelineReplacing" :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.ironPipelineReplacing)">
+											</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%;margin-top: 5px;">
+									<text class="uni-title uni-common-pl"
+										style=" font-size: 13px;color: #000;margin-top: 5px; margin-left: 8px;">下堵照片:</text>
+								</view>
+								<view style="display: flex; flex-wrap: wrap;margin-top: 10px;">
+									<view v-for="(item,index) in value.ironLowerEndCap" :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.ironLowerEndCap)">
+											</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%;margin-top: 5px;">
+									<text class="uni-title uni-common-pl"
+										style=" font-size: 13px;color: #000;margin-top: 5px; margin-left: 8px;">四通防腐照片:</text>
+								</view>
+								<view style="display: flex; flex-wrap: wrap;margin-top: 10px;">
+									<view v-for="(item,index) in value.iron4Aczoiling" :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.iron4Aczoiling)">
+											</image>
+										</view>
+										<view v-else>
+											<video :src="item"
+												style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+										</view>
+									</view>
+								</view>
+								<!-- end -->
+							</view>
+						</view>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			data: {
+				type: Object,
+				default: {}
+			},
+
+			titleLabel: {
+				type: String
+			},
+
+			titleType: {
+				type: String
+			}
+
+		},
+		created() {
+			this.getParamsData();
+		},
+		watch: {
+			data(data) {
+				this.getParamsData();
+			}
+		},
+		data() {
+			return {
+				historyList: [], //历史数据
+				historyPhotoList: [], //历史图片数据
+				shareState: false,
+				title: '',
+				type: '',
+			};
+		},
+		methods: {
+			showPhoto(index, list) {
+				let newArr = [];
+				list.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: newArr,
+				})
+
+			},
+			getParamsData() {
+				var selectData = this.data;
+				this.title = this.titleLabel;
+				this.type = this.titleType;
+				debugger
+				this.historyList = selectData.zEngineeringNodeBo.zEngineeringInfoBoList;
+			},
+			// 显示分享
+			handleShowShare() {
+				this.shareState = true;
+			},
+			// 隐藏分享
+			handleHiddenShare() {
+				this.shareState = false;
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.uni-media-list-body {
+		border: 1px solid #eee;
+		border-radius: 40rpx;
+		margin: 10rpx 30rpx 20rpx;
+		padding: 10rpx 0 40rpx;
+		box-shadow: 0 0 5px #eee;
+	}
+
+	.share {
+		width: 100%;
+		height: 100%;
+	}
+
+	.tit-text {
+		color: #4f535a;
+		margin-right: 20rpx;
+	}
+
+	.normal-text {}
+
+	.cz-style {
+		background: #e8f4f9;
+		margin: 20rpx;
+		padding: 10rpx;
+		border-radius: 20rpx;
+		border: 1px solid #d4e3f0;
+	}
+
+	.uni-media-list-text-top {
+		font-size: 14px;
+		color: #696969;
+		padding: 20rpx 20rpx;
+		border-bottom: 1px solid #eee;
+		display: flex;
+		align-items: center;
+	}
+
+	.uni-media-list-text-top-no {
+		font-size: 14px;
+		color: #696969;
+		padding: 20rpx 20rpx;
+		border-bottom: 1px solid #eee;
+		align-items: center;
+	}
+
+	.share-box {
+		width: 100%;
+		height: 100%;
+		position: fixed;
+		top: 0rpx;
+		left: 0rpx;
+		bottom: 0rpx;
+		right: 0rpx;
+		background-color: rgba(0, 0, 0, 0.4);
+		transition: .3s;
+		z-index: 999;
+	}
+
+	// 进入分享动画
+	.share-show {
+		transition: all 0.3s ease;
+		transform: translateY(0%) !important;
+		border-radius: 20px 20px 0px 0px;
+	}
+
+	.scroll-Y {
+		height: 58vh;
+	}
+
+	// 离开分享动画
+	.share-item {
+		position: fixed;
+		left: 0;
+		bottom: 0;
+		width: 100%;
+		height: 70%;
+		background-color: #FFFFFF;
+		transition: all 0.3s ease;
+		transform: translateY(100%);
+		z-index: 1999;
+
+		.share-to {
+			width: 100%;
+			height: 30px;
+			display: flex;
+			justify-content: left;
+			margin: 30rpx 35rpx;
+			align-items: center;
+
+			// &::after {
+			// 	content: '';
+			// 	width: 240rpx;
+			// 	height: 0rpx;
+			// 	border-top: 1px solid #E4E7ED;
+			// 	-webkit-transform: scaleY(0.5);
+			// 	transform: scaleY(0.5);
+			// 	margin-left: 30rpx;
+			// }
+
+			// &::before {
+			// 	content: '';
+			// 	width: 240rpx;
+			// 	height: 0rpx;
+			// 	border-top: 1px solid #E4E7ED;
+			// 	-webkit-transform: scaleY(0.5);
+			// 	transform: scaleY(0.5);
+			// 	margin-right: 30rpx;
+			// }
+		}
+
+		.content {
+			width: 100%;
+			height: auto;
+			display: flex;
+			flex-wrap: wrap;
+
+			.block {
+				width: 100%;
+				display: flex;
+				flex-direction: column;
+				justify-content: center;
+				align-items: left;
+				height: auto;
+
+				image {
+					width: 80rpx;
+					height: 80rpx;
+				}
+
+				text {
+					margin-top: 16rpx;
+					font-size: 28rpx;
+					color: #606266;
+				}
+			}
+		}
+
+		.cancel {
+			width: 100%;
+			height: 3rem;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			border-top: 1rpx solid #E4E7ED;
+		}
+
+
+	}
+</style>

+ 231 - 16
components/bottomSheet/bottomSheetMore.vue

@@ -32,7 +32,8 @@
 									</view>
 								</view>
 							</view>
-							<view class="cz-style" v-for="(a,index) in value.zEngineeringMaterialBo" :key="index">
+							<view class="cz-style" v-for="(a,index) in value.zEngineeringMaterialBo" :key="index"
+								v-if="title!='调压柜'">
 
 								<view class="uni-media-list-text-top" style=" ">
 									<view class="tit-text">材质:</view>
@@ -72,13 +73,13 @@
 								</view>
 
 								<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px;">
-									<view v-for="(item,index) in value.constructionRecords
-" :key="index" style="position: relative;">
+									<view v-for="(item,index) in value.constructionRecords" :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.constructionRecords
-)">
+												style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
+												@click="showPhoto(index,value.constructionRecords)">
 											</image>
 										</view>
 										<view v-else>
@@ -153,6 +154,219 @@
 								</view>
 
 							</view>
+							<view v-else-if="title=='沟上施工'">
+								<view class="uni-common-mt" style="width: 100%;">
+									<text class="uni-title uni-common-pl" style=" font-size: 13px;color:
+											#000;margin-top: 5px;margin-left: 8px;">焊接照片:</text>
+								</view>
+								<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px;">
+									<view v-for="(item,index) in value.welding" :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.welding)">
+											</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.aczoiling" :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.aczoiling)">
+											</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>
+								</view>
+								<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px;">
+									<view v-for="(item,index) in value.piping" :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.piping)">
+											</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.warning" :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.warning)">
+											</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.backfilling" :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.backfilling)">
+											</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>
+								</view>
+								<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px;">
+									<view v-for="(item,index) in value.boxBrand" :key="index"
+										style="position: relative;">
+										<view
+											v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'  || item.substring(item.length - 3) == 'jpeg'">
+											<image :src="item" mode=""
+												style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
+												@click="showPhoto(index,value.boxBrand)">
+											</image>
+										</view>
+										<view v-else>
+											<video :src="item"
+												style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+										</view>
+									</view>
+								</view>
+								<view class="uni-common-mt" style="width: 100%;">
+									<text class="uni-title uni-common-pl" style=" font-size: 13px;color:
+											#000;margin-top: 5px;margin-left: 8px;">调压箱内石粉回填照片:</text>
+								</view>
+								<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px;">
+									<view v-for="(item,index) in value.stonePowder" :key="index"
+										style="position: relative;">
+										<view
+											v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'  || item.substring(item.length - 3) == 'jpeg'">
+											<image :src="item" mode=""
+												style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
+												@click="showPhoto(index,value.stonePowder)">
+											</image>
+										</view>
+										<view v-else>
+											<video :src="item"
+												style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+										</view>
+									</view>
+								</view>
+								<view class="uni-common-mt" style="width: 100%;">
+									<text class="uni-title uni-common-pl" style=" font-size: 13px;color:
+											#000;margin-top: 5px;margin-left: 8px;">调压箱防雷接地照片:</text>
+								</view>
+								<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px;">
+									<view v-for="(item,index) in value.lightning" :key="index"
+										style="position: relative;">
+										<view
+											v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'  || item.substring(item.length - 3) == 'jpeg'">
+											<image :src="item" mode=""
+												style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
+												@click="showPhoto(index,value.lightning)">
+											</image>
+										</view>
+										<view v-else>
+											<video :src="item"
+												style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+										</view>
+									</view>
+								</view>
+								<view class="uni-common-mt" style="width: 100%;">
+									<text class="uni-title uni-common-pl" style=" font-size: 13px;color:
+											#000;margin-top: 5px;margin-left: 8px;">调压箱底腿连接照片:</text>
+								</view>
+								<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px;">
+									<view v-for="(item,index) in value.bottomLeg" :key="index"
+										style="position: relative;">
+										<view
+											v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'  || item.substring(item.length - 3) == 'jpeg'">
+											<image :src="item" mode=""
+												style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
+												@click="showPhoto(index,value.bottomLeg)">
+											</image>
+										</view>
+										<view v-else>
+											<video :src="item"
+												style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+										</view>
+									</view>
+								</view>
+								<view class="uni-common-mt" style="width: 100%;">
+									<text class="uni-title uni-common-pl" style=" font-size: 13px;color:
+											#000;margin-top: 5px;margin-left: 8px;">调压箱护栏及地面硬化(远景)照片:</text>
+								</view>
+								<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px;">
+									<view v-for="(item,index) in value.groundHardening" :key="index"
+										style="position: relative;">
+										<view
+											v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'  || item.substring(item.length - 3) == 'jpeg'">
+											<image :src="item" mode=""
+												style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
+												@click="showPhoto(index,value.groundHardening)">
+											</image>
+										</view>
+										<view v-else>
+											<video :src="item"
+												style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+										</view>
+									</view>
+								</view>
+							</view>
 							<view v-else>
 								<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px;">
 									<view v-for="(item,index) in value.zEngiineeringPhotoBoList" :key="index"
@@ -218,25 +432,26 @@
 			// },
 
 			showPhoto(index, list) {
+				let newArr = [];
+				list.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: list,
+					urls: newArr,
 				})
 
 			},
 			getParamsData() {
 				var selectData = this.data;
 				this.outPutData = selectData;
-				//this.title = selectData.zEngineeringNodeBo.type;
-
-				//this.historyList = selectData.zEngineeringNodeBo.zEngineeringInfoBoList;
-				if (this.TitleType == '市政工程') {
-					this.title = '市政工程';
-					this.historyList = selectData.zEngineeringNodeBoList[0].zEngineeringInfoBoList;
-				} else {
-					this.title = this.TitleType;
-					this.historyList = selectData.zEngineeringNodeBo.zEngineeringInfoBoList;
-				}
+
+				this.title = this.TitleType;
+				this.historyList = selectData.zEngineeringNodeBo.zEngineeringInfoBoList;
+
 
 
 

+ 1 - 1
config.js

@@ -4,7 +4,7 @@ module.exports = {
 	// baseUrl: 'http://192.168.4.20:8080',
 	baseUrl: 'http://192.168.4.88:8080',
 	//baseUrl: 'http://192.168.4.23:8080',
-	//baseUrl: 'http://192.168.4.11:8080',
+	// baseUrl: 'http://192.168.4.20:8080',
 	// baseUrl: 'http://192.168.4.14:8089',
 	baseIconUrl: 'https://www.xcx.cczdsz.cn/app/images/',
 	// 应用信息

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 1228 - 0
pages/gas_sealing_project/gas_sealing_project.vue


+ 28 - 11
pages/municipal/municipal.vue

@@ -148,7 +148,7 @@
 					<view class="uni-list">
 						<view
 							style="font-size: 16px;margin-left: 10px;margin-top: 10px;display: flex; justify-content: space-between;margin-bottom: 10px;">
-							{{objValue.value}}
+							{{objValue.Label}}
 
 							<span
 								style="color: blue;font-size: 14px;  display: flex;justify-content:flex-end; margin-right: 10px;"
@@ -165,7 +165,17 @@
 							</view>
 						</view>
 
-
+						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
+							<view class="uni-common-mt" style="width: 100%;">
+								<text class="uni-title uni-common-pl">施工内容</text>
+								<view style="width: 100%;box-sizing: border-box;">
+									<textarea class="textarea" placeholder="请输入施工内容" maxlength="255"
+										placeholder-style="padding: 10rpx;"
+										style="width: 100%;height: 100%;border: 1rpx solid #cccccc; border-radius: 15rpx;padding: 10rpx;line-height:normal;"
+										auto-height v-model="projectContent"></textarea>
+								</view>
+							</view>
+						</view>
 
 
 						<view v-for="(a,index) in czggslList" :key="index" class="num-style">
@@ -212,9 +222,9 @@
 
 					</view>
 
-				
 
-					<view v-if="objValue.value=='沟上施工'">
+
+					<view v-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;">
@@ -351,7 +361,7 @@
 				<button @click="submit" class="btn cu-btn block bg-blue lg round">确认上传</button>
 			</view>
 
-			<bottom-sheet ref="refShare" :data="historyList" :TitleType="objValue.value"></bottom-sheet>
+			<bottom-sheet ref="refShare" :data="historyList" :TitleType="objValue.Label"></bottom-sheet>
 			<yt-dateTimePicker ref="myPicker" @submit="handleSubmit" :start-year="2024" :end-year="2099"
 				:time-hide="[true, true, true, true, true, true]" :time-label="['年', '月', '日', '时', '分', '秒']" />
 			<!-- 下载提示页面 -->
@@ -594,7 +604,6 @@
 					}
 
 
-					console.log("===", typeArr);
 					typeArr.forEach((item, index) => {
 						if (item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg' ||
 							item.substring(item.length - 4) == 'jpeg') {
@@ -937,10 +946,11 @@
 						this.$modal.msg('请选择工程名称')
 						return
 					}
-					getEngineeringHistoryList(this.enginId, '').then(response => {
+					getEngineeringHistoryList(this.enginId, this.objValue.value).then(response => {
 
 						this.historyList = response.data
-						if (response.data.zEngineeringNodeBoList != null) {
+						if (response.data.zEngineeringNodeBo != null && response.data.zEngineeringNodeBo
+							.zEngineeringInfoBoList != '') {
 							this.$refs.refShare.handleShowShare();
 						} else {
 							this.$modal.msg("暂无历史信息")
@@ -993,7 +1003,7 @@
 					// 	this.$modal.msg('请上传照片或视频')
 					// 	return
 					// }
-					if (this.objValue.value == '沟上施工') {
+					if (this.objValue.Label == '沟上施工') {
 						if (this.imgHjArr.length <= 0) {
 							this.$modal.msg('请上传焊接照片')
 							return
@@ -1051,11 +1061,18 @@
 						//enginClassification: this.objValue.value, // 工程分类  上一页面传过来的
 						zEngineeringNodeBo: {
 							createTime: this.createTime,
-							type: '市政工程', // 写死
+							type: this.objValue.value,
 							zEngineeringInfoBo: {
+								remark: this.projectContent, //施工内容
 								//engInfoId: this.infonId,
 								constructTime: this.time, //施工时间
-								zEngiineeringPhotoBoList: this.imgArr, //照片集合
+								//zEngiineeringPhotoBoList: this.imgArr, //照片集合
+								welding: this.imgHjArr,
+								aczoiling: this.imgFfArr,
+								piping: this.imgGdxgArr,
+								warning: this.imgJspsArr,
+								backfilling: this.imgHtArr,
+
 								zEngineeringMaterialBo: this.zEngineeringMaterialBo // 用料对象
 							}
 						}

+ 631 - 28
pages/open_bolt/open_bolt.vue

@@ -85,31 +85,93 @@
 				</view>
 			</view>
 
-			<view class="background" style="margin-top: 20px;margin-bottom: 20px;">
+			<view class="background" style="margin-top: 10px;margin-bottom: 10px;">
+				<view
+					style="font-size: 16px;margin-left: 10px;margin-top: 10px;display: flex; justify-content: space-between; margin-bottom: 10px;">
+					燃气立杠
+
+				</view>
 
 				<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 					<view class="uni-list-cell-left">
-						是否开栓
+						立杠是否刷涂防腐漆
 					</view>
 					<view v-if="this.isEmpty(this.openBoltKey)" class="uni-list-cell-db" style="margin-top: 10;"
-						@click="showActionsheet()">
-						<span style="color: darkgray;">请选择是否开栓</span>
+						@click="showActionsheet('openBoltKey')">
+						<span style="color: darkgray;">请选择立杠是否刷涂防腐漆</span>
 						<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
 					</view>
-					<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="showActionsheet()">
+					<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="showActionsheet('openBoltKey')">
 						<span style="color: black;">{{openBoltValue}}</span>
 						<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
 					</view>
 				</view>
+				<view class="container" style="border-bottom: 1px solid #f8f8f8;">
+					<view class="uni-list-cell-left">
+						是否有立杠卡子
+					</view>
+					<view v-if="this.isEmpty(this.barClamptKey)" class="uni-list-cell-db" style="margin-top: 10;"
+						@click="showActionsheet('barClamptKey')">
+						<span style="color: darkgray;">请选择是否有立杠卡子</span>
+						<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+					</view>
+					<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="showActionsheet('barClamptKey')">
+						<span style="color: black;">{{barClamptValue}}</span>
+						<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+					</view>
+				</view>
+
+
+				<view class="container" style="color: #b2b2b2;">*请上传照片</view>
+				<view 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('1')"
+						v-show="reviewStatus!='1'"></image>
+					<view v-for="(item,index) in imgArr" :key="index" style="position: relative;">
+						<view
+							v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'||item.substring(item.length-4)=='jpeg' ">
+							<image :src="item" mode="" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
+								@click="showPhoto(index,'1')">
+							</image>
+						</view>
+						<view v-else>
+							<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+						</view>
+						<view @click="remove(index,'1')"
+							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="background" style="margin-top: 10px;margin-bottom: 10px;">
+				<view
+					style="font-size: 16px;margin-left: 10px;margin-top: 10px;display: flex; justify-content: space-between; margin-bottom: 10px;">
+					气密测试
+
+				</view>
+				<view class="container" style="border-bottom: 1px solid #f8f8f8;">
+					<view class="uni-common-mt" style="width: 100%;">
+						<text class="uni-title uni-common-pl">立杠气密测试 </text>
+						<view style="width: 100%;box-sizing: border-box;">
+							<textarea class="textarea" placeholder="请输入立杠气密测试 " maxlength="100"
+								placeholder-style="padding: 10rpx;"
+								style="width: 100%;height: 100%;border: 1rpx solid #cccccc; border-radius: 15rpx;padding: 10rpx;line-height:normal;"
+								auto-height v-model="barTestValue"></textarea>
+						</view>
+					</view>
+				</view>
 
 				<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 					<view class="uni-common-mt" style="width: 100%;">
-						<text class="uni-title uni-common-pl">备注</text>
+						<text class="uni-title uni-common-pl">单户气密测试</text>
 						<view style="width: 100%;box-sizing: border-box;">
-							<textarea class="textarea" placeholder="请输入备注" maxlength="255"
+							<textarea class="textarea" placeholder="请输入单户气密测试" maxlength="100"
 								placeholder-style="padding: 10rpx;"
 								style="width: 100%;height: 100%;border: 1rpx solid #cccccc; border-radius: 15rpx;padding: 10rpx;line-height:normal;"
-								auto-height v-model="remark"></textarea>
+								auto-height v-model="singleValue"></textarea>
 						</view>
 					</view>
 				</view>
@@ -117,27 +179,343 @@
 				<view class="container" style="color: #b2b2b2;">*请上传照片</view>
 				<view 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="chooseimage()"
+						style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="choose('2')"
 						v-show="reviewStatus!='1'"></image>
-					<view v-for="(item,index) in imgArr" :key="index" style="position: relative;">
+					<view v-for="(item,index) in imgArr2" :key="index" style="position: relative;">
 						<view
 							v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'||item.substring(item.length-4)=='jpeg' ">
 							<image :src="item" mode="" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
-								@click="showPhoto(index)">
+								@click="showPhoto(index,'2')">
 							</image>
 						</view>
 						<view v-else>
 							<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
 						</view>
-						<view @click="remove(index)" style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
+						<view @click="remove(index,'2')"
+							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="background" style="margin-top: 10px;margin-bottom: 10px;">
+				<view
+					style="font-size: 16px;margin-left: 10px;margin-top: 10px;display: flex; justify-content: space-between; margin-bottom: 10px;">
+					燃气表
+
+				</view>
+
+
+				<view class="container" style="border-bottom: 1px solid #f8f8f8;">
+					<view class="uni-list-cell-left">
+						表号
+					</view>
+
+					<view class="uni-list-cell-db" style="margin-top: 10;">
+						<input class="uni-input" type="text" v-model="tableNumber"
+							style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
+					</view>
+				</view>
+				<view class="container" style="border-bottom: 1px solid #f8f8f8;">
+					<view class="uni-list-cell-left">
+						表字
+					</view>
+
+					<view class="uni-list-cell-db" style="margin-top: 10;">
+						<input class="uni-input" type="text" v-model="tableCharacters"
+							style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
+					</view>
+				</view>
+				<view class="container" style="border-bottom: 1px solid #f8f8f8;">
+					<view class="uni-list-cell-left">
+						品牌
+					</view>
 
+					<view class="uni-list-cell-db" style="margin-top: 10;">
+						<input class="uni-input" type="text" v-model="brankValue"
+							style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
+					</view>
+				</view>
+
+
+				<view class="container" style="border-bottom: 1px solid #f8f8f8;">
+					<view class="uni-list-cell-left">
+						型号
+					</view>
+
+					<view class="uni-list-cell-db" style="margin-top: 10;">
+						<input class="uni-input" type="text" v-model="tableModel"
+							style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
+					</view>
+				</view>
+				<view class="container" style="border-bottom: 1px solid #f8f8f8;">
+					<view class="uni-list-cell-left">
+						进气方向
+					</view>
+					<view v-if="this.isEmpty(this.directionId)" class="uni-list-cell-db" style="margin-top: 10;">
+						<span style="color: darkgray;">请选择进气方向</span>
+						<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+					</view>
+					<view v-else class="uni-list-cell-db" style="margin-top: 10;">
+						<span style="color: black;">{{directionValue}}</span>
+						<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+					</view>
+				</view>
+				<view class="container" style="color: #b2b2b2;">*请上传照片</view>
+				<view 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('3')"
+						v-show="reviewStatus!='1'"></image>
+					<view v-for="(item,index) in imgArr3" :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,'3')">
+							</image>
+						</view>
+						<view v-else>
+							<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+						</view>
+						<view @click="remove(index,'3')"
+							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="background" style="margin-top: 10px;margin-bottom: 10px;">
+				<view
+					style="font-size: 16px;margin-left: 10px;margin-top: 10px;display: flex; justify-content: space-between; margin-bottom: 10px;">
+					表后管
 
+				</view>
+				<view class="container" style="border-bottom: 1px solid #f8f8f8;">
+					<view class="uni-list-cell-left">
+						是否有卡子固定
+					</view>
+					<view v-if="this.isEmpty(this.isFixationId)" class="uni-list-cell-db" style="margin-top: 10;"
+						@click="showActionsheet('isFixationId')">
+						<span style="color: darkgray;">请选择是否有卡子固定</span>
+						<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+					</view>
+					<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="showActionsheet('isFixationId')">
+						<span style="color: black;">{{isFixationValue}}</span>
+						<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+					</view>
+				</view>
+				<view class="container" style="color: #b2b2b2;">*请上传照片</view>
+				<view 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('4')"
+						v-show="reviewStatus!='1'"></image>
+					<view v-for="(item,index) in imgArr4" :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,'4')">
+							</image>
+						</view>
+						<view v-else>
+							<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+						</view>
+						<view @click="remove(index,'4')"
+							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="background" style="margin-top: 10px;margin-bottom: 10px;">
+				<view
+					style="font-size: 16px;margin-left: 10px;margin-top: 10px;display: flex; justify-content: space-between; margin-bottom: 10px;">
+					灶前阀门
+
+				</view>
+				<view class="container" style="border-bottom: 1px solid #f8f8f8;">
+					<view class="uni-list-cell-left">
+						是否阀管改造
+					</view>
+					<view v-if="this.isEmpty(this.isPipeChangeId)" class="uni-list-cell-db" style="margin-top: 10;"
+						@click="showActionsheet('isPipeChangeId')">
+						<span style="color: darkgray;">请选择是否阀管改造</span>
+						<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+					</view>
+					<view v-else class="uni-list-cell-db" style="margin-top: 10;"
+						@click="showActionsheet('isPipeChangeId')">
+						<span style="color: black;">{{isPipeChangeValue}}</span>
+						<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+					</view>
+				</view>
+				<view class="container" style="border-bottom: 1px solid #f8f8f8;" v-if="isPipeChangeValue=='是'">
+					<view class="uni-list-cell-left">
+						阀管类型
+					</view>
+					<view v-if="this.isEmpty(this.PipeTypeId)" class="uni-list-cell-db" style="margin-top: 10;">
+						<span style="color: darkgray;">请选择阀管类型</span>
+						<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+					</view>
+					<view v-else class="uni-list-cell-db" style="margin-top: 10;">
+						<span style="color: black;">{{PipeTypeValue}}</span>
+						<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+					</view>
+				</view>
+				<view class="container" style="color: #b2b2b2;">*请上传照片</view>
+				<view 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('5')"
+						v-show="reviewStatus!='1'"></image>
+					<view v-for="(item,index) in imgArr5" :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,'5')">
+							</image>
+						</view>
+						<view v-else>
+							<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+						</view>
+						<view @click="remove(index,'5')"
+							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="background" style="margin-top: 10px;margin-bottom: 10px;">
+				<view
+					style="font-size: 16px;margin-left: 10px;margin-top: 10px;display: flex; justify-content: space-between; margin-bottom: 10px;">
+					软管
+
+				</view>
+				<view class="container" style="color: #b2b2b2;">*请上传照片</view>
+				<view 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('6')"
+						v-show="reviewStatus!='1'"></image>
+					<view v-for="(item,index) in imgArr6" :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,'6')">
+							</image>
+						</view>
+						<view v-else>
+							<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+						</view>
+						<view @click="remove(index,'6')"
+							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="background" style="margin-top: 10px;margin-bottom: 10px;">
+				<view
+					style="font-size: 16px;margin-left: 10px;margin-top: 10px;display: flex; justify-content: space-between; margin-bottom: 10px;">
+					灶具
+
+				</view>
+				<view class="container" style="border-bottom: 1px solid #f8f8f8;">
+					<view class="uni-list-cell-left">
+						是否使用防风圈
+					</view>
+					<view v-if="this.isEmpty(this.isUseWindproofId)" class="uni-list-cell-db" style="margin-top: 10;"
+						@click="showActionsheet('isUseWindproofId')">
+						<span style="color: darkgray;">请选择是否使用防风圈</span>
+						<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+					</view>
+					<view v-else class="uni-list-cell-db" style="margin-top: 10;"
+						@click="showActionsheet('isUseWindproofId')">
+						<span style="color: black;">{{isUseWindproofValue}}</span>
+						<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+					</view>
+				</view>
+				<view class="container" style="color: #b2b2b2;">*请上传照片</view>
+				<view 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('7')"
+						v-show="reviewStatus!='1'"></image>
+					<view v-for="(item,index) in imgArr7" :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,'7')">
+							</image>
+						</view>
+						<view v-else>
+							<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+						</view>
+						<view @click="remove(index,'7')"
+							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="background" style="margin-top: 10px;margin-bottom: 10px;">
+				<view
+					style="font-size: 16px;margin-left: 10px;margin-top: 10px;display: flex; justify-content: space-between; margin-bottom: 10px;">
+					用气环境
+
+				</view>
+				<view class="container" style="color: #b2b2b2;">*请上传照片</view>
+				<view 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('8')"
+						v-show="reviewStatus!='1'"></image>
+					<view v-for="(item,index) in imgArr8" :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,'8')">
+							</image>
+						</view>
+						<view v-else>
+							<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+						</view>
+						<view @click="remove(index,'8')"
+							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="background" style="margin-top: 10px;margin-bottom: 10px;">
+				<view
+					style="font-size: 16px;margin-left: 10px;margin-top: 10px;display: flex; justify-content: space-between; margin-bottom: 10px;">
+					回执单
+
+				</view>
+				<view class="container" style="color: #b2b2b2;">*请上传照片</view>
+				<view 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('9')"
+						v-show="reviewStatus!='1'"></image>
+					<view v-for="(item,index) in imgArr9" :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,'9')">
+							</image>
+						</view>
+						<view v-else>
+							<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+						</view>
+						<view @click="remove(index,'9')"
+							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="action-btn" v-show="reviewStatus!='1'">
 				<button @click="submit" class="btn cu-btn block bg-blue lg round">确认上传</button>
@@ -190,8 +568,47 @@
 					projectValue: {
 						'dictValue': '0'
 					},
+					//1
 					openBoltKey: '',
 					openBoltValue: '',
+					barClamptKey: '',
+					barClamptValue: '',
+					imgArr: [],
+					//2
+					barTestValue: '',
+					singleValue: '',
+					imgArr2: [],
+					//3
+					tableNumber: '',
+					tableCharacters: '',
+					brankValue: '',
+					tableModel: '',
+					directionValue: '',
+					directionId: '',
+					imgArr3: [],
+					//4		
+					isFixationValue: '',
+					isFixationId: '',
+					imgArr4: [],
+					//5	
+					isPipeChangeValue: '',
+					isPipeChangeId: '',
+					PipeTypeValue: '',
+					PipeTypeId: '',
+					imgArr5: [],
+					//6
+					imgArr6: [],
+					//7
+					isUseWindproofValue: '',
+					isUseWindproofId: '',
+					imgArr7: [],
+					//8
+					imgArr8: [],
+					//9
+					imgArr9: [],
+
+
+
 					openBoltText: '',
 					type: '',
 					reviewStatus: '', //是否可以点击
@@ -200,7 +617,7 @@
 					openDict: false,
 					selectList: [],
 					dictOptions: [],
-					imgArr: [],
+
 					XQValue: {},
 					XZQValue: {},
 					remark: '',
@@ -239,9 +656,34 @@
 					} else if (this.isEmpty(this.FJValue.id)) {
 						this.$modal.msg("请选择房间")
 					} else if (this.isEmpty(this.openBoltKey)) {
-						this.$modal.msg("请选择是否开栓")
+						this.$modal.msg("请选择立杠是否刷涂防腐漆")
+					} else if (this.isEmpty(this.barClamptKey)) {
+						this.$modal.msg("请选择是否有立杠卡子")
 					} else if (this.imgArr.length <= 0) {
-						this.$modal.msg("请上传照片")
+						this.$modal.msg("请上传燃气立杠照片")
+
+					} else if (this.isEmpty(this.barTestValue)) {
+						this.$modal.msg("请输入立杠气密测试")
+					} else if (this.isEmpty(this.singleValue)) {
+						this.$modal.msg("请输入单户气密测试")
+					} else if (this.imgArr2.length <= 0) {
+						this.$modal.msg("请上传气密测试照片")
+					} else if (this.imgArr3.length <= 0) {
+						this.$modal.msg("请上传燃气表照片")
+					} else if (this.imgArr4.length <= 0) {
+						this.$modal.msg("请上传表后管照片")
+					} else if (this.isPipeChangeValue == '是' && this.isEmpty(this.PipeTypeId)) {
+						this.$modal.msg("请选择阀管类型")
+					} else if (this.imgArr5.length <= 0) {
+						this.$modal.msg("请上传灶前阀门照片")
+					} else if (this.imgArr6.length <= 0) {
+						this.$modal.msg("请上传软管照片")
+					} else if (this.imgArr7.length <= 0) {
+						this.$modal.msg("请上传灶具照片")
+					} else if (this.imgArr8.length <= 0) {
+						this.$modal.msg("请上传用气环境照片")
+					} else if (this.imgArr9.length <= 0) {
+						this.$modal.msg("请上传回执单照片")
 					} else {
 						uni.showLoading()
 						let param = {
@@ -267,14 +709,14 @@
 								setTimeout(function() {
 									uni.navigateBack();
 								}, 1000)
-						
+
 							}
 						})
 						//提交接口执行逻辑
 					}
 
 				},
-				showActionsheet() {
+				showActionsheet(type) {
 					//是否
 					getDicts("sys_yes_no").then(response => {
 
@@ -287,8 +729,24 @@
 						uni.showActionSheet({
 							itemList: array,
 							success: (res) => {
-								this.openBoltKey = this.dictOptions[res.tapIndex].dictValue;
-								this.openBoltValue = this.dictOptions[res.tapIndex].dictLabel;
+								// this.openBoltKey = this.dictOptions[res.tapIndex].dictValue;
+								// this.openBoltValue = this.dictOptions[res.tapIndex].dictLabel;
+								if (type == 'openBoltKey') {
+									this.openBoltKey = this.dictOptions[res.tapIndex].dictValue;
+									this.openBoltValue = this.dictOptions[res.tapIndex].dictLabel;
+								} else if (type == 'barClamptKey') {
+									this.barClamptKey = this.dictOptions[res.tapIndex].dictValue;
+									this.barClamptValue = this.dictOptions[res.tapIndex].dictLabel;
+								} else if (type == 'isFixationId') {
+									this.isFixationId = this.dictOptions[res.tapIndex].dictValue;
+									this.isFixationValue = this.dictOptions[res.tapIndex].dictLabel;
+								} else if (type == 'isPipeChangeId') {
+									this.isPipeChangeId = this.dictOptions[res.tapIndex].dictValue;
+									this.isPipeChangeValue = this.dictOptions[res.tapIndex].dictLabel;
+								} else if (type == 'isUseWindproofId') {
+									this.isUseWindproofId = this.dictOptions[res.tapIndex].dictValue;
+									this.isUseWindproofValue = this.dictOptions[res.tapIndex].dictLabel;
+								}
 							},
 							fail: (err) => {
 								console.log('弹窗取消');
@@ -297,28 +755,87 @@
 
 					});
 				},
-				showPhoto(index) {
+				showPhoto(index, type) {
+					let typeArr = [];
+					let newArr = [];
+					if (type == '1') {
+						typeArr = this.imgArr;
+					} else if (type == '2') {
+						typeArr = this.imgArr2;
+					} else if (type == '3') {
+						typeArr = this.imgArr3;
+					} else if (type == '4') {
+						typeArr = this.imgArr4;
+					} else if (type == '5') {
+						typeArr = this.imgArr5;
+					} else if (type == '6') {
+						typeArr = this.imgArr6;
+					} else if (type == '7') {
+						typeArr = this.imgArr7;
+					} else if (type == '8') {
+						typeArr = this.imgArr8;
+					} else if (type == '9') {
+						typeArr = this.imgArr9;
+					}
+
+					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: this.imgArr,
+						urls: newArr,
 					})
 
 				},
-				remove(index) {
+				remove(index, e) {
 					uni.showModal({
 						title: '提示',
 						content: '是否删除该图片或视频?',
 						success: (res) => {
 							if (res.confirm) {
-								this.imgArr.splice(index, 1)
-								if (this.imgArr.length <= 0) {
-									this.photo = true;
+
+								if (e == '1') {
+									this.imgArr.splice(index, 1)
+								} else if (e == '2') {
+									this.imgArr2.splice(index, 1)
+								} else if (e == '3') {
+									this.imgArr3.splice(index, 1)
+								} else if (e == '4') {
+									this.imgArr4.splice(index, 1)
+								} else if (e == '5') {
+									this.imgArr5.splice(index, 1)
+								} else if (e == '6') {
+									this.imgArr6.splice(index, 1)
+								} else if (e == '7') {
+									this.imgArr7.splice(index, 1)
+								} else if (e == '8') {
+									this.imgArr8.splice(index, 1)
+								} else if (e == '9') {
+									this.imgArr9.splice(index, 1)
 								}
+
 							}
 						}
 					})
 				},
-				chooseimage() {
+				choose(e) {
+					let _this = this;
+					uni.showActionSheet({
+						title: '上传',
+						itemList: ['图片', '视频'],
+						success: (res) => {
+							if (res.tapIndex == 0) {
+								this.chooseimage(e)
+							} else {
+								this.choosevideo(e)
+							}
+						}
+					})
+				},
+				chooseimage(e) {
 
 					let _this = this;
 					uni.chooseImage({
@@ -339,9 +856,27 @@
 											_this.$modal.msg(data.msg)
 										} else {
 											if (_this.progress === 100) {
-												_this.imgArr.push(data.data.url)
+
+												if (e == '1') {
+													_this.imgArr.push(data.data.url)
+												} else if (e == '2') {
+													_this.imgArr2.push(data.data.url)
+												} else if (e == '3') {
+													_this.imgArr3.push(data.data.url)
+												} else if (e == '4') {
+													_this.imgArr4.push(data.data.url)
+												} else if (e == '5') {
+													_this.imgArr5.push(data.data.url)
+												} else if (e == '6') {
+													_this.imgArr6.push(data.data.url)
+												} else if (e == '7') {
+													_this.imgArr7.push(data.data.url)
+												} else if (e == '8') {
+													_this.imgArr8.push(data.data.url)
+												} else if (e == '9') {
+													_this.imgArr9.push(data.data.url)
+												}
 												_this.$modal.msg('上传成功!')
-												_this.photo = false;
 											}
 										}
 									},
@@ -371,6 +906,74 @@
 						},
 					})
 				},
+				choosevideo(e) {
+					let _this = this;
+					uni.chooseVideo({
+						sourceType: ['album', 'camera'],
+						maxDuration: 30,
+						success(resp) {
+							const task = uni.uploadFile({
+								url: _this.$HTTP + `/obs`,
+								filePath: resp.tempFilePath,
+								name: 'file',
+								formData: {},
+								header: _this.headers,
+								success: res => {
+									// 判断是否json字符串,将其转为json格式
+									let data = JSON.parse(res.data);
+									if (![200].includes(res.statusCode)) {
+										this.uploadError(index, data);
+									} else {
+										//上传成功
+										if (_this.progress === 100) {
+
+											if (e == '1') {
+												_this.imgArr.push(data.data.url)
+											} else if (e == '2') {
+												_this.imgArr2.push(data.data.url)
+											} else if (e == '3') {
+												_this.imgArr3.push(data.data.url)
+											} else if (e == '4') {
+												_this.imgArr4.push(data.data.url)
+											} else if (e == '5') {
+												_this.imgArr5.push(data.data.url)
+											} else if (e == '6') {
+												_this.imgArr6.push(data.data.url)
+											} else if (e == '7') {
+												_this.imgArr7.push(data.data.url)
+											} else if (e == '8') {
+												_this.imgArr8.push(data.data.url)
+											} else if (e == '9') {
+												_this.imgArr9.push(data.data.url)
+											}
+											_this.$modal.msg('上传成功!')
+										}
+									}
+								},
+								fail: e => {
+									_this.$modal.msg('上传失败!')
+									this.uploadError(index, e);
+								},
+								complete: res => {
+									uni.hideLoading();
+									_this.uploading = false;
+								}
+							});
+							task.onProgressUpdate(res => {
+								_this.progress = res.progress;
+								uni.showLoading({
+									title: '上传中'
+								})
+								if (_this.progress != 100) {
+									_this.loading = false
+								} else {
+									_this.loading = true
+								}
+							});
+
+						},
+					})
+				},
 				pickerShow(e) {
 					this.type = e; //赋值类型
 					if (e == 'xzq') { //行政区

+ 8 - 7
pages/surge_tank/surge_tank.vue

@@ -268,7 +268,6 @@
 					headers: {
 						Authorization: "Bearer " + getToken()
 					},
-					zEngineeringMaterialBo: [], //给后台传的值  用料列表
 
 					type: '',
 					reviewStatus: '', //是否可以点击
@@ -784,7 +783,7 @@
 
 
 
-					if (this.imgDtljArr.length <= 0) {
+					if (this.imgBoxArr.length <= 0) {
 						this.$modal.msg('请上传调压箱名牌照片')
 						return
 					}
@@ -839,13 +838,15 @@
 						zEngineeringNodeBo: {
 							type: this.objValue.enginClassValue, //写死 上一页面传过来的  (拆旧管等 字典值)
 							zEngineeringInfoBo: {
-								ductalEpithelium: this.imgGuanArr, //照片集合
-								constructionRecords: this.imgPipelineArr,
-								trenchProspect: this.imgArr,
-								video: this.videoArr,
+
 								constructTime: this.time, //施工时间
 								remark: this.projectContent, //施工内容
-								zEngineeringMaterialBo: this.zEngineeringMaterialBo
+								boxBrand: this.imgBoxArr,
+								stonePowder: this.imgSfhtArr,
+								lightning: this.imgFljdArr,
+								bottomLeg: this.imgDtljArr,
+								groundHardening: this.imgHldmyhArr,
+
 							}
 
 						}

+ 6 - 5
pages/work/index.vue

@@ -204,7 +204,7 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 					this.showInfrastructureDialog();
 				} else if (newId == 7) {
 					this.showOpenBolt();
-				}else if (newId == 8) {
+				} else if (newId == 8) {
 					this.showGasSealingDialog();
 				}
 
@@ -298,7 +298,7 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 								obj))
 					})
 
-				} else if (e.dictValue == 'surge_tank') {
+				} else if (e.dictValue == 'pressure_regulating') {
 					//调压柜
 					const obj = {
 						enginClassValue: this.enginClassValue, //(拆旧管等 字典值)
@@ -369,7 +369,7 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 							.stringify(
 								obj))
 					})
-				} else if (e.dictValue == 'surge_tank') {
+				} else if (e.dictValue == 'pressure_regulating') {
 					//调压柜
 					const obj = {
 						enginClassValue: this.enginClassValue, //(拆旧管等 字典值)
@@ -377,7 +377,6 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 						enginClassification: this.enginClassification //室内  庭院  架空
 
 					};
-					console.log("===", obj)
 					uni.navigateTo({
 						url: '/pages/surge_tank/surge_tank?params=' + encodeURIComponent(JSON
 							.stringify(
@@ -440,7 +439,8 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 					}
 				} else if (this.projectType == 'ShiZheng') {
 					let obj = {
-						value: item.dictLabel
+						Label: item.dictLabel,
+						value: item.dictValue
 					};
 					uni.navigateTo({
 						url: '/pages/municipal/municipal?params=' + encodeURIComponent(JSON
@@ -479,6 +479,7 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 					})
 				} else if (this.projectType == 'DaiQiFengDuShiGong') {
 					let obj = {
+						Label: item.dictLabel,
 						value: item.dictValue
 					};
 					//this.handleHiddenShare();