diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScoreAdd.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScoreAdd.vue index f23acb0e1..fc66cbd80 100644 --- a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScoreAdd.vue +++ b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScoreAdd.vue @@ -155,6 +155,29 @@ const achievement_result: any = computed(() => { } return 0; }); + +const score1Per60 = computed(() => { + if ( + etc.value === true && + achievement_other.value.text !== undefined && + achievement_other.value.level !== undefined + ) { + return ( + ((learn_level.value + + apply_level.value + + success_level.value + + achievement_other.value.level) / + achievement_score_total.value) * + 60 + ); + } + return ( + ((learn_level.value + apply_level.value + success_level.value) / + achievement_score_total.value) * + 60 + ); +}); + const score2 = computed(() => { let sum_conduct = conduct_level.value.reduce( (sum: number, level: number) => sum + level, @@ -1010,7 +1033,7 @@ watch(lengthdiscipline_level, (newLength) => { - {{ score1 }} + {{ score1Per60 }} {{ percent_score1 }} @@ -1080,7 +1103,9 @@ watch(lengthdiscipline_level, (newLength) => { - {{ score1 + score2 }} + + {{ (score1Per60 + score2) / 2 }} + {{ percent_sum }} @@ -1159,7 +1184,7 @@ watch(lengthdiscipline_level, (newLength) => { dense type="number" v-model="self_learning_percent" - :rules="[(val:number) => val <= 100 || 'ร้อยละต้องไม่เกิน 100']" + :rules="[(val:number) => val <= 100 || 'ร้อยละต้องไม่เกิน 100']" hide-bottom-space /> @@ -1183,7 +1208,7 @@ watch(lengthdiscipline_level, (newLength) => { dense type="number" v-model="training_seminar_percent" - :rules="[(val:number) => val <= 100 || 'ร้อยละต้องไม่เกิน 100']" + :rules="[(val:number) => val <= 100 || 'ร้อยละต้องไม่เกิน 100']" hide-bottom-space />