From 7f53399af5f8eab02e4e7580345079cdcf5c3cd6 Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Thu, 25 Apr 2024 15:28:43 +0700 Subject: [PATCH] updated competency cal --- .../08_KPI/components/Tab/01_Assessment.vue | 6 - .../Tab/Dialog/04_FormCompetency.vue | 40 +- .../Tab/DialogEvaluate/02_Competenct.vue | 12 +- ...petencyCard.vue => !02_CompetencyCard.vue} | 7 +- .../components/Tab/Topic/02_Competency.vue | 383 +++++++++++++++++- 5 files changed, 401 insertions(+), 47 deletions(-) rename src/modules/08_KPI/components/Tab/Topic/{02_CompetencyCard.vue => !02_CompetencyCard.vue} (97%) diff --git a/src/modules/08_KPI/components/Tab/01_Assessment.vue b/src/modules/08_KPI/components/Tab/01_Assessment.vue index e6d64e0..dfa5c85 100644 --- a/src/modules/08_KPI/components/Tab/01_Assessment.vue +++ b/src/modules/08_KPI/components/Tab/01_Assessment.vue @@ -30,7 +30,6 @@ const totalResults1 = ref(0); const totalResults2 = ref(0); const totalResults3 = ref(0); // const resultWork = ref(0); -const resultEvaluation = ref(0); function fetchListPlanned() { showLoader(); @@ -187,11 +186,6 @@ onMounted(() => { - -
- สรุปผลการประเมินสมรรถนะ (คะแนนเต็ม 20 คะแนน) -
{{ resultEvaluation }}
-
diff --git a/src/modules/08_KPI/components/Tab/Dialog/04_FormCompetency.vue b/src/modules/08_KPI/components/Tab/Dialog/04_FormCompetency.vue index 413b667..db01347 100644 --- a/src/modules/08_KPI/components/Tab/Dialog/04_FormCompetency.vue +++ b/src/modules/08_KPI/components/Tab/Dialog/04_FormCompetency.vue @@ -11,8 +11,6 @@ import config from "@/app.config"; import { useQuasar } from "quasar"; import { useRoute } from "vue-router"; -import type { FormCapacityList } from "@/modules/08_KPI/interface/request/index"; - const route = useRoute(); const idParam = ref(route.params.id as string); @@ -39,24 +37,15 @@ const idProps = defineModel("id", { required: true }); const competencyType = defineModel("competencyType", { required: true, }); -const splitterModel = ref(30); const search = ref(""); -const define = ref(""); -const formula = ref(""); const type = ref(""); const listCheck = ref(); const listTarget = ref([]); const listTargetMain = ref([]); -const expectedLevelOp = ref([ - { id: "1", name: "1" }, - { id: "2", name: "2" }, - { id: "3", name: "3" }, - { id: "4", name: "4" }, - { id: "5", name: "5" }, -]); +const expectedLevelOp = ref(["1", "2", "3", "4", "5"]); const formDetail = reactive({ id: "", type: "สมรรถนะหลัก", @@ -153,7 +142,7 @@ function onSubmit() { .then((res) => { success($q, "บันทึกข้อมูลสำเร็จ"); closeDialog(); - props.getDataList?.(); + props.getDataList?.(competencyType.value); }) .catch((e) => { messageError($q, e); @@ -166,21 +155,23 @@ function onSubmit() { } function getData() { - showLoader() + showLoader(); http .get(config.API.KpiCapacity + `?type=${type.value}`) .then((res) => { const data = res.data.result.data; listTarget.value = data; listTargetMain.value = data; - formScore.score1 = data.capacityDetails[0].description; - formScore.score2 = data.capacityDetails[1].description; - formScore.score3 = data.capacityDetails[2].description; - formScore.score4 = data.capacityDetails[3].description; - formScore.score5 = data.capacityDetails[4].description; + if (data.capacityDetails) { + formScore.score1 = data.capacityDetails[0].description; + formScore.score2 = data.capacityDetails[1].description; + formScore.score3 = data.capacityDetails[2].description; + formScore.score4 = data.capacityDetails[3].description; + formScore.score5 = data.capacityDetails[4].description; + } }) .finally(() => { - hideLoader() + hideLoader(); }); } @@ -216,16 +207,17 @@ function getDataById() { .catch((e) => {}) .finally(() => {}); } + watch( () => modal.value, () => { - if (modal.value == true) { + if (modal.value) { type.value = competencyType.value; getData(); if (idProps.value) { setTimeout(() => { getDataById(); - }, 1000); + }, 500); } else { if (type.value == "HEAD") { expectedLevel.value = store.defaultCompetencyCoreLevel; @@ -239,6 +231,7 @@ watch( } ); +