Merge branch 'working' into develop
# Conflicts: # src/modules/03_recruiting/views/01_compete/CompeteReport.vue
This commit is contained in:
Tanyalak
commit
4553d24591
3 changed files with 789 additions and 719 deletions
|
|
@ -1,11 +1,15 @@
|
||||||
VITE_COMPETITIVE_EXAM_PANEL=VITE_COMPETITIVE_EXAM_PANEL
|
VITE_S3CLUSTER_PUBLIC_URL: "https://s3cluster.frappet.com/bma-ehr-fpt/organization/strueture/"
|
||||||
VITE_QUALIFY_DISABLE_EMAM_PANEL=VITE_QUALIFY_DISABLE_EMAM_PANEL
|
|
||||||
VITE_QUALIFY_EXAM_PANEL=VITE_QUALIFY_EXAM_PANEL
|
VITE_COMPETITIVE_EXAM_PANEL: "https://hrms-dash.bangkok.go.th/goto/KO0GpSu4z?orgId=1"
|
||||||
VITE_API_PUBLISH_URL=VITE_API_PUBLISH_URL
|
VITE_QUALIFY_DISABLE_EMAM_PANEL: "https://hrms-dash.bangkok.go.th/goto/dQQzpIX4z?orgId=1"
|
||||||
VITE_API_REPORT_URL=VITE_API_REPORT_URL
|
VITE_QUALIFY_EXAM_PANEL: "https://hrms-dash.bangkok.go.th/goto/cj1ZtIX4z?orgId=1"
|
||||||
VITE_MANUAL_URL=VITE_MANUAL_URL
|
|
||||||
VITE_URL_SSO=VITE_URL_SSO
|
VITE_API_PUBLISH_URL: "https://bma-ehr-publish.frappet.synology.me"
|
||||||
VITE_URL_LANDING=VITE_URL_LANDING
|
VITE_API_REPORT_URL: "https://report-server.frappet.synology.me/api/v1/"
|
||||||
VITE_API_URI_CONFIG=VITE_API_URI_CONFIG
|
VITE_MANUAL_URL: "https://bma-ehr-manual.frappet.synology.me"
|
||||||
VITE_API_URI_REPORT_CONFIG=VITE_API_URI_REPORT_CONFIG
|
VITE_URL_SSO: "http://localhost:3002/sso"
|
||||||
VITE_DASHBOARD_PANEL=VITE_DASHBOARD_PANEL
|
VITE_URL_LANDING: "http://localhost:3002"
|
||||||
|
VITE_API_URI_CONFIG: "https://hrms.chin.in.th/api/v1"
|
||||||
|
VITE_API_URI_REPORT_CONFIG: "https://bma-ehr.frappet.synology.me/api/v2/"
|
||||||
|
|
||||||
|
VITE_DASHBOARD_PANEL: "https://bma-dashboard.frappet.synology.me"
|
||||||
|
|
@ -140,10 +140,10 @@ function filterFnOptions(val: any, update: Function) {
|
||||||
รายงานสถิติสำหรับการสอบแข่งขัน
|
รายงานสถิติสำหรับการสอบแข่งขัน
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<q-card flat bordered class="col-12 q-mt-sm q-pa-md">
|
<div class="q-pa-sm q-gutter-sm">
|
||||||
<div class="q-pa-md q-gutter-y-sm">
|
<q-card flat bordered class="col-12">
|
||||||
<q-toolbar style="padding: 0">
|
<div class="row q-col-gutter-sm q-pa-sm">
|
||||||
<div class="q-pr-xs">
|
<div class="row col-12 q-col-gutter-sm">
|
||||||
<q-select
|
<q-select
|
||||||
outlined
|
outlined
|
||||||
dense
|
dense
|
||||||
|
|
@ -166,8 +166,6 @@ function filterFnOptions(val: any, update: Function) {
|
||||||
</q-item>
|
</q-item>
|
||||||
</template>
|
</template>
|
||||||
</q-select>
|
</q-select>
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<datepicker
|
<datepicker
|
||||||
v-model="year"
|
v-model="year"
|
||||||
:locale="'th'"
|
:locale="'th'"
|
||||||
|
|
@ -199,10 +197,7 @@ function filterFnOptions(val: any, update: Function) {
|
||||||
</q-input>
|
</q-input>
|
||||||
</template>
|
</template>
|
||||||
</datepicker>
|
</datepicker>
|
||||||
</div>
|
<q-space />
|
||||||
<q-space />
|
|
||||||
<div class="q-py-xs">
|
|
||||||
|
|
||||||
<q-btn
|
<q-btn
|
||||||
flat
|
flat
|
||||||
round
|
round
|
||||||
|
|
@ -240,95 +235,99 @@ function filterFnOptions(val: any, update: Function) {
|
||||||
</q-menu>
|
</q-menu>
|
||||||
</q-btn>
|
</q-btn>
|
||||||
</div>
|
</div>
|
||||||
</q-toolbar>
|
</div>
|
||||||
<q-splitter
|
</q-card>
|
||||||
v-model="splitterModel"
|
<q-card flat bordered class="col-12">
|
||||||
horizontal
|
<q-card-section class="col-lg-9 col-md-8 col-xs-12 scroll">
|
||||||
style="
|
<q-splitter
|
||||||
height: 70vh;
|
v-model="splitterModel"
|
||||||
border: 1px solid rgb(210, 210, 210);
|
horizontal
|
||||||
border-radius: 5px;
|
style="
|
||||||
"
|
height: 70vh;
|
||||||
before-class="overflow-hidden disable"
|
border: 1px solid rgb(210, 210, 210);
|
||||||
separator-class="bg-white disabled"
|
border-radius: 5px;
|
||||||
>
|
"
|
||||||
<template v-slot:before>
|
before-class="overflow-hidden disable"
|
||||||
<div class="q-px-sm">
|
separator-class="bg-white disabled"
|
||||||
<div class="row items-start items-center">
|
>
|
||||||
<div class="col">
|
<template v-slot:before>
|
||||||
<q-btn
|
<div class="q-px-sm">
|
||||||
padding="xs"
|
<div class="row items-start items-center">
|
||||||
icon="mdi-chevron-left"
|
<div class="col">
|
||||||
color="grey-2"
|
<q-btn
|
||||||
text-color="grey-5"
|
padding="xs"
|
||||||
size="md"
|
icon="mdi-chevron-left"
|
||||||
class="my-auto"
|
color="grey-2"
|
||||||
@click="backPage"
|
text-color="grey-5"
|
||||||
:disable="page == 1"
|
size="md"
|
||||||
/>
|
class="my-auto"
|
||||||
</div>
|
@click="backPage"
|
||||||
<div class="col-12 col-md-auto">
|
:disable="page == 1"
|
||||||
<div class="q-pa-md flex">
|
/>
|
||||||
หน้าที่ {{ page }} จาก {{ numOfPages }}
|
</div>
|
||||||
|
<div class="col-12 col-md-auto">
|
||||||
|
<div class="q-pa-md flex">
|
||||||
|
หน้าที่ {{ page }} จาก {{ numOfPages }}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="col text-right">
|
||||||
|
<q-btn
|
||||||
|
padding="xs"
|
||||||
|
icon="mdi-chevron-right"
|
||||||
|
color="grey-2"
|
||||||
|
text-color="grey-5"
|
||||||
|
size="md"
|
||||||
|
@click="nextPage"
|
||||||
|
:disable="page === numOfPages"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col text-right">
|
</template>
|
||||||
<q-btn
|
<template v-slot:after>
|
||||||
padding="xs"
|
<div class="q-pa-md">
|
||||||
icon="mdi-chevron-right"
|
<VuePDF ref="vuePDFRef" :pdf="pdfSrc" :page="page" fit-parent />
|
||||||
color="grey-2"
|
|
||||||
text-color="grey-5"
|
|
||||||
size="md"
|
|
||||||
@click="nextPage"
|
|
||||||
:disable="page === numOfPages"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
<template v-slot:after>
|
|
||||||
<div class="q-pa-md">
|
|
||||||
<VuePDF ref="vuePDFRef" :pdf="pdfSrc" :page="page" fit-parent />
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
<template v-slot:default>
|
|
||||||
<div class="q-pa-md">
|
|
||||||
<div class="row items-start items-center">
|
|
||||||
<div class="col">
|
|
||||||
<q-btn
|
|
||||||
padding="xs"
|
|
||||||
icon="mdi-chevron-left"
|
|
||||||
color="grey-2"
|
|
||||||
text-color="grey-5"
|
|
||||||
size="md"
|
|
||||||
class="my-auto"
|
|
||||||
@click="backPage"
|
|
||||||
:disable="page == 1"
|
|
||||||
/>
|
|
||||||
</div>
|
</div>
|
||||||
|
</template>
|
||||||
|
<template v-slot:default>
|
||||||
|
<div class="q-pa-md">
|
||||||
|
<div class="row items-start items-center">
|
||||||
|
<div class="col">
|
||||||
|
<q-btn
|
||||||
|
padding="xs"
|
||||||
|
icon="mdi-chevron-left"
|
||||||
|
color="grey-2"
|
||||||
|
text-color="grey-5"
|
||||||
|
size="md"
|
||||||
|
class="my-auto"
|
||||||
|
@click="backPage"
|
||||||
|
:disable="page == 1"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div class="col-12 col-md-auto">
|
<div class="col-12 col-md-auto">
|
||||||
<div class="q-pa-md flex">
|
<div class="q-pa-md flex">
|
||||||
หน้าที่ {{ page }} จาก {{ numOfPages }}
|
หน้าที่ {{ page }} จาก {{ numOfPages }}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="col text-right">
|
||||||
|
<q-btn
|
||||||
|
padding="xs"
|
||||||
|
icon="mdi-chevron-right"
|
||||||
|
color="grey-2"
|
||||||
|
text-color="grey-5"
|
||||||
|
size="md"
|
||||||
|
@click="nextPage"
|
||||||
|
:disable="page === numOfPages"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col text-right">
|
</template>
|
||||||
<q-btn
|
</q-splitter>
|
||||||
padding="xs"
|
</q-card-section>
|
||||||
icon="mdi-chevron-right"
|
</q-card>
|
||||||
color="grey-2"
|
|
||||||
text-color="grey-5"
|
|
||||||
size="md"
|
|
||||||
@click="nextPage"
|
|
||||||
:disable="page === numOfPages"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
</q-splitter>
|
|
||||||
</div>
|
</div>
|
||||||
</q-card>
|
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<style scoped></style>
|
<style scoped></style>
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load diff
Loading…
Add table
Add a link
Reference in a new issue