zhnghongrui 1 ano atrás
pai
commit
b4c0c82838

+ 158 - 128
components/bottomSheet/bottomSheet.vue

@@ -15,56 +15,58 @@
 
 						<view class="uni-media-list-body" style="margin-left: 15px;">
 							<view v-if="title=='拆旧管'">
-								<view class="uni-media-list-text-top"
-									  >
-									<view class="tit-text">腐蚀等级:</view>{{value.zEngineeringMaterialBo[0].corrosionLevel}}</view>
-								<view class="uni-media-list-text-top"
-									  >
-									<view class="tit-text">施工时间:</view>{{value.createTime}}</view>
+								<view class="uni-media-list-text-top">
+									<view class="tit-text">腐蚀等级:</view>
+									{{value.zEngineeringMaterialBo[0].corrosionLevel}}
+								</view>
+								<view class="uni-media-list-text-top">
+									<view class="tit-text">施工时间:</view>{{value.createTime}}
+								</view>
 							</view>
 
 							<view v-if="title=='打孔'">
-								<view class="uni-media-list-text-top"
-									  >
-									<view class="tit-text">孔距:</view>{{value.zEngineeringMaterialBo[0].corrosionLevel}}</view>
-								<view class="uni-media-list-text-top"
-									  >
-									<view class="tit-text">施工时间:</view>{{value.createTime}}</view>
+								<view class="uni-media-list-text-top">
+									<view class="tit-text">孔距:</view>{{value.zEngineeringMaterialBo[0].corrosionLevel}}
+								</view>
+								<view class="uni-media-list-text-top">
+									<view class="tit-text">施工时间:</view>{{value.createTime}}
+								</view>
 							</view>
 							<view v-else-if="title=='立杠'||title=='表后管'||title=='挂表'||title=='阀管'||title=='报警器切断阀'">
-								<view class="uni-media-list-text-top"
-									   v-show="title=='阀管'">
-									<view class="tit-text">上门类型:</view>{{value.zEngineeringMaterialBo[0].visitType}}</view>
-								<view class="uni-media-list-text-top"
-									   v-show="title=='阀管'">
-									<view class="tit-text">自闭阀类型:</view>{{value.zEngineeringMaterialBo[0].selfClosingValveType}}</view>
-								<view class="uni-media-list-text-top"
-									  
-									v-show="title=='立杠'||title=='表后管'||title=='阀管'">
-									<view class="tit-text">材质:</view>{{value.zEngineeringMaterialBo[0].materialQualityName}}</view>
-								<view class="uni-media-list-text-top"
-									  
-									v-show="title=='立杠'||title=='表后管'||title=='阀管'">
-									<view class="tit-text">规格:</view>{{value.zEngineeringMaterialBo[0].specificationsName}}</view>
-								<view class="uni-media-list-text-top"
-									   v-show="title=='挂表'">
-									<view class="tit-text">品牌:</view>{{value.zEngineeringMaterialBo[0].brand}}</view>
-									<view class="uni-media-list-text-top"
-										   v-show="title=='报警器切断阀'">
-										<view class="tit-text">厂家:</view>{{value.zEngineeringMaterialBo[0].brand}}</view>
-								<view class="uni-media-list-text-top"
-									   v-show="title=='立杠'||title=='表后管'||title=='阀管'">
-									<view class="tit-text">数量:</view>{{value.zEngineeringMaterialBo[0].number}}</view>
-								<view class="uni-media-list-text-top"
-									  >
-									<view class="tit-text">施工时间:</view>{{value.createTime}}</view>
+								<view class="uni-media-list-text-top" v-show="title=='阀管'">
+									<view class="tit-text">上门类型:</view>{{value.zEngineeringMaterialBo[0].visitType}}
+								</view>
+								<view class="uni-media-list-text-top" v-show="title=='阀管'">
+									<view class="tit-text">自闭阀类型:</view>
+									{{value.zEngineeringMaterialBo[0].selfClosingValveType}}
+								</view>
+								<view class="uni-media-list-text-top" v-show="title=='立杠'||title=='表后管'||title=='阀管'">
+									<view class="tit-text">材质:</view>
+									{{value.zEngineeringMaterialBo[0].materialQualityName}}
+								</view>
+								<view class="uni-media-list-text-top" v-show="title=='立杠'||title=='表后管'||title=='阀管'">
+									<view class="tit-text">规格:</view>
+									{{value.zEngineeringMaterialBo[0].specificationsName}}
+								</view>
+								<view class="uni-media-list-text-top" v-show="title=='挂表'">
+									<view class="tit-text">品牌:</view>{{value.zEngineeringMaterialBo[0].brand}}
+								</view>
+								<view class="uni-media-list-text-top" v-show="title=='报警器切断阀'">
+									<view class="tit-text">厂家:</view>{{value.zEngineeringMaterialBo[0].brand}}
+								</view>
+								<view class="uni-media-list-text-top" v-show="title=='立杠'||title=='表后管'||title=='阀管'">
+									<view class="tit-text">数量:</view>{{value.zEngineeringMaterialBo[0].number}}
+								</view>
+								<view class="uni-media-list-text-top">
+									<view class="tit-text">施工时间:</view>{{value.createTime}}
+								</view>
 							</view>
