Merge branch 'develop' into working
# Conflicts: # src/modules/01_exam/components/ExamCard.vue
This commit is contained in:
Kittapath
commit
b1ec7ed575
1 changed files with 120 additions and 117 deletions
|
|
@ -7,108 +7,118 @@
|
||||||
<q-tooltip>พิมพ์บัตรประจำตัวผู้สอบ</q-tooltip>
|
<q-tooltip>พิมพ์บัตรประจำตัวผู้สอบ</q-tooltip>
|
||||||
</q-btn>
|
</q-btn>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-8 q-pa-md">
|
<div class="col-12 row q-pa-md">
|
||||||
<div class="q-pt-xs row">
|
<div class="col-xs-12 col-sm-8">
|
||||||
<div class="">ชื่อ :</div>
|
<div class="q-pt-xs row">
|
||||||
<div class="text-black text-bold q-pl-sm">{{ fullName }}</div>
|
<div class="">ชื่อ :</div>
|
||||||
</div>
|
<div class="text-black text-bold q-pl-sm">{{ fullName }}</div>
|
||||||
<div class="q-pt-xs row">
|
</div>
|
||||||
<div class="">เลขประจำตัวประชาชน :</div>
|
<div class="q-pt-xs row">
|
||||||
<div class="text-black text-bold q-pl-sm">{{ citizenId }}</div>
|
<div class="">เลขประจำตัวประชาชน :</div>
|
||||||
</div>
|
<div class="text-black text-bold q-pl-sm">{{ citizenId }}</div>
|
||||||
<div class="q-pt-xs row">
|
</div>
|
||||||
<div class="">เลขประจำตัวสอบ :</div>
|
<div class="q-pt-xs row">
|
||||||
<div class="text-black text-bold q-pl-sm">{{ examNumber }}</div>
|
<div class="">เลขประจำตัวสอบ :</div>
|
||||||
</div>
|
<div class="text-black text-bold q-pl-sm">{{ examNumber }}</div>
|
||||||
<div class="q-pt-xs row">
|
</div>
|
||||||
<div class="">เลขที่นั่งสอบ :</div>
|
<div class="q-pt-xs row">
|
||||||
<div class="text-black text-bold q-pl-sm">{{ examSeat }}</div>
|
<div class="">เลขที่นั่งสอบ :</div>
|
||||||
</div>
|
<div class="text-black text-bold q-pl-sm">{{ examSeat }}</div>
|
||||||
<div class="row">
|
</div>
|
||||||
<div class="">วันสอบ :</div>
|
<div class="row">
|
||||||
<div class="text-black text-bold q-pl-sm">05 มิ.ย. 2566</div>
|
<div class="">วันสอบ :</div>
|
||||||
</div>
|
<div class="text-black text-bold q-pl-sm">25 มิ.ย. 2568</div>
|
||||||
<div class="row">
|
</div>
|
||||||
<div class="">ครั้งที่สอบ :</div>
|
<div class="row">
|
||||||
<div class="text-black text-bold q-pl-sm">1</div>
|
<div class="">ครั้งที่สอบ :</div>
|
||||||
</div>
|
<div class="text-black text-bold q-pl-sm">1</div>
|
||||||
<div class="row">
|
</div>
|
||||||
<div class="">ชุดข้อสอบ :</div>
|
<div class="row">
|
||||||
<div class="text-black text-bold q-pl-sm">0506-1/2566</div>
|
<div class="">ชุดข้อสอบ :</div>
|
||||||
</div>
|
<div class="text-black text-bold q-pl-sm">ทดสอบ</div>
|
||||||
<div class="q-pt-xs row">
|
|
||||||
<div class="col-12 text-weight-bold">ผลคะแนนสอบ</div>
|
|
||||||
<div class="row items-center q-gutter-y-sm col-12">
|
|
||||||
<div class="col-xs-4 col-sm-5 text-weight-medium text-grey-7">ประเภท</div>
|
|
||||||
<div class="col-xs-3 col-sm-2 text-primary text-weight-bold">คะแนนเต็ม</div>
|
|
||||||
<div class="col-xs-3 col-sm-2 text-primary text-weight-bold">คะแนนที่ได้</div>
|
|
||||||
<div class="col-xs-2 col-sm-2 text-primary text-weight-bold"></div>
|
|
||||||
|
|
||||||
<div class="col-xs-4 col-sm-5 text-grey-7">ภาค ข</div>
|
|
||||||
<div class="col-xs-3 col-sm-2 q-pr-xs">
|
|
||||||
{{ scoreBFull }}
|
|
||||||
</div>
|
|
||||||
<div class="col-xs-3 col-sm-2 q-pr-xs">
|
|
||||||
{{ scoreB }}
|
|
||||||
</div>
|
|
||||||
<div class="col-xs-2 col-sm-2 q-pr-xs text-grey-7">คะแนน</div>
|
|
||||||
|
|
||||||
<div class="col-xs-4 col-sm-5 text-grey-7">ภาค ค</div>
|
|
||||||
<div class="col-xs-3 col-sm-2 q-pr-xs">
|
|
||||||
{{ scoreCFull }}
|
|
||||||
</div>
|
|
||||||
<div class="col-xs-3 col-sm-2 q-pr-xs">
|
|
||||||
{{ scoreC }}
|
|
||||||
</div>
|
|
||||||
<div class="col-xs-2 col-sm-2 q-pr-xs text-grey-7">คะแนน</div>
|
|
||||||
|
|
||||||
<div class="col-xs-4 col-sm-5 text-grey-7">รวมทั้งหมด</div>
|
|
||||||
<div class="col-xs-3 col-sm-2 q-pr-xs">
|
|
||||||
{{ scoreSumFull }}
|
|
||||||
</div>
|
|
||||||
<div class="col-xs-3 col-sm-2 q-pr-xs">
|
|
||||||
{{ scoreSum }}
|
|
||||||
</div>
|
|
||||||
<div class="col-xs-2 col-sm-2 q-pr-xs text-grey-7">คะแนน</div>
|
|
||||||
|
|
||||||
<div class="col-xs-4 col-sm-5 text-weight-bold q-pt-sm">ผลการสอบ</div>
|
|
||||||
<div class="col-xs-8 col-sm-6 q-pr-xs text-weight-bold text-subtitle1">
|
|
||||||
<span :class="examResultinscore != 'ผ่าน' ? 'text-red' : 'text-positive'">{{
|
|
||||||
examResultinscore
|
|
||||||
}}</span>
|
|
||||||
</div>
|
|
||||||
<div class="col-xs-6 col-sm-5 text-grey-7">ตำแหน่ง</div>
|
|
||||||
<div class="col-xs-6 col-sm-7 q-pr-xs">
|
|
||||||
{{ position }}
|
|
||||||
</div>
|
|
||||||
<div class="col-xs-6 col-sm-5 text-grey-7">ลำดับที่สอบได้</div>
|
|
||||||
<div class="col-xs-6 col-sm-7 q-pr-xs">
|
|
||||||
{{ number }}
|
|
||||||
</div>
|
|
||||||
<div class="col-xs-6 col-sm-5 text-grey-7">วันหมดอายุบัญชีคัดเลือก</div>
|
|
||||||
<div class="col-xs-6 col-sm-7 q-pr-xs">
|
|
||||||
{{ score_expired == null ? '' : date2Thai(score_expired) }}
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="col-xs-12 col-sm-4 row justify-center">
|
||||||
|
<q-img
|
||||||
|
v-if="avatar == ''"
|
||||||
|
class="rounded-borders"
|
||||||
|
src="@/assets/avatar_user.jpg"
|
||||||
|
:ratio="1"
|
||||||
|
style="width: 150px; height: 600px"
|
||||||
|
/>
|
||||||
|
<q-img
|
||||||
|
v-else
|
||||||
|
class="rounded-borders"
|
||||||
|
:src="avatar"
|
||||||
|
:ratio="1"
|
||||||
|
style="width: 150px; height: 600px"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</q-card>
|
||||||
|
<q-card bordered flat class="q-pa-md q-mt-sm">
|
||||||
|
<div class="col-12 text-weight-bold">ผลคะแนนสอบ</div>
|
||||||
|
<div class="row items-center q-gutter-y-sm col-12">
|
||||||
|
<div class="col-xs-4 col-sm-5 text-weight-medium text-grey-7">ประเภท</div>
|
||||||
|
<div class="col-xs-3 col-sm-2 text-primary text-weight-bold">คะแนนเต็ม</div>
|
||||||
|
<div class="col-xs-3 col-sm-2 text-primary text-weight-bold">คะแนนที่ได้</div>
|
||||||
|
<div class="col-xs-2 col-sm-2 text-primary text-weight-bold"></div>
|
||||||
|
|
||||||
<q-card-section class="col-4 flex flex-center">
|
<div class="col-xs-4 col-sm-5 text-grey-7">ภาค ก</div>
|
||||||
<q-img
|
<div class="col-xs-3 col-sm-2 q-pr-xs">
|
||||||
v-if="avatar == ''"
|
{{ scoreAFull }}
|
||||||
class="rounded-borders"
|
</div>
|
||||||
src="@/assets/avatar_user.jpg"
|
<div class="col-xs-3 col-sm-2 q-pr-xs">
|
||||||
:ratio="1"
|
{{ scoreA }}
|
||||||
style="width: 150px; height: 600px"
|
</div>
|
||||||
/>
|
<div class="col-xs-2 col-sm-2 q-pr-xs text-grey-7">คะแนน</div>
|
||||||
<q-img
|
|
||||||
v-else
|
<div class="col-xs-4 col-sm-5 text-grey-7">ภาค ข</div>
|
||||||
class="rounded-borders"
|
<div class="col-xs-3 col-sm-2 q-pr-xs">
|
||||||
:src="avatar"
|
{{ scoreBFull }}
|
||||||
:ratio="1"
|
</div>
|
||||||
style="width: 150px; height: 600px"
|
<div class="col-xs-3 col-sm-2 q-pr-xs">
|
||||||
/>
|
{{ scoreB }}
|
||||||
</q-card-section>
|
</div>
|
||||||
|
<div class="col-xs-2 col-sm-2 q-pr-xs text-grey-7">คะแนน</div>
|
||||||
|
|
||||||
|
<div class="col-xs-4 col-sm-5 text-grey-7">ภาค ค</div>
|
||||||
|
<div class="col-xs-3 col-sm-2 q-pr-xs">
|
||||||
|
{{ scoreCFull }}
|
||||||
|
</div>
|
||||||
|
<div class="col-xs-3 col-sm-2 q-pr-xs">
|
||||||
|
{{ scoreC }}
|
||||||
|
</div>
|
||||||
|
<div class="col-xs-2 col-sm-2 q-pr-xs text-grey-7">คะแนน</div>
|
||||||
|
|
||||||
|
<div class="col-xs-4 col-sm-5 text-grey-7">รวมทั้งหมด</div>
|
||||||
|
<div class="col-xs-3 col-sm-2 q-pr-xs">
|
||||||
|
{{ scoreSumFull }}
|
||||||
|
</div>
|
||||||
|
<div class="col-xs-3 col-sm-2 q-pr-xs">
|
||||||
|
{{ scoreSum }}
|
||||||
|
</div>
|
||||||
|
<div class="col-xs-2 col-sm-2 q-pr-xs text-grey-7">คะแนน</div>
|
||||||
|
|
||||||
|
<div class="col-xs-4 col-sm-5 text-weight-bold q-pt-sm">ผลการสอบ</div>
|
||||||
|
<div class="col-xs-8 col-sm-6 q-pr-xs text-weight-bold text-subtitle1">
|
||||||
|
<span :class="examResultinscore != 'ผ่าน' ? 'text-red' : 'text-positive'">{{
|
||||||
|
examResultinscore
|
||||||
|
}}</span>
|
||||||
|
</div>
|
||||||
|
<div class="col-xs-6 col-sm-5 text-grey-7">ตำแหน่ง</div>
|
||||||
|
<div class="col-xs-6 col-sm-7 q-pr-xs">
|
||||||
|
{{ position }}
|
||||||
|
</div>
|
||||||
|
<div class="col-xs-6 col-sm-5 text-grey-7">ลำดับที่สอบได้</div>
|
||||||
|
<div class="col-xs-6 col-sm-7 q-pr-xs">
|
||||||
|
{{ number }}
|
||||||
|
</div>
|
||||||
|
<div class="col-xs-6 col-sm-5 text-grey-7">วันหมดอายุบัญชีคัดเลือก</div>
|
||||||
|
<div class="col-xs-6 col-sm-7 q-pr-xs">
|
||||||
|
{{ score_expired == null ? '' : date2Thai(score_expired) }}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</q-card>
|
</q-card>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
|
@ -134,6 +144,8 @@ const examNumber = ref<string>('')
|
||||||
const position = ref<string>('')
|
const position = ref<string>('')
|
||||||
const citizenId = ref<string>('')
|
const citizenId = ref<string>('')
|
||||||
const examSeat = ref<string>('')
|
const examSeat = ref<string>('')
|
||||||
|
const scoreAFull = ref<number | null>(null)
|
||||||
|
const scoreA = ref<number | null>(null)
|
||||||
const scoreBFull = ref<number | null>(null)
|
const scoreBFull = ref<number | null>(null)
|
||||||
const scoreB = ref<number | null>(null)
|
const scoreB = ref<number | null>(null)
|
||||||
const scoreCFull = ref<number | null>(null)
|
const scoreCFull = ref<number | null>(null)
|
||||||
|
|
@ -159,30 +171,21 @@ const fetchStatus = async () => {
|
||||||
examNumber.value = data.examIdenNumber
|
examNumber.value = data.examIdenNumber
|
||||||
citizenId.value = data.citizenId
|
citizenId.value = data.citizenId
|
||||||
examSeat.value = data.seatNumber
|
examSeat.value = data.seatNumber
|
||||||
|
scoreAFull.value = data.pointTotalA
|
||||||
|
scoreA.value = data.pointA
|
||||||
scoreBFull.value = data.pointTotalB
|
scoreBFull.value = data.pointTotalB
|
||||||
scoreB.value = data.pointB
|
scoreB.value = data.pointB
|
||||||
position.value = data.posiiton == null ? '' : '' + data.posiiton.positionName
|
position.value = data.posiiton == null ? '' : '' + data.posiiton.positionName
|
||||||
scoreCFull.value = data.pointTotalC
|
scoreCFull.value = data.pointTotalC
|
||||||
scoreC.value = data.pointC
|
scoreC.value = data.pointC
|
||||||
if (data.pointB != null && data.pointC != null) {
|
scoreSum.value =
|
||||||
scoreSum.value = parseInt(data.pointB) + parseInt(data.pointC)
|
parseInt(data.pointA == null ? 0 : data.pointA) +
|
||||||
} else if (data.pointC != null) {
|
parseInt(data.pointB == null ? 0 : data.pointB) +
|
||||||
scoreSum.value = parseInt(data.pointC)
|
parseInt(data.pointC == null ? 0 : data.pointC)
|
||||||
} else if (data.pointB != null) {
|
scoreSumFull.value =
|
||||||
scoreSum.value = parseInt(data.pointB)
|
parseInt(data.pointTotalA == null ? 0 : data.pointTotalA) +
|
||||||
} else {
|
parseInt(data.pointTotalB == null ? 0 : data.pointTotalB) +
|
||||||
scoreSum.value = null
|
parseInt(data.pointTotalC == null ? 0 : data.pointTotalC)
|
||||||
}
|
|
||||||
if (data.pointTotalB != null && data.pointTotalC != null) {
|
|
||||||
scoreSumFull.value = parseInt(data.pointTotalB) + parseInt(data.pointTotalC)
|
|
||||||
} else if (data.pointTotalC != null) {
|
|
||||||
scoreSumFull.value = parseInt(data.pointTotalC)
|
|
||||||
} else if (data.pointTotalB != null) {
|
|
||||||
scoreSumFull.value = parseInt(data.pointTotalB)
|
|
||||||
} else {
|
|
||||||
scoreSumFull.value = null
|
|
||||||
}
|
|
||||||
scoreC.value = data.pointC
|
|
||||||
examResultinscore.value = data.pass
|
examResultinscore.value = data.pass
|
||||||
avatar.value = data.avatar
|
avatar.value = data.avatar
|
||||||
score_expired.value = new Date(data.announcementDate)
|
score_expired.value = new Date(data.announcementDate)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue