Browse Source

fix:优化大屏

master
pengwei 1 month ago
parent
commit
d9de5bb103
  1. 7
      src/views/datav/CaseVerif.vue
  2. 74
      src/views/datav/SceneInsp.vue
  3. 2
      src/views/datav/subonedatav/SubOneSceneInsp.vue

7
src/views/datav/CaseVerif.vue

@ -578,17 +578,16 @@ const getCaseSourceRateAndDealSituationData = async (timeValue) => {
// } // }
async function getData() { async function getData() {
Promise.all([
getCaseVerificationRankData(time.value), getCaseVerificationRankData(time.value),
// getCaseProblemPropertyData(time.value) // getCaseProblemPropertyData(time.value)
getCaseVerificationCountData(time.value), getCaseVerificationCountData(time.value),
getCaseVerificationMapData(time.value),
getCaseVerificationTrendData(selectedYear.value), getCaseVerificationTrendData(selectedYear.value),
getCaseSourceRateAndDealSituationData(time.value), getCaseSourceRateAndDealSituationData(time.value),
// getConfinementAndPauseData(time.value); // getConfinementAndPauseData(time.value);
getCaseTypeFun(time.value), getCaseTypeFun(time.value),
getConfinementBarFun(time.value) getConfinementBarFun(time.value),
]) getCaseVerificationMapData(time.value)
} }
// endregion // endregion

74
src/views/datav/SceneInsp.vue

@ -969,8 +969,12 @@ const getSupervisionNotifyCountData = async () => {
const data = await getSupervisionNotifyCount(time.value); const data = await getSupervisionNotifyCount(time.value);
overview.value = data overview.value = data
}; };
const getSupervisionNotifyMapData = async () => { const getSupervisionNotifyMapData = async () => {
const res = await getSupervisionNotifyMap(time.value); const res = await getSupervisionNotifyMap(time.value);
const mappedData = mapOrgNameMapping( const mappedData = mapOrgNameMapping(
res.superviseTempMapVoList, res.superviseTempMapVoList,
"totalPro" "totalPro"
@ -1030,15 +1034,13 @@ const getWorkDynamicsData = async () => {
}; };
const getData =async () => { const getData =async () => {
Promise.all([ getChangedRankData();
getChangedRankData(), getProblemTypeRateData();
getSupervisionNotifyMapData(), getSupervisionNotifyCountData();
getProblemTypeRateData(), getSupervisionTrendData();
getSupervisionNotifyCountData(), getYellowBetDrugData();
getSupervisionTrendData(), getWorkDynamicsData();
getYellowBetDrugData(), getSupervisionNotifyMapData()
getWorkDynamicsData()
])
}; };
// endregion // endregion
@ -1110,24 +1112,24 @@ const sceneInspTrendAnimation = () => {
}; };
sceneInspTrendIntervalId = setInterval(sceneInspTrendAnimation, 2000); sceneInspTrendIntervalId = setInterval(sceneInspTrendAnimation, 2000);
// //
const sceneInspZxdxRankAnimation = () => { // const sceneInspZxdxRankAnimation = () => {
if(dictData.value){ // if(dictData.value){
const dictItem = dictData.value.find( // const dictItem = dictData.value.find(
(item) => (item.dictValue === zxdcProRankTab.value) // (item) => (item.dictValue === zxdcProRankTab.value)
); // );
if (dictItem) { // if (dictItem != null) {
const index = dictData.value.indexOf(dictItem); // const index = dictData.value.indexOf(dictItem);
if (index === dictData.value.length - 1) { // if (index === dictData.value.length - 1) {
zxdcProRankTab.value = dictData[0]?.dictValue; // zxdcProRankTab.value = dictData[0]?.dictValue;
} else { // } else {
zxdcProRankTab.value = dictData[index + 1]?.dictValue; // zxdcProRankTab.value = dictData[index + 1]?.dictValue;
} // }
} // }
} // }
}; // };
onMounted(() => { onMounted(() => {
sceneInspZxdxIntervalId = setInterval(sceneInspZxdxRankAnimation, 5000); // sceneInspZxdxIntervalId = setInterval(sceneInspZxdxRankAnimation, 5000);
}); });
// //
@ -1154,7 +1156,7 @@ watch(time, () => {
getData(); getData();
}); });
onMounted(() => { onMounted(() => {
getData();
setupEventListeners(); setupEventListeners();
}); });
const handleCommand = (year) => { const handleCommand = (year) => {
@ -1185,7 +1187,7 @@ const setupEventListeners = () => {
sceneProblemTypeRateAnimationStop(); sceneProblemTypeRateAnimationStop();
sceneInspMapAnimationStop(); sceneInspMapAnimationStop();
SceneInspTrendAnimationStop(); SceneInspTrendAnimationStop();
sceneInspZxdxRankAnimationStop(); // sceneInspZxdxRankAnimationStop();
sceneWorkDynamicsAnimationStop(); sceneWorkDynamicsAnimationStop();
}; };
const sceneInspRcdxRankAnimationStop = () => { const sceneInspRcdxRankAnimationStop = () => {
@ -1255,15 +1257,15 @@ const SceneInspTrendAnimationStop = () => {
sceneInspTrendIntervalId = setInterval(sceneInspTrendAnimation, 2000); sceneInspTrendIntervalId = setInterval(sceneInspTrendAnimation, 2000);
}); });
}; };
const sceneInspZxdxRankAnimationStop = () => { // const sceneInspZxdxRankAnimationStop = () => {
const temp = sceneInspZxdcProRankTabs.value?.$el; // const temp = sceneInspZxdcProRankTabs.value?.$el;
temp.addEventListener("mouseenter", () => { // temp.addEventListener("mouseenter", () => {
clearInterval(sceneInspZxdxIntervalId); // clearInterval(sceneInspZxdxIntervalId);
}); // });
temp.addEventListener("mouseleave", () => { // temp.addEventListener("mouseleave", () => {
clearInterval(sceneInspZxdxIntervalId); // clearInterval(sceneInspZxdxIntervalId);
}); // });
}; // };
const sceneWorkDynamicsAnimationStop = () => { const sceneWorkDynamicsAnimationStop = () => {
const temp = sceneScrollbar.value?.$el; const temp = sceneScrollbar.value?.$el;
temp.addEventListener("mouseenter", () => { temp.addEventListener("mouseenter", () => {

2
src/views/datav/subonedatav/SubOneSceneInsp.vue

@ -355,7 +355,7 @@
<el-table-column prop="reportName" label="督察报告名称"></el-table-column> <el-table-column prop="reportName" label="督察报告名称"></el-table-column>
<el-table-column prop="crtTime" label="创建时间" > <el-table-column prop="crtTime" label="创建时间" >
<template #default="{row}"> <template #default="{row}">
{{ timeFormat(row.crtTime) }} {{row.crtTime }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="superviseNumber" label="督察问题数"> <el-table-column prop="superviseNumber" label="督察问题数">

Loading…
Cancel
Save