|
1
|
<template>
|
1
|
<template>
|
|
2
|
<view>
|
2
|
<view>
|
|
3
|
<!-- 顶部区域 -->
|
3
|
<!-- 顶部区域 -->
|
|
4
|
- <check-top-wrap @changeParamType="changeParamType" :yearVal="param.year" :keyword="keyword" :cityVal="basinTxt" @showPicker="showPicker"></check-top-wrap>
|
4
|
+ <check-top-wrap @changeParamType="changeParamType" :yearVal="yearTxt" :keyword="keyword" :cityVal="basinTxt" @showPicker="showPicker"></check-top-wrap>
|
|
5
|
<w-picker
|
5
|
<w-picker
|
|
6
|
:visible.sync="visibleYear"
|
6
|
:visible.sync="visibleYear"
|
|
7
|
mode="date"
|
7
|
mode="date"
|
|
@@ -55,6 +55,7 @@ |
|
@@ -55,6 +55,7 @@ |
|
55
|
export default {
|
55
|
export default {
|
|
56
|
data() {
|
56
|
data() {
|
|
57
|
return {
|
57
|
return {
|
|
|
|
58
|
+ yearTxt:new Date().getFullYear().toString(),
|
|
58
|
basinTxt:'全流域',
|
59
|
basinTxt:'全流域',
|
|
59
|
param:{
|
60
|
param:{
|
|
60
|
// 恢复位置
|
61
|
// 恢复位置
|
|
@@ -89,7 +90,7 @@ |
|
@@ -89,7 +90,7 @@ |
|
89
|
},
|
90
|
},
|
|
90
|
onLoad() {
|
91
|
onLoad() {
|
|
91
|
//#ifdef APP-PLUS
|
92
|
//#ifdef APP-PLUS
|
|
92
|
- uni.getLocation({
|
93
|
+ /* uni.getLocation({
|
|
93
|
type: 'gcj02',
|
94
|
type: 'gcj02',
|
|
94
|
geocode: true,
|
95
|
geocode: true,
|
|
95
|
success: (res) => {
|
96
|
success: (res) => {
|
|
@@ -97,12 +98,15 @@ |
|
@@ -97,12 +98,15 @@ |
|
97
|
this.basinTxt = res.address.city
|
98
|
this.basinTxt = res.address.city
|
|
98
|
this.defaultRegion = [res.address.province,res.address.city]
|
99
|
this.defaultRegion = [res.address.province,res.address.city]
|
|
99
|
}
|
100
|
}
|
|
100
|
- });
|
101
|
+ }); */
|
|
101
|
//#endif
|
102
|
//#endif
|
|
102
|
//#ifdef H5
|
103
|
//#ifdef H5
|
|
103
|
// 恢复位置
|
104
|
// 恢复位置
|
|
104
|
- this.defaultRegion = ['全流域','']
|
105
|
+ // this.defaultRegion = ['全流域','']
|
|
105
|
//#endif
|
106
|
//#endif
|
|
|
|
107
|
+ this.param.basin = ''
|
|
|
|
108
|
+ this.basinTxt = '全流域'
|
|
|
|
109
|
+ this.defaultRegion = ['全流域','']
|
|
106
|
this.getData()
|
110
|
this.getData()
|
|
107
|
},
|
111
|
},
|
|
108
|
methods: {
|
112
|
methods: {
|
|
@@ -143,7 +147,15 @@ |
|
@@ -143,7 +147,15 @@ |
|
143
|
},
|
147
|
},
|
|
144
|
onConfirm(e,pickerType){
|
148
|
onConfirm(e,pickerType){
|
|
145
|
if(pickerType == 'year'){
|
149
|
if(pickerType == 'year'){
|
|
146
|
- this.param.year = e.result
|
150
|
+ console.log('e.result',e.result)
|
|
|
|
151
|
+ if(e.result == '全'){
|
|
|
|
152
|
+ this.param.year = ''
|
|
|
|
153
|
+ this.yearTxt = '全'
|
|
|
|
154
|
+ }else{
|
|
|
|
155
|
+ this.param.year = e.result
|
|
|
|
156
|
+ this.yearTxt = e.result
|
|
|
|
157
|
+ }
|
|
|
|
158
|
+
|
|
147
|
}
|
159
|
}
|
|
148
|
if(pickerType == 'region'){
|
160
|
if(pickerType == 'region'){
|
|
149
|
if(e.obj.city.label != ''){
|
161
|
if(e.obj.city.label != ''){
|
