优化

config.js

@@ -30,4 +30,5 @@ module.exports = {
 		]
 	},
 
-}
+}
+

manifest.json

@@ -36,7 +36,15 @@
                 ]
             },
             "ios" : {},
-            "sdkConfigs" : {}
+            "sdkConfigs" : {
+                "maps" : {
+                    "amap" : {
+                        "name" : "",
+                        "appkey_ios" : "",
+                        "appkey_android" : ""
+                    }
+                }
+            }
         }
     },
     "quickapp" : {},

pages/bottom_leg/bottom_leg.vue

@@ -121,7 +121,7 @@
 					</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=""
@@ -416,7 +416,7 @@
 					} else if (this.imgArr3.length <= 0) {
 						this.$modal.msg("请上传回填照片")
 					} else {
-						
+
 
 						uni.showLoading()
 						let param = {
@@ -424,7 +424,7 @@
 							areaId: this.XQValue.id,
 							buildingId: this.LDValue.id,
 							unitId: this.isEmpty(this.DYValue.id) ? '' : this.DYValue.id,
-							enginType: this.objValue.enginType, //写死 上一页面传过来的 
+							enginType: this.objValue.enginType, //写死 上一页面传过来的
 							enginClassification: this.objValue
 								.enginClassification, //写死  上一页面传过来的  //室内 - 庭院 - 架空
 							enginCycle: this.projectValue.dictValue, //工程周期
@@ -630,13 +630,21 @@
 						}
 
 					} else if (e == 'xq') { //小区
-						if (this.isEmpty(this.XZQValue.dictValue)) {
-							this.$modal.msg('请选择行政区')
-
-						} else {
-							this.open = true;
-							this.selectList = this.XQList;
-						}
+						// if (this.isEmpty(this.XZQValue.dictValue)) {
+						// 	this.$modal.msg('请选择行政区')
+            //
+						// } else {
+            //根据行政区id获取小区数据
+            this.XQValue = ''; //重置小区数据
+            this.LDValue = ''; //重置楼栋数据
+            this.DYValue = ''; //重置单元数据
+            getAreaList('').then(res => {
+              this.XQList = res.data;
+              this.open = true;
+              this.selectList = this.XQList;
+            })
+
+						// }
 					} else if (e == 'ld') { //楼栋
 
 						if (this.isEmpty(this.XQValue.id)) {
@@ -693,6 +701,7 @@
 					this.open = false;
 
 					if (this.type == 'xq') {
+            this.XZQValue = {dictValue:item.district,dictLabel:item.districtName};
 						this.XQValue = item;
 						//根据小区id 获取楼栋数据
 						this.LDValue = ''; //重置楼栋数据
@@ -865,4 +874,4 @@
 			min-height: 100upx;
 			line-height: 20px;
 		}
-	</style>
+	</style>

pages/oldrenovation/courtyard/courtyard.vue

@@ -117,7 +117,7 @@
 									<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
 								</view>
 							</view>
-						
+
 							<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 								<text>米 数</text>
 								<view style="display: flex; justify-content: right; width: 70%;">
@@ -616,13 +616,20 @@
 						}
 
 					} else if (e == 'xq') { //小区
-						if (this.isEmpty(this.XZQValue.dictValue)) {
-							this.$modal.msg('请选择行政区')
-
-						} else {
-							this.open = true;
-							this.selectList = this.XQList;
-						}
+						// if (this.isEmpty(this.XZQValue.dictValue)) {
+						// 	this.$modal.msg('请选择行政区')
+            //
+						// } else {
+            //根据行政区id获取小区数据
+            this.XQValue = ''; //重置小区数据
+            this.LDValue = ''; //重置楼栋数据
+
+            getAreaList('').then(res => {
+              this.XQList = res.data;
+              this.open = true;
+              this.selectList = this.XQList;
+            })
+						// }
 					} else if (e == 'ld') { //楼栋
 
 						if (this.isEmpty(this.XQValue.id)) {
@@ -686,6 +693,7 @@
 						this.czggslList[this.SelectIndex].gg.id = this.specificationValue.id
 						this.czggslList[this.SelectIndex].gg.name = this.specificationValue.name
 					} else if (this.type == 'xq') {
+            this.XZQValue = {dictValue:item.district,dictLabel:item.districtName};
 						this.XQValue = item;
 						if (!this.isEmpty(this.projectValue.dictValue)) {
 
@@ -782,7 +790,7 @@
 					}
 					// else if (this.isEmpty(this.LDValue.id)) {
 					// 	this.$modal.msg("请选择楼栋")
-					// } 
+					// }
 
 
 
@@ -864,11 +872,11 @@
 					let param = {
 						district: this.XZQValue.dictValue,
 						areaId: this.XQValue.id,
-						buildingId: buildingId, //不必传   如果没有传 ' ' 
+						buildingId: buildingId, //不必传   如果没有传 ' '
 						unitId: unitId,
 						houseId: houseId, //传空
 
-						enginType: this.objValue.enginType, //写死 上一页面传过来的 
+						enginType: this.objValue.enginType, //写死 上一页面传过来的
 						enginClassification: this.objValue.enginClassification, //写死  上一页面传过来的  //室内 - 庭院 - 架空
 						enginCycle: this.projectValue.dictValue, //工程周期
 						zEngineeringNodeBo: {
@@ -1075,4 +1083,4 @@
 			border-radius: 20rpx;
 			border: 1px solid #d4e3f0;
 		}
-	</style>
+	</style>

pages/oldrenovation/indoor/indoor.vue

@@ -927,13 +927,28 @@
 						//this.selectList = this.dictOptions;
 
 					} else if (e == 'xq') { //小区
-						if (this.isEmpty(this.XZQValue.dictValue)) {
-							this.$modal.msg('请选择行政区')
+						// if (this.isEmpty(this.XZQValue.dictValue)) {
+						// 	this.$modal.msg('请选择行政区')
+            //
+						// } else {
+            //根据行政区id获取小区数据
+            this.XQValue = ''; //重置小区数据
+            this.LDValue = ''; //重置楼栋数据
+            this.DYValue = ''; //重置单元数据
+            this.FJValue = ''; //重置房间数据
+            this.currentResidentsPhoe = [];
+            this.historyName = "";
+            this.houseHeadName = "";
+            this.houseHeadPhone = "";
+            this.houseHeadIDcardNumber = "";
+            this.administrative = "";
+            getAreaList('').then(res => {
+              this.XQList = res.data;
+              this.open = true;
+              this.selectList = this.XQList;
+            })
 
-						} else {
-							this.open = true;
-							this.selectList = this.XQList;
-						}
+						// }
 					} else if (e == 'ld') { //楼栋
 
 						if (this.isEmpty(this.XQValue.id)) {
@@ -1016,9 +1031,8 @@
 						})
 					} else if (this.type == 'gg') {
 						this.specificationValue = item;
-
-
 					} else if (this.type == 'xq') {
+            this.XZQValue = {dictValue:item.district,dictLabel:item.districtName};
 						this.XQValue = item;
 						//根据小区id 获取楼栋数据
 						this.LDValue = ''; //重置楼栋数据
@@ -1922,4 +1936,4 @@
 		// 	min-height: 100upx;
 		// 	line-height: 20px;
 		// }
-	</style>
+	</style>

pages/oldrenovation/overhead/overhead.vue

@@ -1,7 +1,7 @@
 	<template>
 		<scroll-view>
 			<view class="background">
-				
+
 				<view class="uni-list">
 					<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 						<view>
@@ -100,8 +100,8 @@
 							</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>
@@ -114,9 +114,9 @@
 							</view>
 						</view>
 
-						
-					
-						
+
+
+
 					</view>
 
 					<view class="align-items" style="margin-top: 20px;margin-bottom: 20px;">
@@ -472,13 +472,22 @@
 						//this.selectList = this.dictOptions;
 
 					} else if (e == 'xq') { //小区
-						if (this.isEmpty(this.XZQValue.dictValue)) {
-							this.$modal.msg('请选择行政区')
-
-						} else {
-							this.open = true;
-							this.selectList = this.XQList;
-						}
+						// if (this.isEmpty(this.XZQValue.dictValue)) {
+						// 	this.$modal.msg('请选择行政区')
+            //
+						// } else {
+             //根据行政区id获取小区数据
+             this.XQValue = ''; //重置小区数据
+             this.LDValue = ''; //重置楼栋数据
+             this.DYValue = ''; //重置单元数据
+
+             getAreaList('').then(res => {
+               this.XQList = res.data;
+               this.open = true;
+               this.selectList = this.XQList;
+             })
+
+						// }
 					} else if (e == 'ld') { //楼栋
 
 						if (this.isEmpty(this.XQValue.id)) {
@@ -536,6 +545,7 @@
 					this.open = false;
 
 					 if (this.type == 'xq') {
+            this.XZQValue = {dictValue:item.district,dictLabel:item.districtName};
 						this.XQValue = item;
 						//根据小区id 获取楼栋数据
 						this.LDValue = ''; //重置楼栋数据
@@ -857,4 +867,4 @@
 			min-height: 100upx;
 			line-height: 20px;
 		}
-	</style>
+	</style>

pages/open_bolt/open_bolt.vue

@@ -590,11 +590,11 @@
 					direction: '',
 
 					imgArr3: [],
-					//4		
+					//4
 					isFixationValue: '',
 					isFixationId: '',
 					imgArr4: [],
-					//5	
+					//5
 					isPipeChangeValue: '',
 					isPipeChangeId: '',
 					PipeType: '',
@@ -1123,13 +1123,21 @@
 						}
 
 					} else if (e == 'xq') { //小区
-						if (this.isEmpty(this.XZQValue.dictValue)) {
-							this.$modal.msg('请选择行政区')
-
-						} else {
-							this.open = true;
-							this.selectList = this.XQList;
-						}
+						// if (this.isEmpty(this.XZQValue.dictValue)) {
+						// 	this.$modal.msg('请选择行政区')
+            //
+						// } else {
+            //根据行政区id获取小区数据
+            this.XQValue = ''; //重置小区数据
+            this.LDValue = ''; //重置楼栋数据
+            this.DYValue = ''; //重置单元数据
+            getAreaList('').then(res => {
+              this.XQList = res.data;
+              this.open = true;
+              this.selectList = this.XQList;
+            })
+
+						// }
 					} else if (e == 'ld') { //楼栋
 
 						if (this.isEmpty(this.XQValue.id)) {
@@ -1183,6 +1191,7 @@
 					this.open = false;
 
 					if (this.type == 'xq') {
+            this.XZQValue = {dictValue:item.district,dictLabel:item.districtName};
 						this.XQValue = item;
 						//根据小区id 获取楼栋数据
 						this.LDValue = '';
@@ -1200,8 +1209,8 @@
 							this.DYList = res.data
 						})
 					} else if (this.type == 'dy') {
-						this.DYValue = item;
-						this.FJValue = '';
+						this.DYValue = item; //根据单元数据 获取房间数据
+						this.FJValue = ''; //重置房间数据
 						getHousesList(item.id).then(res => {
 							this.FJList = res.data
 						})
@@ -1294,4 +1303,4 @@
 			min-height: 100upx;
 			line-height: 20px;
 		}
-	</style>
+	</style>

pages/piping_record/piping_record.vue

@@ -380,13 +380,22 @@
 						}
 
 					} else if (e == 'xq') { //小区
-						if (this.isEmpty(this.XZQValue.dictValue)) {
-							this.$modal.msg('请选择行政区')
-
-						} else {
-							this.open = true;
-							this.selectList = this.XQList;
-						}
+						// if (this.isEmpty(this.XZQValue.dictValue)) {
+						// 	this.$modal.msg('请选择行政区')
+            //
+						// } else {
+            //根据行政区id获取小区数据
+            this.XQValue = ''; //重置小区数据
+            this.LDValue = ''; //重置楼栋数据
+            this.DYValue = ''; //重置单元数据
+            this.FJValue = '';
+            getAreaList('').then(res => {
+              this.XQList = res.data;
+              this.open = true;
+              this.selectList = this.XQList;
+            })
+
+						// }
 					} else if (e == 'ld') { //楼栋
 
 						if (this.isEmpty(this.XQValue.id)) {
@@ -443,6 +452,7 @@
 					this.open = false;
 
 					if (this.type == 'xq') {
+            this.XZQValue = {dictValue:item.district,dictLabel:item.districtName};
 						this.XQValue = item;
 						//根据小区id 获取楼栋数据
 						this.LDValue = ''; //重置楼栋数据
@@ -562,4 +572,4 @@
 			min-height: 100upx;
 			line-height: 20px;
 		}
-	</style>
+	</style>

pages/statistics/statistics.vue

@@ -762,7 +762,7 @@
 						houseId: this.roomItem.roomId,
 						enginCycle: this.projectValue2.dictValue, // 工程周期
 						enginType: this.roomItem.enginCycle,
-						enginClassification: 'indoor_engin', //写死 室内 
+						enginClassification: 'indoor_engin', //写死 室内
 					}
 					getRoomProjectId(param).then(res => {
 
@@ -972,13 +972,21 @@
 						});
 					}
 				} else if (e == 'xq') {
-					if (this.isEmpty(this.XZQValue.dictValue)) {
-						this.$modal.msg('请选择行政区')
-
-					} else {
-						this.open = true;
-						this.selectList = this.XQList;
-					}
+					// if (this.isEmpty(this.XZQValue.dictValue)) {
+					// 	this.$modal.msg('请选择行政区')
+          //
+					// } else {
+          this.XQValue = '';
+          this.LDValue = '';
+          this.DYValue = '';
+          this.FJValue = '';
+          getAreaList('').then(res => {
+            this.XQList = res.data;
+            this.open = true;
+            this.selectList = this.XQList;
+          })
+
+					// }
 				} else if (e == 'ld') {
 
 					if (this.isEmpty(this.XQValue.id)) {
@@ -1013,13 +1021,20 @@
 						});
 					}
 				} else if (e == 'xq2') {
-					if (this.isEmpty(this.XZQValue2.dictValue)) {
-						this.$modal.msg('请选择行政区')
-
-					} else {
-						this.open = true;
-						this.selectList = this.XQList2;
-					}
+					// if (this.isEmpty(this.XZQValue2.dictValue)) {
+					// 	this.$modal.msg('请选择行政区')
+          //
+					// } else {
+          this.XQValue2 = '';
+          this.LDValue2 = '';
+          this.DYValue2 = '';
+          this.FJValue2 = '';
+          getAreaList('').then(res => {
+            this.XQList2 = res.data;
+            this.open = true;
+            this.selectList = this.XQList2;
+          })
+					// }
 				} else if (e == 'ld2') {
 
 					if (this.isEmpty(this.XQValue2.id)) {
@@ -1039,13 +1054,20 @@
 						this.selectList = this.DYList2;
 					}
 				} else if (e == 'xq3') {
-					if (this.isEmpty(this.XZQValue3.dictValue)) {
-						this.$modal.msg('请选择行政区')
-
-					} else {
-						this.open = true;
-						this.selectList = this.XQList3;
-					}
+					// if (this.isEmpty(this.XZQValue3.dictValue)) {
+					// 	this.$modal.msg('请选择行政区')
+          //
+					// } else {
+          this.XQValue3 = '';
+          this.LDValue3 = '';
+          this.DYValue3 = '';
+          this.FJValue3 = '';
+          getAreaList('').then(res => {
+            this.XQList3 = res.data;
+            this.open = true;
+            this.selectList = this.XQList3;
+          })
+					// }
 				} else if (e == 'ld3') {
 
 					if (this.isEmpty(this.XQValue3.id)) {
@@ -1057,7 +1079,7 @@
 					}
 
 				} else if (e == 'dy3') {
-					if (this.isEmpty(this.LDValue2.id)) {
+					if (this.isEmpty(this.LDValue3.id)) {
 						this.$modal.msg('请选择楼栋')
 
 					} else {
@@ -1065,8 +1087,8 @@
 						this.selectList = this.DYList3;
 					}
 				} else if (e == 'fj3') {
-					if (this.isEmpty(this.LDValue3.id)) {
-						this.$modal.msg('请选择楼栋')
+					if (this.isEmpty(this.DYValue3.id)) {
+						this.$modal.msg('请选择单元')
 
 					} else {
 						this.open = true;
@@ -1197,6 +1219,7 @@
 						this.XQList3 = res.data;
 					})
 				} else if (this.type == 'xq2') {
+          this.XZQValue2 = {dictValue:item.district,dictLabel:item.districtName};
 					this.XQValue2 = item;
 
 					this.LDValue2 = '';
@@ -1206,6 +1229,7 @@
 						this.LDList2 = res.data
 					})
 				} else if (this.type == 'xq3') {
+          this.XZQValue3 = {dictValue:item.district,dictLabel:item.districtName};
 					this.XQValue3 = item;
 
 					this.LDValue3 = '';
@@ -1239,6 +1263,8 @@
 						this.FJList3 = res.data
 					})
 
+				} else if (this.type == 'fj3') {
+					this.FJValue3 = item;
 				} else if (this.type == 'dy2') {
 					this.DYValue2 = item;
 					this.queryProjectStatisticsList();
@@ -1277,6 +1303,7 @@
 					realityQuality: this.materialValue.id,
 					realitySpecifications: this.specificationValue.id,
 				};
+        this.XZQValue = {dictValue:this.XQValue.district,dictLabel:this.XQValue.districtName};
 				getMunicipalStatisticsData(param).then(res => {
 					this.materialUsageList = res.data;
 				})
@@ -1901,4 +1928,4 @@
 
 
 	}
-</style>
+</style>