徐强 / eej · 提交

转到一个项目

作者 徐强
提交 dff28db4324be7d760928fafc206e57db16b8d1c 1 个父辈 a8fe2529

提交

内嵌 并排对比
正在显示 4 个修改的文件 包含 57 行增加 和 10 行删除
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
21 </view> 21 </view>
22 <view class="selectList"> 22 <view class="selectList">
23 <view class="selectItem" @click="showPicker('year')"> 23 <view class="selectItem" @click="showPicker('year')">
24 - {{yearVal}}年<image src="../static/image/ic_arrowdown.png" mode=""></image> 24 + {{yearVal == '全' ? '全部' : yearVal+'年'}}<image src="../static/image/ic_arrowdown.png" mode=""></image>
25 </view> 25 </view>
26 <view class="selectItem" @click="showPicker('region')"> 26 <view class="selectItem" @click="showPicker('region')">
27 {{cityVal}}<image src="../static/image/ic_arrowdown.png" mode=""></image> 27 {{cityVal}}<image src="../static/image/ic_arrowdown.png" mode=""></image>
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <view class="w-picker-view"> 2 <view class="w-picker-view">
3 <picker-view v-if="fields=='year'" class="d-picker-view" :indicator-style="itemHeight" :value="pickVal" @change="handlerChange"> 3 <picker-view v-if="fields=='year'" class="d-picker-view" :indicator-style="itemHeight" :value="pickVal" @change="handlerChange">
4 <picker-view-column> 4 <picker-view-column>
5 - <view class="w-picker-item" v-for="(item,index) in range.years" :key="index">{{item}}年</view> 5 + <view class="w-picker-item" v-for="(item,index) in range.years" :key="index">{{item == '全' ? '全部' : item+'年'}}</view>
6 </picker-view-column> 6 </picker-view-column>
7 </picker-view> 7 </picker-view>
8 <picker-view v-if="fields=='month'" class="d-picker-view" :indicator-style="itemHeight" :value="pickVal" @change="handlerChange"> 8 <picker-view v-if="fields=='month'" class="d-picker-view" :indicator-style="itemHeight" :value="pickVal" @change="handlerChange">
@@ -144,6 +144,7 @@ @@ -144,6 +144,7 @@
144 144
145 }, 145 },
146 onConfirm(e,pickerType){ 146 onConfirm(e,pickerType){
  147 + console.log(e.result)
147 if(pickerType == 'year'){ 148 if(pickerType == 'year'){
148 if(e.result == '全'){ 149 if(e.result == '全'){
149 this.param.year = '' 150 this.param.year = ''
@@ -719,7 +719,7 @@ @@ -719,7 +719,7 @@
719 IMGS:[] 719 IMGS:[]
720 }, 720 },
721 titleDesc:'一.', 721 titleDesc:'一.',
722 - title:'产污环节', 722 + title:'噪声类别',
723 moreBtn:false, 723 moreBtn:false,
724 check:-1, 724 check:-1,
725 last:false, 725 last:false,
@@ -802,7 +802,7 @@ @@ -802,7 +802,7 @@
802 IMGS:[] 802 IMGS:[]
803 }, 803 },
804 titleDesc:'五.', 804 titleDesc:'五.',
805 - title:'噪声类别', 805 + title:'执法监测结果',
806 check:-1, 806 check:-1,
807 moreBtn:false, 807 moreBtn:false,
808 last:true, 808 last:true,
@@ -1954,8 +1954,53 @@ @@ -1954,8 +1954,53 @@
1954 } 1954 }
1955 1955
1956 //噪声排放 1956 //噪声排放
1957 - if(this.param.code == 'zspf'){ 1957 + if(this.param.code == 'zspf'){
  1958 +
1958 uni.request({ 1959 uni.request({
  1960 + url:this.apiUrl + 'license/noisepull',
  1961 + method:'get',
  1962 + data:{companyId:this.companyId,pdoCd:this.param.pdoCd},
  1963 + success: (res) => {
  1964 + console.log('噪声排放',res)
  1965 + for(var k = 0; k < this.checkList.length; k ++){
  1966 + if(this.checkList[k].tempType == 'radio'){
  1967 + for(var i = 0; i < this.checkList[k].keyList.length; i++){
  1968 + for(var j = 0; j < res.data.data.noisebase.length; j ++){
  1969 + if(this.checkList[k].keyList[i].title == res.data.data.noisebase[j].FIELDCN){
  1970 + this.checkList[k].keyList[i].id = res.data.data.noisebase[j].ID
  1971 + if(res.data.data.noisebase[j].FILEDSTATICS){
  1972 + this.checkList[k].keyList[i].check = parseInt(res.data.data.noisebase[j].FILEDSTATICS)
  1973 + }else{
  1974 + this.checkList[k].keyList[i].check = -1
  1975 + }
  1976 + break;
  1977 + }
  1978 + }
  1979 + }
  1980 + }
  1981 + }
  1982 + for(var k = 0; k < 2; k ++){
  1983 + console.log(res.data.data.noisevalue[k])
  1984 + this.checkList[1].keyList[0].subKeyList.push({
  1985 + ID:res.data.data.noisevalue[k].ID,
  1986 + FIELDCN:res.data.data.noisevalue[k].FIELDCN,
  1987 + CONTENT:res.data.data.noisevalue[k].CONTENT,
  1988 + FILEDSTATICS:res.data.data.noisevalue[k].FILEDSTATICS ? parseInt(res.data.data.noisevalue[k].FILEDSTATICS) : -1
  1989 + })
  1990 + }
  1991 + for(var k = 2; k < 4; k ++){
  1992 + this.checkList[3].keyList[0].subKeyList.push({
  1993 + ID:res.data.data.noisevalue[k].ID,
  1994 + FIELDCN:res.data.data.noisevalue[k].FIELDCN,
  1995 + CONTENT:res.data.data.noisevalue[k].CONTENT,
  1996 + FILEDSTATICS:res.data.data.noisevalue[k].FILEDSTATICS ? parseInt(res.data.data.noisevalue[k].FILEDSTATICS) : -1
  1997 + })
  1998 + }
  1999 +
  2000 + }
  2001 + })
  2002 +
  2003 + /* uni.request({
1959 url:this.apiUrl + 'license/noiselimit', 2004 url:this.apiUrl + 'license/noiselimit',
1960 method:'get', 2005 method:'get',
1961 data:{itemId:'noisetime'}, 2006 data:{itemId:'noisetime'},
@@ -1984,7 +2029,7 @@ @@ -1984,7 +2029,7 @@
1984 }) 2029 })
1985 } 2030 }
1986 } 2031 }
1987 - }) 2032 + }) */
1988 } 2033 }
1989 2034
1990 //委托处置 2035 //委托处置
@@ -2350,6 +2395,7 @@ @@ -2350,6 +2395,7 @@
2350 thKeyList:(await this.getSubKeyList(subKeyObj.ID)).thKeyList 2395 thKeyList:(await this.getSubKeyList(subKeyObj.ID)).thKeyList
2351 } 2396 }
2352 keyList.subKeyList.push(subKey) 2397 keyList.subKeyList.push(subKey)
  2398 + console.log('keyList.subKeyList',keyList.subKeyList)
