From 3947b901fa228eee36211f75a151f940459fde18 Mon Sep 17 00:00:00 2001 From: setthawutttty Date: Wed, 18 Dec 2024 17:23:39 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=80=E0=B9=80?= =?UTF-8?q?=E0=B8=AA=E0=B8=94=E0=B8=87=E0=B8=9C=E0=B8=A5=20=E0=B8=9C?= =?UTF-8?q?=E0=B8=A5=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=9B=E0=B8=A3=E0=B8=B0?= =?UTF-8?q?=E0=B9=80=E0=B8=A1=E0=B8=B4=E0=B8=99=E0=B8=81=E0=B8=B2=E0=B8=A3?= =?UTF-8?q?=E0=B8=9B=E0=B8=8F=E0=B8=B4=E0=B8=9A=E0=B8=B1=E0=B8=95=E0=B8=B4?= =?UTF-8?q?=E0=B8=A3=E0=B8=B2=E0=B8=8A=E0=B8=81=E0=B8=B2=E0=B8=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../04_Achievement/05_Assessments.vue | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/src/modules/10_registry/04_Achievement/05_Assessments.vue b/src/modules/10_registry/04_Achievement/05_Assessments.vue index 436ba5a..2e805f8 100644 --- a/src/modules/10_registry/04_Achievement/05_Assessments.vue +++ b/src/modules/10_registry/04_Achievement/05_Assessments.vue @@ -23,7 +23,8 @@ const rowsHistoryData = ref([]); const $q = useQuasar(); const mode = ref($q.screen.gt.xs); const mixin = useCounterMixin(); -const { showLoader, hideLoader, messageError, date2Thai,onSearchDataTable } = mixin; +const { showLoader, hideLoader, messageError, date2Thai, onSearchDataTable } = + mixin; const modalHistory = ref(false); /** ตัวแปรข้อมูล */ @@ -325,21 +326,21 @@ function getHistory() { function textRangePoint(val: number | undefined) { if (val == undefined) val = -1; - if (val >= 0 && val <= 60) return "(ต่ำกว่าร้อยละ 60)"; - if (val >= 60 && val <= 69) return "(ร้อยละ 60 – 69)"; - if (val >= 70 && val <= 79) return "(ร้อยละ 70 – 79)"; - if (val >= 80 && val <= 89) return "(ร้อยละ 80 – 89)"; - if (val >= 90 && val <= 100) return "(ร้อยละ 90 - 100)"; + if (val < 60.0) return "(คะแนนต่ำกว่าร้อยละ 60.00)"; + if (val >= 60.0 && val <= 69.99) return "(คะแนนร้อยละ 60.00 - 69.99)"; + if (val >= 70.0 && val <= 79.99) return "(คะแนนร้อยละ 70.00 - 79.99)"; + if (val >= 80.0 && val <= 89.99) return " (คะแนนร้อยละ 80.00 - 89.99)"; + if (val >= 90.0) return " (คะแนนร้อยละ 90.00 ขึ้นไป)"; else return ""; } function textPoint(val: number | undefined) { if (val == undefined) val = -1; - if (val >= 0 && val <= 60) return "ต้องปรับปรุง"; - if (val >= 60 && val <= 69) return "พอใช้"; - if (val >= 70 && val <= 79) return "ดี"; - if (val >= 80 && val <= 89) return "ดีมาก"; - if (val >= 90 && val <= 100) return "ดีเด่น"; + if (val < 60.0) return "ต้องปรับปรุง"; + if (val >= 60.0 && val <= 69.99) return "พอใช้"; + if (val >= 70.0 && val <= 79.99) return "ดี"; + if (val >= 80.0 && val <= 89.99) return "ดีมาก"; + if (val >= 90.0) return "ดีเด่น"; else return "-"; }