diff --git a/src/modules/14_KPI/components/detailList/01_Assessment.vue b/src/modules/14_KPI/components/detailList/01_Assessment.vue index 963388874..6f0111e78 100644 --- a/src/modules/14_KPI/components/detailList/01_Assessment.vue +++ b/src/modules/14_KPI/components/detailList/01_Assessment.vue @@ -54,7 +54,8 @@ function fetchListPlanned() { (sum: number, e: any) => sum + e.weight, 0 ); - totalResults1.value = (result * 60) / weight; + totalResults1.value = + (result * store.dataEvaluation.plannedPoint) / weight; } }) .catch((err) => { @@ -85,7 +86,8 @@ function fetchListRole() { (sum: number, e: any) => sum + e.weight, 0 ); - totalResults2.value = (result * 60) / weight; + totalResults2.value = + (result * store.dataEvaluation.rolePoint) / weight; } }) .catch((err) => { @@ -116,7 +118,8 @@ function fetchAssigned() { (sum: number, e: any) => sum + e.weight, 0 ); - totalResults3.value = (result * 20) / weight; + totalResults3.value = + (result * store.dataEvaluation.specialPoint) / weight; } }) .catch((err) => { @@ -198,7 +201,15 @@ onMounted(() => { -->
- สรุปผลการประเมินผลสัมฤทธิ์ของงาน (คะแนนเต็ม 80 คะแนน) + สรุปผลการประเมินผลสัมฤทธิ์ของงาน (คะแนนเต็ม + {{ + store.dataEvaluation.plannedPoint + + store.dataEvaluation.rolePoint + + store.dataEvaluation.specialPoint + }} + คะแนน)
{{ resultWork }}
diff --git a/src/modules/14_KPI/components/detailList/Topic/02_Competency.vue b/src/modules/14_KPI/components/detailList/Topic/02_Competency.vue index 52a22db76..6e101e4dd 100644 --- a/src/modules/14_KPI/components/detailList/Topic/02_Competency.vue +++ b/src/modules/14_KPI/components/detailList/Topic/02_Competency.vue @@ -152,7 +152,10 @@ function getData(type: string) { if (total > 0) { let weightAvg = weight / total; let resultAvg = result / total; - let sum = weightAvg != 0 ? (resultAvg / weightAvg) * 20 : 0; + let sum = + weightAvg != 0 + ? (resultAvg / weightAvg) * store.dataEvaluation.capacityPoint + : 0; resultEvaluation.value = sum.toFixed(2); } // end cal summary @@ -342,7 +345,10 @@ onMounted(() => { />
- สรุปผลการประเมินสมรรถนะ (คะแนนเต็ม 20 คะแนน) + สรุปผลการประเมินสมรรถนะ (คะแนนเต็ม + {{ store.dataEvaluation.capacityPoint }} คะแนน)
{{ resultEvaluation }}