diff --git a/src/modules/08_KPI/components/Tab/01_Assessment.vue b/src/modules/08_KPI/components/Tab/01_Assessment.vue index e6d64e0..d327afc 100644 --- a/src/modules/08_KPI/components/Tab/01_Assessment.vue +++ b/src/modules/08_KPI/components/Tab/01_Assessment.vue @@ -47,6 +47,7 @@ function fetchListPlanned() { (sum: number, e: any) => sum + e.evaluationResults, 0 ); + totalResults1.value = (result * 80) / 100; }) .catch((err) => { @@ -98,6 +99,7 @@ function fetchAssigned() { (sum: number, e: any) => sum + e.evaluationResults, 0 ); + totalResults3.value = (result * 80) / 100; }) .catch((err) => { @@ -113,7 +115,7 @@ function onInfo() { } const resultWork = computed(() => { const total = totalResults1.value + totalResults2.value + totalResults3.value; - return parseFloat(((total * 80) / 100).toFixed(2)); + return parseFloat(((total * 80) ).toFixed(2)); }); onMounted(() => { diff --git a/src/modules/08_KPI/components/Tab/DialogEvaluate/01_Indicator.vue b/src/modules/08_KPI/components/Tab/DialogEvaluate/01_Indicator.vue index 6c1dcac..16133de 100644 --- a/src/modules/08_KPI/components/Tab/DialogEvaluate/01_Indicator.vue +++ b/src/modules/08_KPI/components/Tab/DialogEvaluate/01_Indicator.vue @@ -148,16 +148,15 @@ function onSubmit() { closeDialog(); } }); - console.log(rows.value); } +
+ {{ props.row.point ? `ระดับ ${props.row.point}` : "" }} +
{{ parseFloat(