From c7d672aeda4689072116c6b2c92a558b870945a0 Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Thu, 15 Aug 2024 14:30:52 +0700 Subject: [PATCH] updated kpi & check token --- src/modules/01_dashboard/views/Dashboard.vue | 40 ++++++++++--------- .../08_KPI/components/Tab/01_Assessment.vue | 36 +++++++++++++---- .../components/Tab/Dialog/DialogDevelop.vue | 5 ++- .../components/Tab/Topic/02_Competency.vue | 5 ++- src/modules/08_KPI/store.ts | 10 +++++ src/plugins/http.ts | 2 - src/stores/mixin.ts | 21 +++++++++- src/views/MainLayout.vue | 26 +++++++++++- 8 files changed, 110 insertions(+), 35 deletions(-) diff --git a/src/modules/01_dashboard/views/Dashboard.vue b/src/modules/01_dashboard/views/Dashboard.vue index cf4f375..0fe5ca2 100644 --- a/src/modules/01_dashboard/views/Dashboard.vue +++ b/src/modules/01_dashboard/views/Dashboard.vue @@ -138,27 +138,29 @@ const fetchlistInbox = async (index: number) => { let data = res.data.result.data; totalInbox.value = res.data.result.total; let listItem: any = []; - data.map((e: any) => { - listItem.push({ - no: e.id ?? "", - sender: - e.createdFullName == "" || e.createdFullName == null - ? "เจ้าหน้าที่" - : e.createdFullName, - subject: e.subject ?? "", - timereceive: date2Thai(e.createdAt), - body: e.body ?? "-", - ratingModel: 0, - receiveDate: e.receiveDate, - payload: e.payload, - isOpen: e.isOpen, + if (data && data.length > 0) { + data.map((e: any) => { + listItem.push({ + no: e.id ?? "", + sender: + e.createdFullName == "" || e.createdFullName == null + ? "เจ้าหน้าที่" + : e.createdFullName, + subject: e.subject ?? "", + timereceive: date2Thai(e.createdAt), + body: e.body ?? "-", + ratingModel: 0, + receiveDate: e.receiveDate, + payload: e.payload, + isOpen: e.isOpen, + }); }); - }); - inboxList.value.push(...listItem); - }) - .catch((err) => { - console.log(err); + inboxList.value.push(...listItem); + } }) + // .catch((err) => { + // console.log(err); + // }) .finally(() => { hideLoader(); })); diff --git a/src/modules/08_KPI/components/Tab/01_Assessment.vue b/src/modules/08_KPI/components/Tab/01_Assessment.vue index 8321f4d..0cd2d32 100644 --- a/src/modules/08_KPI/components/Tab/01_Assessment.vue +++ b/src/modules/08_KPI/components/Tab/01_Assessment.vue @@ -184,7 +184,11 @@ watch( Number(resultAssigned.value); store.indicatorScoreVal = - store.indicatorPercentVal * (store.indicatorScore / 100); + store.indicatorPercentVal * + ((store.dataProfile.isProbation + ? store.indicatorProbationScore + : store.indicatorScore) / + 100); } } ); @@ -385,7 +389,11 @@ onMounted(() => {
สรุปผลการประเมินผลสัมฤทธิ์ของงาน (คะแนนเต็ม - {{ store.indicatorScore }} + {{ + store.dataProfile.isProbation + ? store.indicatorProbationScore + : store.indicatorScore + }} คะแนน)
@@ -416,7 +424,9 @@ onMounted(() => { name: `สรุปผลการประเมินสมรรถนะ (คะแนนเต็ม ${ store.dataEvaluation.posTypeName != 'อำนวยการ' && store.dataEvaluation.posTypeName != 'บริหาร' - ? store.competencyScore + ? store.dataProfile.isProbation + ? store.competencyProbationScore + : store.competencyScore : store.excusiveCompetencyScore } คะแนน)`, value: store.competencyScoreVal.toFixed(2), @@ -457,7 +467,11 @@ onMounted(() => { bordered :rows="[ { - name: `ผลการประเมินการพัฒนาตนเอง (คะแนนเต็ม ${store.devScore} คะแนน)`, + name: `ผลการประเมินการพัฒนาตนเอง (คะแนนเต็ม ${ + store.dataProfile.isProbation + ? store.devProbationScore + : store.devScore + } คะแนน)`, value: store.devScoreVal.toFixed(2), }, ]" @@ -492,10 +506,16 @@ onMounted(() => { class="row text-body2 text-weight-bold" >
- สรุปผลการประเมินพฤติกรรมการปฏิบัติราชการ (สมรรถนะ+การพัฒนาตนเอง) - (คะแนนเต็ม {{ store.competencyDevScore }} คะแนน) + + สรุปผลการประเมินพฤติกรรมการปฏิบัติราชการ (สมรรถนะ+การพัฒนาตนเอง) + (คะแนนเต็ม + {{ + store.dataProfile.isProbation + ? store.competencyDevProbationScore + : store.competencyDevScore + }} + คะแนน) +
{{ (store.competencyScoreVal + store.devScoreVal).toFixed(2) }}
diff --git a/src/modules/08_KPI/components/Tab/Dialog/DialogDevelop.vue b/src/modules/08_KPI/components/Tab/Dialog/DialogDevelop.vue index 6724d3a..f1cd1ec 100644 --- a/src/modules/08_KPI/components/Tab/Dialog/DialogDevelop.vue +++ b/src/modules/08_KPI/components/Tab/Dialog/DialogDevelop.vue @@ -353,14 +353,14 @@ function filterOptionFn(val: string, update: Function) {