-							
+
 							<view
-								v-else-if="title=='放线'||title=='挖沟'||title=='焊接'||title=='下沟'||title=='除锈'||title=='刷油'||title=='打磨'||title=='焊接'">
-								<view class="uni-media-list-text-top"
-									  >
-									<view class="tit-text">施工时间:</view>{{value.constructTime}}</view>
+								v-else-if="title=='开挖前'||title=='开挖后'||title=='焊口照片'||title=='隐蔽工程'||title=='除锈刷油'||title=='打磨'">
+								<view class="uni-media-list-text-top">
+									<view class="tit-text">施工时间:</view>{{value.constructTime}}
+								</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:
@@ -77,23 +79,13 @@
 										</view>
 									</view>
 								</view>
-								<view class="uni-media-list-text-top"
-									  >
-									<view class="tit-text">材质:</view>{{value.zEngineeringMaterialBo[0].materialQualityName}}</view>
-								<view class="uni-media-list-text-top"
-									  >
-									<view class="tit-text">规格:</view>{{value.zEngineeringMaterialBo[0].specificationsName}}</view>
-								<view class="uni-media-list-text-top"
-									  >
-									<view class="tit-text">数量:</view>{{value.zEngineeringMaterialBo[0].number}}</view>
+
 							</view>
 							<view v-else-if="title=='回填'">
-								<view class="uni-media-list-text-top"
-									  >
-									<view class="tit-text">施工时间:</view>{{value.constructTime}}</view>
-								<view class="uni-media-list-text-top"
-									  >
-									<view class="tit-text">回填时间:</view>{{value.backfillTime}}</view>
+								<view class="uni-media-list-text-top">
+									<view class="tit-text">施工时间:</view>{{value.constructTime}}
+								</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:
@@ -106,71 +98,108 @@
 										</view>
 									</view>
 								</view>
-								<view class="uni-media-list-text-top"
-									  >
-									<view class="tit-text">材质:</view>{{value.zEngineeringMaterialBo[0].materialQualityName}}</view>
-								<view class="uni-media-list-text-top"
-									  >
-									<view class="tit-text">规格:</view>{{value.zEngineeringMaterialBo[0].specificationsName}}</view>
-								<view class="uni-media-list-text-top"
-									  >
-									<view class="tit-text">数量:</view>{{value.zEngineeringMaterialBo[0].number}}</view>
-							</view>
-							<view v-else-if="title=='打压'">
-								<view class="uni-media-list-text-top"
-									  >
-									<view class="tit-text">施工时间:</view>{{value.constructTime}}</view>
-								<view class="uni-media-list-text-top"
-									  >
-									分段打压是否台格:{{value.segmentedCompressionQualified=='Y'?'是':'否'}}</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 class="tit-text">负责人:</view>
+									<text>{{value.constructUser}}</text>
+								</view>
+								<view class="uni-media-list-text-top">
+
+									<view class="tit-text">负责人联系电话:</view>
+									<text>{{value.constructPhone}}</text>
+								</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-media-list-text-top"
-									  >
-									<view class="tit-text">材质:</view>{{value.zEngineeringMaterialBo[0].materialQualityName}}</view>
-								<view class="uni-media-list-text-top"
-									  >
-									<view class="tit-text">规格:</view>{{value.zEngineeringMaterialBo[0].specificationsName}}</view>
-								<view class="uni-media-list-text-top"
-									  >
-									<view class="tit-text">数量:</view>{{value.zEngineeringMaterialBo[0].number}}</view>
-							</view>
-							<view class="uni-media-list-text-top">
 
-								<view class="tit-text">负责人:</view>
-								<text
-									  >{{value.constructUser}}</text>
-							</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;margin-left: 8px;">警示带铺设照片:</text>
+								</view>
+								<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px;">
+									<view v-for="(item,index) in value.warningtTape" :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.warningtTape)">
+											</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.photosAfter" :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.photosAfter)">
+											</image>
+										</view>
+										<view v-else>
+											<video :src="item"
+												style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+										</view>
 
