From 7ec6ff7be02f31991e93b5ffd8033661926f390e Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 25 Apr 2024 15:49:45 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=9C=E0=B8=A5=E0=B8=AA=E0=B8=B1=E0=B8=A1?=
 =?UTF-8?q?=E0=B8=A4=E0=B8=97=E0=B8=98=E0=B8=B4=E0=B9=8C=E0=B8=82=E0=B8=AD?=
 =?UTF-8?q?=E0=B8=87=E0=B8=87=E0=B8=B2=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/08_KPI/components/Tab/01_Assessment.vue        | 4 +++-
 .../08_KPI/components/Tab/DialogEvaluate/01_Indicator.vue  | 7 +++----
 src/modules/08_KPI/components/Tab/Topic/01_Indicator.vue   | 3 +++
 3 files changed, 9 insertions(+), 5 deletions(-)

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);
 }
 </script>
 <template>
   <q-dialog v-model="modal" persistent>
     <q-card style="width: 1200px; max-width: 80vw">
-      <DialogHeader :tittle="'ประเมิน'" :close="closeDialog" />
+      <DialogHeader :tittle="'ประเมินผลสัมฤทธิ์ของงาน'" :close="closeDialog" />
 
       <q-separator />
-      <q-card-section>
+      <q-card-section style="height: 80vh">
         <div class="col-12 q-pa-sm">
           <q-table
             ref="table"
@@ -213,7 +212,7 @@ function onSubmit() {
                     </q-rating>
                   </div>
                   <div v-else-if="col.name === 'achievement'">
-                    {{ props.row.achievement }}
+                    {{ props.row.point ? `ระดับ ${props.row.point}` : "" }}
                   </div>
                   <div v-else-if="col.name === 'evaluationResults'">
                     {{
diff --git a/src/modules/08_KPI/components/Tab/Topic/01_Indicator.vue b/src/modules/08_KPI/components/Tab/Topic/01_Indicator.vue
index d129ba8..6b26786 100644
--- a/src/modules/08_KPI/components/Tab/Topic/01_Indicator.vue
+++ b/src/modules/08_KPI/components/Tab/Topic/01_Indicator.vue
@@ -272,6 +272,9 @@ watch(
                   </template>
                 </q-rating>
               </div>
+              <div v-else-if="col.name === 'achievement'">
+                {{ props.row.point ? `ระดับ ${props.row.point}` : "" }}
+              </div>
               <div v-else-if="col.name === 'evaluationResults'">
                 {{
                   parseFloat(