提交

@@ -21,7 +21,7 @@
 				</view>
 				<view class="selectList">
 					<view class="selectItem" @click="showPicker('year')">
-						{{yearVal}}年<image src="../static/image/ic_arrowdown.png" mode=""></image>
+						{{yearVal == '全' ? '全部' : yearVal+'年'}}<image src="../static/image/ic_arrowdown.png" mode=""></image>
 					</view>
 					<view class="selectItem" @click="showPicker('region')">
 						{{cityVal}}<image src="../static/image/ic_arrowdown.png" mode=""></image>

@@ -2,7 +2,7 @@
 	<view class="w-picker-view">
 		<picker-view v-if="fields=='year'" class="d-picker-view" :indicator-style="itemHeight" :value="pickVal" @change="handlerChange">
 			<picker-view-column>
-				<view class="w-picker-item" v-for="(item,index) in range.years" :key="index">{{item}}年</view>
+				<view class="w-picker-item" v-for="(item,index) in range.years" :key="index">{{item == '全' ? '全部' : item+'年'}}</view>
 			</picker-view-column>
 		</picker-view>
 		<picker-view v-if="fields=='month'" class="d-picker-view" :indicator-style="itemHeight" :value="pickVal" @change="handlerChange">

@@ -144,6 +144,7 @@
 				
 			},
 			onConfirm(e,pickerType){
+				console.log(e.result)
 				if(pickerType == 'year'){
 					if(e.result == '全'){
 						this.param.year = ''

@@ -719,7 +719,7 @@
 									IMGS:[]
 								},
 								titleDesc:'一.',
-								title:'产污环节',
+								title:'噪声类别',
 								moreBtn:false,
 								check:-1,
 								last:false,
@@ -802,7 +802,7 @@
 									IMGS:[]
 								},
 								titleDesc:'五.',
-								title:'噪声类别',
+								title:'执法监测结果',
 								check:-1,
 								moreBtn:false,
 								last:true,
@@ -1955,7 +1955,52 @@
 				
 				//噪声排放
 				if(this.param.code == 'zspf'){	
+					
 					uni.request({
+						url:this.apiUrl + 'license/noisepull',
+						method:'get',
+						data:{companyId:this.companyId,pdoCd:this.param.pdoCd},
+						success: (res) => {
+							console.log('噪声排放',res)
+							for(var k = 0; k < this.checkList.length; k ++){
+								if(this.checkList[k].tempType == 'radio'){
+									for(var i = 0; i < this.checkList[k].keyList.length; i++){
+										for(var j = 0; j < res.data.data.noisebase.length; j ++){
+											if(this.checkList[k].keyList[i].title == res.data.data.noisebase[j].FIELDCN){
+												this.checkList[k].keyList[i].id = res.data.data.noisebase[j].ID
+												if(res.data.data.noisebase[j].FILEDSTATICS){
+													this.checkList[k].keyList[i].check = parseInt(res.data.data.noisebase[j].FILEDSTATICS)
+												}else{
+													this.checkList[k].keyList[i].check = -1
+												}
+												break;
+											}
+										}
+									}
+								}
+							}
+							for(var k = 0; k < 2; k ++){
+								console.log(res.data.data.noisevalue[k])
+								this.checkList[1].keyList[0].subKeyList.push({
+									ID:res.data.data.noisevalue[k].ID,
+									FIELDCN:res.data.data.noisevalue[k].FIELDCN,
+									CONTENT:res.data.data.noisevalue[k].CONTENT,
+									FILEDSTATICS:res.data.data.noisevalue[k].FILEDSTATICS ? parseInt(res.data.data.noisevalue[k].FILEDSTATICS) : -1
+								})
+							}
+							for(var k = 2; k < 4; k ++){
+								this.checkList[3].keyList[0].subKeyList.push({
+									ID:res.data.data.noisevalue[k].ID,
+									FIELDCN:res.data.data.noisevalue[k].FIELDCN,
+									CONTENT:res.data.data.noisevalue[k].CONTENT,
+									FILEDSTATICS:res.data.data.noisevalue[k].FILEDSTATICS ? parseInt(res.data.data.noisevalue[k].FILEDSTATICS) : -1
+								})
+							}
+							
+						}
+					})
+					
+					/* uni.request({
 						url:this.apiUrl + 'license/noiselimit',
 						method:'get',
 						data:{itemId:'noisetime'},
@@ -1984,7 +2029,7 @@
 								})
 							}
 						}
-					})
+					}) */
 				}
 				
 				//委托处置
@@ -2350,6 +2395,7 @@
 					thKeyList:(await this.getSubKeyList(subKeyObj.ID)).thKeyList
 				}
 				keyList.subKeyList.push(subKey)
+				console.log('keyList.subKeyList',keyList.subKeyList)
 			},
 			getSubKeyList(id){
 				return new Promise((resolve,reject) => {
@@ -2360,14 +2406,14 @@
 						success: (res) => {
 							var thKeyList = []
 							for(var i = 0; i < res.data.data.length; i ++){
-								var choose = -1
+								var FILEDSTATICS = -1
 								if(res.data.data[i].FILEDSTATICS){
-									choose = parseInt(res.data.data[i].FILEDSTATICS)
+									FILEDSTATICS = parseInt(res.data.data[i].FILEDSTATICS)
 								}
 								thKeyList.push({
 									id:res.data.data[i].ID,
 									title:res.data.data[i].FIELDCN,
-									choose:choose
+									FILEDSTATICS:FILEDSTATICS
 								})
 							}
 							resolve({thKeyList:thKeyList})
@@ -2388,7 +2434,7 @@
 							for(var j = 0; j < this.checkList[i].keyList.length; j ++){
 								for(var k = 0; k < this.checkList[i].keyList[j].subKeyList.length; k ++){
 									for(var l = 0; l < this.checkList[i].keyList[j].subKeyList[k].thKeyList.length; l ++){
-										var choose = this.checkList[i].keyList[j].subKeyList[k].thKeyList[l].choose
+										var choose = this.checkList[i].keyList[j].subKeyList[k].thKeyList[l].FILEDSTATICS
 										var id = this.checkList[i].keyList[j].subKeyList[k].thKeyList[l].id
 										if(choose != -1){
 											saveParam.push({