diff --git a/src/api/home.js b/src/api/home.js index 1f8f17e..fad46b0 100644 --- a/src/api/home.js +++ b/src/api/home.js @@ -42,3 +42,13 @@ export function nowKongqi (id) { // params }) } + + + +export function getWeather (params) { + return request({ + url: '/api/resi/partymember/yifengScreen/getWeather', + method: 'GET', + params + }) +} diff --git a/src/views/next/screen-content-left/zdyf-left/index.vue b/src/views/next/screen-content-left/zdyf-left/index.vue index 96b93f1..0dd7b2e 100644 --- a/src/views/next/screen-content-left/zdyf-left/index.vue +++ b/src/views/next/screen-content-left/zdyf-left/index.vue @@ -81,7 +81,7 @@
产业链融合
-
5.2 亿元
+
6 亿元
种子年销售额
@@ -132,20 +132,20 @@
{{ - item.jzrPrice != "暂无" + item.jzrPrice.toFixed(2) != "0.00" ? item.jzrPrice.toFixed(2) - : "暂无" + : "-" }}
{ if ((index + 1) % 2 === 0) { - const num = (arr[index - 1].AvgPrice + item.AvgPrice) / 2 + const num = item.AvgPrice data.push({ ...item, price: num }) } }) @@ -294,7 +294,7 @@ export default { prcCollectionListForGov({ ...this.params, ...data }).then((res) => { if (res.priceslist.length > 0) { this.dayList = res.priceslist.filter(item => item.CategoryName == '蔬菜') - // console.log(this.dayList) + console.log(this.dayList) this.getDayScTData() } else { this.times = this.$moment(this.times) @@ -345,7 +345,7 @@ export default { } else { return { ...item, - jzrPrice: '暂无' + jzrPrice: '0.00' } } }) diff --git a/src/views/next/screen-content-right/home-right/index.vue b/src/views/next/screen-content-right/home-right/index.vue index 890c265..492349b 100644 --- a/src/views/next/screen-content-right/home-right/index.vue +++ b/src/views/next/screen-content-right/home-right/index.vue @@ -8,7 +8,7 @@
-
12° 空气温度
+
{{ weatherData.ambientTemperature }}℃ 空气温度
-
12° 空气湿度
+
{{ weatherData.ambientHumidity }}% 空气湿度
@@ -76,15 +76,17 @@