diff --git a/src/modules/14_KPI/components/Tab/01_Assessment.vue b/src/modules/14_KPI/components/Tab/01_Assessment.vue index eadefe048..e781b33ed 100644 --- a/src/modules/14_KPI/components/Tab/01_Assessment.vue +++ b/src/modules/14_KPI/components/Tab/01_Assessment.vue @@ -207,15 +207,13 @@ watch( onMounted(async () => { showLoader(); - await Promise.all([ + Promise.all([ getCriteria(), - fetchListPlanned(), - fetchListRole(), - fetchAssigned(), + await fetchListPlanned(), + await fetchListRole(), + await fetchAssigned(), ]).finally(() => { - setTimeout(() => { - hideLoader(); - }, 1000); + hideLoader(); }); }); diff --git a/src/modules/14_KPI/views/detailView.vue b/src/modules/14_KPI/views/detailView.vue index 8e1e10b00..58430ec81 100644 --- a/src/modules/14_KPI/views/detailView.vue +++ b/src/modules/14_KPI/views/detailView.vue @@ -178,6 +178,7 @@ function onSubmit() { } async function getOrgOp() { + showLoader() await http .get(config.API.Kpiorg + `/${store.dataProfile.profileId}`) .then((res) => { @@ -213,6 +214,7 @@ async function getOrgOp() { name: `${i.prefix}${i.firstName} ${i.lastName}`, })) .find((i: any) => i.id == store.dataEvaluation.commanderHighId); + hideLoader() }) .catch((e) => { messageError($q, e);