diff --git a/src/api/screen/subScreen/subOneGlobal.ts b/src/api/screen/subScreen/subOneGlobal.ts index bdc1900..a99a2fd 100644 --- a/src/api/screen/subScreen/subOneGlobal.ts +++ b/src/api/screen/subScreen/subOneGlobal.ts @@ -28,9 +28,11 @@ export function getSubOneAllCount(body) { }); } -export function getSubOneGlobalMap(departId, times) { - return request.get({ - url: `/datav/sub1/getSubOneGlobalMap?departId=${departId}&beginTime=${times[0]}&endTime=${times[1]}` + +export function getSubOneGlobalMap(body) { + return request.post({ + url: `/datav/sub1/getSubOneGlobalMap`, + body }); } diff --git a/src/views/datav/subonedatav/SubOneGlobal.vue b/src/views/datav/subonedatav/SubOneGlobal.vue index c42b669..ab6e8d2 100644 --- a/src/views/datav/subonedatav/SubOneGlobal.vue +++ b/src/views/datav/subonedatav/SubOneGlobal.vue @@ -442,7 +442,7 @@ const getMapJSON = async (departId = currentDepartId) => { echarts.registerMap("changsha", res); subOneGlobalMap.value.chart.setOption(option.value); } -const getOrganizationProRankData = async (departId = currentDepartId, timeValue = time.value) => { +const getOrganizationProRankData = async () => { const body={ departId: currentDepartId, beginTime: time.value[0], @@ -456,7 +456,7 @@ const getBusinessRateData = async (departId = currentDepartId, timeValue = time. const res = await getSubOneBusinessRate(departId, timeValue); ywlxPieOption.value.series[0].data = res.ywzblist; } -const getAllGlobalCountData = async (departId = currentDepartId, timeValue = time.value) => { +const getAllGlobalCountData = async () => { const body={ departId: currentDepartId, beginTime: time.value[0], @@ -465,8 +465,13 @@ const getAllGlobalCountData = async (departId = currentDepartId, timeValue = tim const res = await getSubOneAllCount(body); overviewData.value = res.overview; } -const getSubOneGlobalMapIcon = async (departId = currentDepartId, timeValue = time.value) => { - const res = await getSubOneGlobalMap(departId, timeValue) +const getSubOneGlobalMapIcon = async () => { + const body={ + departId: currentDepartId, + beginTime: time.value[0], + endTime: time.value[1] + } + const res = await getSubOneGlobalMap(body) const mappedData = res.globalTempMapVoList.map(item => { return { ...item, @@ -509,10 +514,10 @@ const getData = () => { console.log(userStore) } console.log('currentDepartId',currentDepartId) - getOrganizationProRankData(currentDepartId, time.value); + getOrganizationProRankData(); getBusinessRateData(currentDepartId, time.value); - getAllGlobalCountData(currentDepartId, time.value); - getSubOneGlobalMapIcon(currentDepartId, time.value); + getAllGlobalCountData(); + getSubOneGlobalMapIcon(); getSubOneGlobalTrendData(currentDepartId, selectedYear.value); getSubOneStrongProblemRateData(currentDepartId, time.value); getSubOneProblemBusinessRateData(currentDepartId, time.value);