diff --git a/src/views/dataV/pageFive/index.vue b/src/views/dataV/pageFive/index.vue index 8a57dde..72edc99 100644 --- a/src/views/dataV/pageFive/index.vue +++ b/src/views/dataV/pageFive/index.vue @@ -97,6 +97,30 @@ export default { this.dataType = type; }, }, + mounted() { + // setTimeout(() => { + // window.AMap.plugin('AMap.Weather', () => { + // const weather = new AMap.Weather(); + // weather.getLive('成都市', (err, data) => { + // if (!err) { + // daily.value = Object.assign(data, { icon: iconFc(data.weather) }); + // } + // }); + // console.log('weather', weather); + // weather.getForecast('成都市', (err, data) => { + // if (!err) { + // for (let i = 1; i < data.forecasts.length; i++) { + // let obj; + // obj.temp = [data.forecasts[i].dayTemp, data.forecasts[i].nightTemp].sort((a, b) => a - b); + // obj.icon = iconFc(data.forecasts[i].dayWeather); + // obj.date = data.forecasts[i].date; + // console.log('weatherDatas', obj); + // } + // } + // }); + // }); + // }, 3000); + }, }; diff --git a/src/views/dataV/pageFive/tracemap.vue b/src/views/dataV/pageFive/tracemap.vue index f6b4f89..f6a24ff 100644 --- a/src/views/dataV/pageFive/tracemap.vue +++ b/src/views/dataV/pageFive/tracemap.vue @@ -18,7 +18,7 @@ export default { 河北: [114.511072, 38.054693], }, chinaDatas: [ - [{ name: '云南' }], + [{ name: '云南', value: 382 }], [{ name: '广东', value: 62256 }], [{ name: '香港', value: 9256 }], [{ name: '四川', value: 1256 }], @@ -197,6 +197,7 @@ export default { transitionDuration: 0, extraCssText: 'z-index:100', formatter: function (params, ticket, callback) { + console.log('params', params); let val = 0; if (typeof params.value == 'number') { val = params.value; @@ -206,6 +207,7 @@ export default { //根据业务自己拓展要显示的内容 var res = ''; var name = params.name; + res = "" + name + '
数据:' + val; return res; }, diff --git a/src/views/dataV/pageTwo/index.vue b/src/views/dataV/pageTwo/index.vue index 9f3f50f..1e2eb70 100644 --- a/src/views/dataV/pageTwo/index.vue +++ b/src/views/dataV/pageTwo/index.vue @@ -44,7 +44,7 @@ export default { data() { return { bg: require('../img/bg.png'), - title: ['农民人均可收入', '投入总额', '带动农民就业', '科技支撑', '投入品占比'], + title: ['农民人均可收入', '投入总额', '带动农民就业', '农机管理', '投入品占比'], }; }, methods: {},