From d9de5bb10374df685bdc6c5d47d49b4985ffd141 Mon Sep 17 00:00:00 2001 From: pengwei Date: Sun, 26 Oct 2025 16:19:58 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BC=98=E5=8C=96=E5=A4=A7=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/datav/CaseVerif.vue | 21 +++--- src/views/datav/Lmgz.vue | 2 +- src/views/datav/SceneInsp.vue | 74 ++++++++++--------- .../datav/subonedatav/SubOneSceneInsp.vue | 2 +- 4 files changed, 50 insertions(+), 49 deletions(-) diff --git a/src/views/datav/CaseVerif.vue b/src/views/datav/CaseVerif.vue index 3ad01ca..058bce2 100644 --- a/src/views/datav/CaseVerif.vue +++ b/src/views/datav/CaseVerif.vue @@ -578,17 +578,16 @@ const getCaseSourceRateAndDealSituationData = async (timeValue) => { // } async function getData() { - Promise.all([ - getCaseVerificationRankData(time.value), - // getCaseProblemPropertyData(time.value) - getCaseVerificationCountData(time.value), - getCaseVerificationMapData(time.value), - getCaseVerificationTrendData(selectedYear.value), - getCaseSourceRateAndDealSituationData(time.value), - // getConfinementAndPauseData(time.value); - getCaseTypeFun(time.value), - getConfinementBarFun(time.value) - ]) + getCaseVerificationRankData(time.value), + // getCaseProblemPropertyData(time.value) + getCaseVerificationCountData(time.value), + getCaseVerificationTrendData(selectedYear.value), + getCaseSourceRateAndDealSituationData(time.value), + // getConfinementAndPauseData(time.value); + getCaseTypeFun(time.value), + getConfinementBarFun(time.value), + getCaseVerificationMapData(time.value) + } // endregion diff --git a/src/views/datav/Lmgz.vue b/src/views/datav/Lmgz.vue index 9e97039..dab6bb3 100644 --- a/src/views/datav/Lmgz.vue +++ b/src/views/datav/Lmgz.vue @@ -425,7 +425,7 @@ watch(time, () => { onMounted(() => { Promise.all([ - getTotalData(),//数量统计 /total/statistics + getTotalData(),//数量统计 /total/statistics getAreaRiskData(selectedMetric.value),// 【分县市局 高业务量】 getAreaNegativeData(selectedMetric.value),// 分县 /area/negative/statistics 【分县市局 中业务量】 getAreaRateData(selectedMetric.value),// /area/rate/statistics 【分县市局 低业务量】 diff --git a/src/views/datav/SceneInsp.vue b/src/views/datav/SceneInsp.vue index 9970401..576897c 100644 --- a/src/views/datav/SceneInsp.vue +++ b/src/views/datav/SceneInsp.vue @@ -969,8 +969,12 @@ const getSupervisionNotifyCountData = async () => { const data = await getSupervisionNotifyCount(time.value); overview.value = data }; + + const getSupervisionNotifyMapData = async () => { + const res = await getSupervisionNotifyMap(time.value); + const mappedData = mapOrgNameMapping( res.superviseTempMapVoList, "totalPro" @@ -1030,15 +1034,13 @@ const getWorkDynamicsData = async () => { }; const getData =async () => { - Promise.all([ - getChangedRankData(), - getSupervisionNotifyMapData(), - getProblemTypeRateData(), - getSupervisionNotifyCountData(), - getSupervisionTrendData(), - getYellowBetDrugData(), - getWorkDynamicsData() - ]) + getChangedRankData(); + getProblemTypeRateData(); + getSupervisionNotifyCountData(); + getSupervisionTrendData(); + getYellowBetDrugData(); + getWorkDynamicsData(); + getSupervisionNotifyMapData() }; // endregion @@ -1110,24 +1112,24 @@ const sceneInspTrendAnimation = () => { }; sceneInspTrendIntervalId = setInterval(sceneInspTrendAnimation, 2000); // 专项督察问题排行动画 -const sceneInspZxdxRankAnimation = () => { - if(dictData.value){ - const dictItem = dictData.value.find( - (item) => (item.dictValue === zxdcProRankTab.value) - ); - if (dictItem) { - const index = dictData.value.indexOf(dictItem); - if (index === dictData.value.length - 1) { - zxdcProRankTab.value = dictData[0]?.dictValue; - } else { - zxdcProRankTab.value = dictData[index + 1]?.dictValue; - } - } - } -}; +// const sceneInspZxdxRankAnimation = () => { +// if(dictData.value){ +// const dictItem = dictData.value.find( +// (item) => (item.dictValue === zxdcProRankTab.value) +// ); +// if (dictItem != null) { +// const index = dictData.value.indexOf(dictItem); +// if (index === dictData.value.length - 1) { +// zxdcProRankTab.value = dictData[0]?.dictValue; +// } else { +// zxdcProRankTab.value = dictData[index + 1]?.dictValue; +// } +// } +// } +// }; onMounted(() => { - sceneInspZxdxIntervalId = setInterval(sceneInspZxdxRankAnimation, 5000); + // sceneInspZxdxIntervalId = setInterval(sceneInspZxdxRankAnimation, 5000); }); // 工作动态动画 @@ -1154,7 +1156,7 @@ watch(time, () => { getData(); }); onMounted(() => { - getData(); + setupEventListeners(); }); const handleCommand = (year) => { @@ -1185,7 +1187,7 @@ const setupEventListeners = () => { sceneProblemTypeRateAnimationStop(); sceneInspMapAnimationStop(); SceneInspTrendAnimationStop(); - sceneInspZxdxRankAnimationStop(); + // sceneInspZxdxRankAnimationStop(); sceneWorkDynamicsAnimationStop(); }; const sceneInspRcdxRankAnimationStop = () => { @@ -1255,15 +1257,15 @@ const SceneInspTrendAnimationStop = () => { sceneInspTrendIntervalId = setInterval(sceneInspTrendAnimation, 2000); }); }; -const sceneInspZxdxRankAnimationStop = () => { - const temp = sceneInspZxdcProRankTabs.value?.$el; - temp.addEventListener("mouseenter", () => { - clearInterval(sceneInspZxdxIntervalId); - }); - temp.addEventListener("mouseleave", () => { - clearInterval(sceneInspZxdxIntervalId); - }); -}; +// const sceneInspZxdxRankAnimationStop = () => { +// const temp = sceneInspZxdcProRankTabs.value?.$el; +// temp.addEventListener("mouseenter", () => { +// clearInterval(sceneInspZxdxIntervalId); +// }); +// temp.addEventListener("mouseleave", () => { +// clearInterval(sceneInspZxdxIntervalId); +// }); +// }; const sceneWorkDynamicsAnimationStop = () => { const temp = sceneScrollbar.value?.$el; temp.addEventListener("mouseenter", () => { diff --git a/src/views/datav/subonedatav/SubOneSceneInsp.vue b/src/views/datav/subonedatav/SubOneSceneInsp.vue index 6d9c476..ca070f6 100644 --- a/src/views/datav/subonedatav/SubOneSceneInsp.vue +++ b/src/views/datav/subonedatav/SubOneSceneInsp.vue @@ -355,7 +355,7 @@