-								<view class="tit-text">负责人联系电话:</view>
-								<text
-									  >{{value.constructPhone}}</text>
-							</view>
-							<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px;">
-								<text style="margin-left: 30rpx;margin-top: 6rpx;">{{ value.published_at }}</text>
-								<view v-for="(item,index) in value.zEngiineeringPhotoBoList" :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.zEngiineeringPhotoBoList)">
-										</image>
 									</view>
-									<view v-else>
-										<video :src="item"
-											style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+								</view>
+							</view>
+							<view v-else>
+								<view class="uni-media-list-text-top">
+
+									<view class="tit-text">负责人:</view>
+									<text>{{value.constructUser}}</text>
+								</view>
+								<view class="uni-media-list-text-top">
+
+									<view class="tit-text">负责人联系电话:</view>
+									<text>{{value.constructPhone}}</text>
+								</view>
+								<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px;">
+									<view v-for="(item,index) in value.zEngiineeringPhotoBoList" :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.zEngiineeringPhotoBoList)">
+											</image>
+										</view>
+										<view v-else>
+											<video :src="item"
+												style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+										</view>
+
 									</view>
 
 								</view>
@@ -240,13 +269,14 @@
 
 
 <style lang="scss">
-	.uni-media-list-body{
-		border:1px solid #eee;
+	.uni-media-list-body {
+		border: 1px solid #eee;
 		border-radius: 40rpx;
-		margin:10rpx 30rpx 20rpx;
+		margin: 10rpx 30rpx 20rpx;
 		padding: 10rpx 0 40rpx;
 		box-shadow: 0 0 5px #eee;
 	}
+
 	.share {
 		width: 100%;
 		height: 100%;
@@ -257,15 +287,15 @@
 		color: #4f535a;
 		margin-right: 20rpx;
 	}
-	.normal-text{
-		
-	}
-	.cz-style{
+
+	.normal-text {}
+
+	.cz-style {
 		background: #e8f4f9;
-		    margin: 20rpx;
-		    padding: 10rpx;
-		    border-radius: 20rpx;
-		    border: 1px solid #d4e3f0;
+		margin: 20rpx;
+		padding: 10rpx;
+		border-radius: 20rpx;
+		border: 1px solid #d4e3f0;
 	}
 
 	.uni-media-list-text-top {
@@ -377,7 +407,7 @@
 			align-items: center;
 			border-top: 1rpx solid #E4E7ED;
 		}
-		
+
 
 	}
 </style>

+ 108 - 37
components/bottomSheet/bottomSheetMore.vue

@@ -16,16 +16,14 @@
 						<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 class="tit-text">施工时间:</view>
+								<view class="normal-text">{{value.constructTime}}</view>
 							</view>
-							<!-- <view v-if="title=='进场'||title=='导向'||title=='挖孔'||title=='回拖'"
-								class="uni-media-list-text-top" style=" ">
-								描述:{{value.remark}}</view> -->
-							<view v-if="title=='进场'||title=='导向'||title=='挖孔'||title=='回拖'"
-								class="uni-media-list-text-top">
+
+							<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>
+										#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;"
@@ -37,48 +35,120 @@
 							<view class="cz-style" v-for="(a,index) in value.zEngineeringMaterialBo" :key="index">
 
 								<view class="uni-media-list-text-top" style=" ">
-									<view class="tit-text">材质:</view><view class="normal-text">{{a.materialQualityName}}</view>
+									<view class="tit-text">材质:</view>
+									<view class="normal-text">{{a.materialQualityName}}</view>
 								</view>
 
 
 
 								<view class="uni-media-list-text-top" style=" ">
-									<view class="tit-text">规格:</view><view class="normal-text">{{a.specificationsName}}</view>
+									<view class="tit-text">规格:</view>
+									<view class="normal-text">{{a.specificationsName}}</view>
 								</view>
 
 
 
 								<view class="uni-media-list-text-top" style=" ">
-									<view class="tit-text">数量:</view><view class="normal-text">{{a.number}}</view>
+									<view class="tit-text">数量:</view>
+									<view class="normal-text">{{a.number}}</view>
 								</view>
 
 							</view>
 
 
 							<view class="uni-media-list-text-top">
-									<view class="tit-text">负责人:</view>
+								<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="tit-text">负责人联系电话:</view>
 								<view class="normal-text">{{value.constructPhone}}</view>
 							</view>
-							<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px;">
-								<text style="margin-left: 30rpx;margin-top: 6rpx;">{{ value.published_at }}</text>
-								<view v-for="(item,index) in value.zEngiineeringPhotoBoList" :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.zEngiineeringPhotoBoList)">
-										</image>
+
+							<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;">
+									<view v-for="(item,index) in value.ductalEpithelium" :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.ductalEpithelium)">
+											</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.trenchProspect" :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.trenchProspect)">
+											</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.video" :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.video)">
+											</image>
+										</view>
+										<view v-else>
+											<video :src="item"
+												style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+										</view>
+
 									</view>
