diff --git a/src/pages/views/WatershedOneMap/modalPart/rainTz.vue b/src/pages/views/WatershedOneMap/modalPart/rainTz.vue index f091194..c93a760 100644 --- a/src/pages/views/WatershedOneMap/modalPart/rainTz.vue +++ b/src/pages/views/WatershedOneMap/modalPart/rainTz.vue @@ -3,16 +3,15 @@
-
气象信息
- -

{{ item.WEA }}

-

{{ item.TIME ? item.TIME.substring(5, 10) : '--' }}

-

{{ item.TEM2 }}--{{ item.TEM1 }}

+ +

{{ item.DGD_WP12 }}

+

{{ item.startTime ? item.startTime.substring(5, 10) : '--' }}

+

{{ item.TMIN }}°C--{{ item.TMAX }}°C

-
+
@@ -92,7 +91,7 @@ import bus from '@/utils/util'; import yuliangImg from '@/assets/newImgs/layerIcon/rainStation_gis.png'; import { getWeatherImg, formatDate } from '@/utils/util'; - +import axios from 'axios'; export default { name: 'natureOne', components: { @@ -231,11 +230,24 @@ }; // 获取气象数据信息 const getWeather = async () => { - let res = await dayWeather(); - let arrs = res || []; - if (arrs.length > 4) { - allData.weatherArr = arrs.splice(0, 4); - } + allData.weatherArr = [] + axios + .get('http://219.140.167.85:9880/api/forecast/extraForecast/getHxh4DaysForecastData', { + headers: { + 'X-token': '2d39a382-0050-41f4-9fdc-3ee9f0dba0a8', + }, + params: {}, + }) + .then(function (res) { + if(res.data.data.length>0){ + res.data.data.forEach(item=>{ + if(item.areaName == '规划范围'){ + allData.weatherArr.push(item) + } + }) + } + + }); }; // 天气图标 function getNowImage(code) { diff --git a/src/pages/views/WatershedOneMap/modalPart/rainTz.vue b/src/pages/views/WatershedOneMap/modalPart/rainTz.vue index f091194..c93a760 100644 --- a/src/pages/views/WatershedOneMap/modalPart/rainTz.vue +++ b/src/pages/views/WatershedOneMap/modalPart/rainTz.vue @@ -3,16 +3,15 @@
-
气象信息
- -

{{ item.WEA }}

-

{{ item.TIME ? item.TIME.substring(5, 10) : '--' }}

-

{{ item.TEM2 }}--{{ item.TEM1 }}

+ +

{{ item.DGD_WP12 }}

+

{{ item.startTime ? item.startTime.substring(5, 10) : '--' }}

+

{{ item.TMIN }}°C--{{ item.TMAX }}°C

-
+
@@ -92,7 +91,7 @@ import bus from '@/utils/util'; import yuliangImg from '@/assets/newImgs/layerIcon/rainStation_gis.png'; import { getWeatherImg, formatDate } from '@/utils/util'; - +import axios from 'axios'; export default { name: 'natureOne', components: { @@ -231,11 +230,24 @@ }; // 获取气象数据信息 const getWeather = async () => { - let res = await dayWeather(); - let arrs = res || []; - if (arrs.length > 4) { - allData.weatherArr = arrs.splice(0, 4); - } + allData.weatherArr = [] + axios + .get('http://219.140.167.85:9880/api/forecast/extraForecast/getHxh4DaysForecastData', { + headers: { + 'X-token': '2d39a382-0050-41f4-9fdc-3ee9f0dba0a8', + }, + params: {}, + }) + .then(function (res) { + if(res.data.data.length>0){ + res.data.data.forEach(item=>{ + if(item.areaName == '规划范围'){ + allData.weatherArr.push(item) + } + }) + } + + }); }; // 天气图标 function getNowImage(code) { diff --git a/src/pages/views/WatershedOneMap/newPart/rainTz.vue b/src/pages/views/WatershedOneMap/newPart/rainTz.vue index cdaf482..319d55f 100644 --- a/src/pages/views/WatershedOneMap/newPart/rainTz.vue +++ b/src/pages/views/WatershedOneMap/newPart/rainTz.vue @@ -6,10 +6,10 @@
气象信息
- -

{{ item.WEA }}

-

{{ item.TIME ? item.TIME.substring(5, 10) : '--' }}

-

{{ item.TEM2 }}--{{ item.TEM1 }}

+ +

{{ item.DGD_WP12 }}

+

{{ item.startTime ? item.startTime.substring(5, 10) : '--' }}

+

{{ item.TMIN }}°C--{{ item.TMAX }}°C

@@ -176,12 +176,31 @@ }; // 获取气象数据信息 const getWeather = async () => { - let res = await dayWeather(); - let arrs = res || []; - if (arrs.length > 4) { - allData.weatherArr = arrs.splice(0, 4); - } + // let res = await dayWeather(); + // let arrs = res || []; + // if (arrs.length > 4) { + // allData.weatherArr = arrs.splice(0, 4); + // } + allData.weatherArr = [] + axios + .get('http://219.140.167.85:9880/api/forecast/extraForecast/getHxh4DaysForecastData', { + headers: { + 'X-token': '2d39a382-0050-41f4-9fdc-3ee9f0dba0a8', + }, + params: {}, + }) + .then(function (res) { + if(res.data.data.length>0){ + res.data.data.forEach(item=>{ + if(item.areaName == '规划范围'){ + allData.weatherArr.push(item) + } + }) + } + + }); }; + // 天气图标 function getNowImage(code) { let image = '';