调压柜民用

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>
@@ -262,6 +263,110 @@
 								</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"

config.js

@@ -1,9 +1,9 @@
 // 应用全局配置
 module.exports = {
 	//baseUrl: 'https://www.xcx.cczdsz.cn/prod-api',
-	baseUrl: 'http://192.168.4.88:8080',
+	//baseUrl: 'http://192.168.4.88:8080',
 	//baseUrl: 'http://192.168.4.23:8080',
-	//baseUrl: 'http://192.168.4.11:8080',
+	baseUrl: 'http://192.168.4.20:8080',
 	// baseUrl: 'http://192.168.4.14:8089',
 	baseIconUrl: 'https://www.xcx.cczdsz.cn/app/images/',
 	// 应用信息

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,
+
 							}
 
 						}

pages/work/index.vue

@@ -290,7 +290,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, //(拆旧管等 字典值)
@@ -361,7 +361,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, //(拆旧管等 字典值)
@@ -369,7 +369,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(