Merge branch 'develop' into warunee-dev

# Conflicts:
#	src/modules/05_placement/components/pass/Table.vue
This commit is contained in:
Warunee Tamkoo 2023-06-28 10:17:11 +07:00
commit 626726509c
9 changed files with 816 additions and 806 deletions

View file

@ -56,14 +56,13 @@ const AddTablePosition = defineAsyncComponent(
<q-btn icon="mdi-arrow-left" unelevated round dense flat color="primary" class="q-mr-sm" @click="router.go(-1)" />
รายชอผสอบในรอบ {{ title }} ครงท {{ round }} {{ year }}
</div>
<q-space />
<div class="q-py-md row col-12">
<q-card bordered class="q-py-sm row col-12">
<div class="col-12 row bg-white">
<div class="fit q-pa-md">
<div class="fit q-px-md q-py-sm">
<div class="row col-12 q-col-gutter-md fit">
<div class="" v-for="item in itemTop" :key="item.id" :style="$q.screen.lt.md ? '' : sizeCard(5)" :class="$q.screen.lt.sm ? 'col-4' : ''">
<div class="q-card q-card--bordered q-card--flat no-shadow row fit cardNum items-center q-pa-sm">
<div class="q-card q-card--bordered q-card--flat no-shadow row fit cardNum items-center q-px-sm">
<div class="col-12 row items-center q-pa-sm">
<div class="col-12 text-h5 text-weight-bold" :style="{ color: item.color }">
{{ item.num }}
@ -77,7 +76,7 @@ const AddTablePosition = defineAsyncComponent(
</div>
</div>
</div>
</div>
</q-card>
</div>
<q-card flat bordered class="col-12 q-mt-sm q-pt-sm">
<div>

File diff suppressed because it is too large Load diff