-									<view v-else>
-										<video :src="item"
-											style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+								</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"
+										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.zEngiineeringPhotoBoList)">
+											</image>
+										</view>
+										<view v-else>
+											<video :src="item"
+												style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+										</view>
 									</view>
 								</view>
+
 							</view>
 						</view>
 					</view>
@@ -162,13 +232,14 @@
 </script>
 
 <style lang="scss">
-	.uni-media-list-body{
-		border:1px solid #eee;
+	.uni-media-list-body {
+		border: 1px solid #eee;
 		border-radius: 40rpx;
-		margin:10rpx 30rpx 20rpx;
+		margin: 10rpx 30rpx 20rpx;
 		padding: 10rpx 0 40rpx;
 		box-shadow: 0 0 5px #eee;
 	}
+
 	.share {
 		width: 100%;
 		height: 100%;
@@ -179,15 +250,15 @@
 		color: #4f535a;
 		margin-right: 20rpx;
 	}
-	.normal-text{
-		
-	}
-	.cz-style{
+
+	.normal-text {}
+
+	.cz-style {
 		background: #e8f4f9;
-		    margin: 20rpx;
-		    padding: 10rpx;
-		    border-radius: 20rpx;
-		    border: 1px solid #d4e3f0;
+		margin: 20rpx;
+		padding: 10rpx;
+		border-radius: 20rpx;
+		border: 1px solid #d4e3f0;
 	}
 
 	.uni-media-list-text-top {
@@ -299,7 +370,7 @@
 			align-items: center;
 			border-top: 1rpx solid #E4E7ED;
 		}
-		
+
 
 	}
 </style>

+ 3 - 18
pages/oldrenovation/courtyard/courtyard.vue

@@ -1,22 +1,7 @@
 	<template>
 		<scroll-view>
 			<view class="background">
-				<!-- <view class="uni-list">
-					<view class="container" style="border-bottom: 1px solid #f8f8f8;">
-						<view>
-							工程周期
-						</view>
-						<view v-if="this.isEmpty(this.projectValue.dictValue)" @click="pickerShow('gczq')">
-							<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" @click="pickerShow('gczq')">
-							<span style="color: black;">{{projectValue.dictLabel}}</span>
-							<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
-						</view>
-
-					</view>
-				</view> -->
+				
 				<view class="uni-list">
 					<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 						<view>
@@ -221,7 +206,7 @@
 				<button @click="submit" class="btn cu-btn block bg-blue lg round">确认上传</button>
 			</view>
 
-			<bottom-sheet ref="refShare" :data="historyList"></bottom-sheet>
+			<bottom-sheet ref="refShare" :data="historyList" :TitleType="objValue.enginClassValue"></bottom-sheet>
 			<yt-dateTimePicker ref="myPicker" @submit="handleSubmit" :start-year="2024" :end-year="2099"
 				:time-hide="[true, true, true, true, true, true]" :time-label="['年', '月', '日', '时', '分', '秒']" />
 		</scroll-view>
@@ -231,7 +216,7 @@
 
 	<script>
 		import SelectPicker from '../../../components/selectPicker/select_picker.vue'
-		import bottomSheet from '../../../components/bottomSheet/bottomSheet.vue'
+		import bottomSheet from '../../../components/bottomSheet/bottomSheetMore.vue'
 
 		import {
 			getDicts

+ 2 - 1
pages/oldrenovation/courtyard/newcourtyard.vue

@@ -515,7 +515,7 @@
 					})
 				},
 
-				choosevideo() {
+				choosevideo(e) {
 					let _this = this;
 					console.log('视频')
 					uni.chooseVideo({
@@ -541,6 +541,7 @@
 												_this.imgArr.push(data.data.url)
 											} else if (e == 'sfht') {
 												_this.stonePowderArr.push(data.data.url)
+											
 											} else if (e == 'jsdps') {
 												_this.warningtTapeArr.push(data.data.url)
 											} else if (e == 'hth') {