diff --git a/src/api/home.js b/src/api/home.js new file mode 100644 index 0000000..0e02be0 --- /dev/null +++ b/src/api/home.js @@ -0,0 +1,36 @@ +import request from 'utils/request' + +// 党组织数量 +export function selectConfigList (params) { + return request({ + url: '/api/resi/partymember/yifengScreen/selectConfigList', + method: 'GET', + params + }) +} + +// 天气 +export function lookup (params) { + return request({ + url: 'https://geoapi.qweather.com/v2/city/lookup?location=即墨&key=274d6db86c074fdfa52b8e294bbc42e0', + method: 'GET', + params + }) +} + +// 天气 +export function nowTianqi (id) { + return request({ + url: `https://devapi.qweather.com/v7/weather/3d?location=${id}&key=274d6db86c074fdfa52b8e294bbc42e0`, + method: 'GET' + // params + }) +} +// 空气质量 +export function nowKongqi (id) { + return request({ + url: `https://devapi.qweather.com/v7/air/now?location=${id}&key=274d6db86c074fdfa52b8e294bbc42e0`, + method: 'GET' + // params + }) +} diff --git a/src/components/screen-map-header/index.vue b/src/components/screen-map-header/index.vue index bd5d0fd..b297917 100644 --- a/src/components/screen-map-header/index.vue +++ b/src/components/screen-map-header/index.vue @@ -1,73 +1,76 @@ - - - - {{ item.name }} - - {{ item.num }} - {{item.units }} - - - + + + + {{ item.name }} + + {{ + item.num + }} + {{ + item.units + }} + + + \ No newline at end of file + diff --git a/src/views/next/dialog-module/hsyf-left/partyCommittee/dangyuan.vue b/src/views/next/dialog-module/hsyf-left/partyCommittee/dangyuan.vue index 696275f..4c303f9 100644 --- a/src/views/next/dialog-module/hsyf-left/partyCommittee/dangyuan.vue +++ b/src/views/next/dialog-module/hsyf-left/partyCommittee/dangyuan.vue @@ -183,10 +183,10 @@ export default { data: [ // "20岁以下", '18-30岁', - '30-40岁', - '40-50岁', - '50-60岁', - '60-70岁', + '31-40岁', + '41-50岁', + '51-60岁', + '61-70岁', '70岁以上' ], axisorgName: { diff --git a/src/views/next/dialog-module/hsyf-left/partyCommittee/zirancun.vue b/src/views/next/dialog-module/hsyf-left/partyCommittee/zirancun.vue index 757c122..aa05803 100644 --- a/src/views/next/dialog-module/hsyf-left/partyCommittee/zirancun.vue +++ b/src/views/next/dialog-module/hsyf-left/partyCommittee/zirancun.vue @@ -61,7 +61,7 @@ export default { name: '', data () { return { - dialogTitle: '移风店镇自然村党委班子成员', + dialogTitle: '移风店镇自然村党组织成员', loading: false, dataList: [ { @@ -2083,7 +2083,7 @@ export default { color: #fbe9c5; width: 640px; &_item { - width: 25%; + width: 200px; line-height: 48px; padding-left: 24px; border-bottom: 1px solid #bb7053; diff --git a/src/views/next/layout/screen-header.vue b/src/views/next/layout/screen-header.vue index 60953a9..6f2bfee 100644 --- a/src/views/next/layout/screen-header.vue +++ b/src/views/next/layout/screen-header.vue @@ -22,16 +22,17 @@ - 多云 - -1~7°C - 北风3~4级 - PM2.5 + {{ tqInfo.textDay }} + {{ tqInfo.tempMin }}-{{ tqInfo.tempMax }}℃ + {{ tqInfo.windDirDay }} {{ tqInfo.windScaleDay }}级 + PM2.5: {{ tqInfo.pm2p5 }}