1

config.js

@@ -1,8 +1,8 @@
 // 应用全局配置
 module.exports = {
-	baseUrl: 'https://www.xcx.cczdsz.cn/prod-api',
-	// baseUrl: 'http://192.168.4.6:8080',
-	 //baseUrl: 'http://192.168.4.23:8080',
+	//baseUrl: 'https://www.xcx.cczdsz.cn/prod-api',
+	baseUrl: 'http://192.168.4.20:8080',
+	//baseUrl: 'http://192.168.4.23:8080',
 	//baseUrl: 'http://192.168.4.11:8080',
 	// baseUrl: 'http://192.168.4.14:8089',
 	baseIconUrl: 'https://www.xcx.cczdsz.cn/app/images/',
@@ -27,5 +27,5 @@ module.exports = {
 			}
 		]
 	},
-	
+
 }

pages.json

@@ -132,6 +132,14 @@
 				"navigationBarTitleText": "",
 				"enablePullDownRefresh": false
 			}
+		},
+		{
+			"path" : "pages/surge_tank/surge_tank",
+			"style" : 
+			{
+				"navigationBarTitleText" : "",
+				"enablePullDownRefresh" : false
+			}
 		}
 
 	],

pages/enginproject/enginproject.vue

@@ -124,8 +124,7 @@
 								</view>
 
 
-								<view v-else  
-									@click="chooseModel(item.picUrl,item.fileName)">
+								<view v-else @click="chooseModel(item.picUrl,item.fileName)">
 									{{item.fileName}}
 								</view>
 
@@ -167,7 +166,17 @@
 							</view>
 						</view>
 
-
+						<view class="container" style="border-bottom: 1px solid #f8f8f8;" v-if="objValue.value=='调压柜'">
+							<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">
@@ -192,16 +201,18 @@
 									<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
 								</view>
 							</view>
-						
+
 							<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 								<text>米 数</text>
 								<!-- style="margin-left: 10px;text-align: right;" -->
 								<view style="display: flex; justify-content: right; width: 70%;">
-								<input class="uni-input" type="number" v-model="a.sl.inputIntegerNumberValue" maxlength="6"
-									style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
-								<text style="font-weight:bold;margin-left: 10px;margin-right: 10px;">.</text>
-								<input class="uni-input" type="number" v-model="a.sl.inputDecimalNumberValue" maxlength="1"
-									style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
+									<input class="uni-input" type="number" v-model="a.sl.inputIntegerNumberValue"
+										maxlength="6"
+										style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
+									<text style="font-weight:bold;margin-left: 10px;margin-right: 10px;">.</text>
+									<input class="uni-input" type="number" v-model="a.sl.inputDecimalNumberValue"
+										maxlength="1"
+										style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
 								</view>
 							</view>
 							<button v-if="index!=0" @click="this.czggslList.splice(index,1)" class="sc-btn">删除</button>
@@ -236,6 +247,7 @@
 							</view>
 						</view>
 					</view>
+					
 				</view>
 			</view>
 			<view class="action-btn">
@@ -349,6 +361,12 @@
 					createTime: '',
 					infonId: '', //info id
 
+					imgSfhtArr: [],
+					imgFljdArr: [],
+					imgBoxArr: [],
+					imgDtljArr: [],
+					imgHldmyhArr: [],
+
 				}
 			},
 
@@ -359,7 +377,7 @@
 			onLoad(options) {
 				if ('params' in options) {
 					this.objValue = JSON.parse(decodeURIComponent(options.params));
-					
+
 				}
 
 
@@ -506,7 +524,7 @@
 									header: _this.headers,
 
 									success: res => {
-										
+
 										let data = JSON.parse(res.data);
 										if (![200].includes(data.code)) {
 											_this.$modal.msg(data.msg)
@@ -805,7 +823,7 @@
 								throw new Error('End Loop')
 
 							}
-							
+
 							if (this.isEmpty(list.sl.inputIntegerNumberValue)) {
 								this.$modal.msg("请输入米数")
 								throw new Error('End Loop')
@@ -995,5 +1013,4 @@
 			border-radius: 20rpx;
 			border: 1px solid #d4e3f0;
 		}
-		
 	</style>

pages/statistics/historyDetailsCourtyard.vue

@@ -789,10 +789,10 @@
 				let isSubmit = true;
 				if (this.title == '回填') {
 					this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList.forEach((res) => {
-						if (res.stonePowder.length == 0) {
-							this.$modal.msg("请上传石粉回填照片");
-							isSubmit = false;
-						}
+						// if (res.stonePowder.length == 0) {
+						// 	this.$modal.msg("请上传石粉回填照片");
+						// 	isSubmit = false;
+						// }
 						if (res.warningtTape.length == 0) {
 							this.$modal.msg("请上传警示带铺设照片");
 							isSubmit = false;

pages/work/index.vue

@@ -46,6 +46,8 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 							</image>
 							<image :src="loadImgSrc('gd.png')" class="line2-btn-big" v-if="item.dictLabel == '未安装'">
 							</image>
+							<image :src="loadImgSrc('gd.png')" class="line2-btn-big" v-if="item.dictLabel == '调压柜'">
+							</image>
 							{{item.dictLabel}}
 						</view>
 					</view>
@@ -73,6 +75,8 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 							</image>
 							<image :src="loadImgSrc('gd2.png')" class="line2-btn-big" v-if="item.dictLabel == '未安装'">
 							</image>
+							<image :src="loadImgSrc('gd2.png')" class="line2-btn-big" v-if="item.dictLabel == '调压柜'">
+							</image>
 							{{item.dictLabel}}
 						</view>
 					</view>
@@ -288,6 +292,20 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 								obj))
 					})
 
+				} else if (e.dictValue == 'surge_tank') {
+					//调压柜
+					const obj = {
+						enginClassValue: this.enginClassValue, //(拆旧管等 字典值)
+						enginType: this.enginType, //旧改 还是新建  写死
+						enginClassification: this.enginClassification //室内  庭院  架空
+
+					};
+					console.log("===", obj)
+					uni.navigateTo({
+						url: '/pages/surge_tank/surge_tank?params=' + encodeURIComponent(JSON
+							.stringify(
+								obj))
+					})
 				}
 
 			},
@@ -345,6 +363,20 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 							.stringify(
 								obj))
 					})
+				} else if (e.dictValue == 'surge_tank') {
+					//调压柜
+					const obj = {
+						enginClassValue: this.enginClassValue, //(拆旧管等 字典值)
+						enginType: this.enginType, //旧改 还是新建  写死
+						enginClassification: this.enginClassification //室内  庭院  架空
+
+					};
+					console.log("===", obj)
+					uni.navigateTo({
+						url: '/pages/surge_tank/surge_tank?params=' + encodeURIComponent(JSON
+							.stringify(
+								obj))
+					})
 				}
 
 			},