2353 }, 2399 },
2354 getSubKeyList(id){ 2400 getSubKeyList(id){
2355 return new Promise((resolve,reject) => { 2401 return new Promise((resolve,reject) => {
@@ -2360,14 +2406,14 @@ @@ -2360,14 +2406,14 @@
2360 success: (res) => { 2406 success: (res) => {
2361 var thKeyList = [] 2407 var thKeyList = []
2362 for(var i = 0; i < res.data.data.length; i ++){ 2408 for(var i = 0; i < res.data.data.length; i ++){
2363 - var choose = -1 2409 + var FILEDSTATICS = -1
2364 if(res.data.data[i].FILEDSTATICS){ 2410 if(res.data.data[i].FILEDSTATICS){
2365 - choose = parseInt(res.data.data[i].FILEDSTATICS) 2411 + FILEDSTATICS = parseInt(res.data.data[i].FILEDSTATICS)
2366 } 2412 }
2367 thKeyList.push({ 2413 thKeyList.push({
2368 id:res.data.data[i].ID, 2414 id:res.data.data[i].ID,
2369 title:res.data.data[i].FIELDCN, 2415 title:res.data.data[i].FIELDCN,
2370 - choose:choose 2416 + FILEDSTATICS:FILEDSTATICS
2371 }) 2417 })
2372 } 2418 }
2373 resolve({thKeyList:thKeyList}) 2419 resolve({thKeyList:thKeyList})
@@ -2388,7 +2434,7 @@ @@ -2388,7 +2434,7 @@
2388 for(var j = 0; j < this.checkList[i].keyList.length; j ++){ 2434 for(var j = 0; j < this.checkList[i].keyList.length; j ++){
2389 for(var k = 0; k < this.checkList[i].keyList[j].subKeyList.length; k ++){ 2435 for(var k = 0; k < this.checkList[i].keyList[j].subKeyList.length; k ++){
2390 for(var l = 0; l < this.checkList[i].keyList[j].subKeyList[k].thKeyList.length; l ++){ 2436 for(var l = 0; l < this.checkList[i].keyList[j].subKeyList[k].thKeyList.length; l ++){
2391 - var choose = this.checkList[i].keyList[j].subKeyList[k].thKeyList[l].choose 2437 + var choose = this.checkList[i].keyList[j].subKeyList[k].thKeyList[l].FILEDSTATICS
2392 var id = this.checkList[i].keyList[j].subKeyList[k].thKeyList[l].id 2438 var id = this.checkList[i].keyList[j].subKeyList[k].thKeyList[l].id
2393 if(choose != -1){ 2439 if(choose != -1){
2394 saveParam.push({ 2440 saveParam.push({