diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScore.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScore.vue index 16a32d20b..07e8a2409 100644 --- a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScore.vue +++ b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScore.vue @@ -228,7 +228,7 @@ const score5 = computed(() => { Number(other_training_percent.value)) / (isSelectionPartfour.value ? 4 : 3); - const total = Math.round(rawTotal); + const total = Math.trunc(rawTotal); develop_result.value = total > 60 ? 1 : 0; diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScoreAdd.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScoreAdd.vue index 79c0be03c..16df6dfc5 100644 --- a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScoreAdd.vue +++ b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScoreAdd.vue @@ -255,7 +255,7 @@ const score5 = computed(() => { Number(other_training_percent.value)) / (isSelectionPartfour.value ? 4 : 3); - const total = Math.round(rawTotal); + const total = Math.trunc(rawTotal); develop_result.value = total > 60 ? 1 : 0; diff --git a/src/stores/mixin.ts b/src/stores/mixin.ts index 40ea41b3c..8ef179cf0 100644 --- a/src/stores/mixin.ts +++ b/src/stores/mixin.ts @@ -362,13 +362,21 @@ export const useCounterMixin = defineStore("mixin", () => { const messageError = (q: any, e: any = "", msg: string = "") => { if (e.response !== undefined) { if (e.response.data.status !== undefined) { - if (e.response.data.status == 401) { + if ( + e.response.data.status == 401 || + (e.response.data.status == 404 && + e.response.data.message == "ไม่พบข้อมูลสิทธิ์") + ) { //invalid_token + const msg = + e.response.data.status == 401 + ? "ล็อกอินหมดอายุ กรุณาล็อกอินใหม่อีกครั้ง" + : e.response.data.message; q.dialog({ component: CustomComponent, componentProps: { title: `พบข้อผิดพลาด`, - message: `ล็อกอินหมดอายุ กรุณาล็อกอินใหม่อีกครั้ง`, + message: msg, icon: "warning", color: "red", onlycancel: true,