diff --git a/src/api/KPI/api.kpis.ts b/src/api/KPI/api.kpis.ts index 1c3bc01..a7b5ae6 100644 --- a/src/api/KPI/api.kpis.ts +++ b/src/api/KPI/api.kpis.ts @@ -11,6 +11,7 @@ const KpiFile = `${env.API_URI}/salary/file`; const KpiEvaluationInfo = `${env.API_URI}/kpi/evaluation`; const Kpiorg = `${env.API_URI}/org/profile/commander`; +const developmentOrg = `${env.API_URI}/org`; const Kpi = `${env.API_URI}/kpi`; const KpiUser = `${env.API_URI}/kpi/user`; const kpiAchievement = `${env.API_URI}/kpi/user/achievement`; @@ -64,4 +65,8 @@ export default { kpiReport: (id: string) => `${Kpi}/report/kpi-user/${id}`, developmentMain: `${development}/main`, + + developmentReQuestIDP: (id: string) => `${developmentOrg}/profile/development/registry/USER/${id}`, + developmentIDP: (id: string) => `${development}/main/registry/USER/${id}`, }; + diff --git a/src/app.config.ts b/src/app.config.ts index ecbd141..56d83a8 100644 --- a/src/app.config.ts +++ b/src/app.config.ts @@ -34,9 +34,7 @@ const API = { ...reports, }; -const path = - import.meta.env.VITE_MANUAL_URL ?? - "https://bma-ehr-manual.frappet.synology.me"; +const path = import.meta.env.VITE_MANUAL_URL ?? "e"; /** * ไปหน้าคู่มือ @@ -46,58 +44,56 @@ const path = */ const generatePopupPath = (routeName: any, type: string) => { if (routeName.includes("organizationChart")) { - return `${path}/manual/chapter-1-user${type}-organization-chart`; + return `${path}/chapter-1-user${type}-organization-chart`; } if (routeName.includes("registry")) { - return `${path}/manual/chapter-2-user${type}-registry`; + return `${path}/chapter-2-user${type}-registry`; } if (routeName.includes("evaluate")) { - return `${path}/manual/chapter-3-user-evaluate`; + return `${path}/chapter-3-user-evaluate`; } if (routeName.includes("leave")) { - return `${path}/manual/chapter-${type ? "3" : "4"}-user${type}-leave`; + return `${path}/chapter-${type ? "3" : "4"}-user${type}-leave`; } if (routeName.includes("portfolio")) { - return `${path}/manual/chapter-5-user-portfolio`; + return `${path}/chapter-5-user-portfolio`; } if (routeName.includes("transfer")) { - return `${path}/manual/chapter-6-user-transfer`; + return `${path}/chapter-6-user-transfer`; } if (routeName.includes("appealComplain")) { - return `${path}/manual/chapter-${ - type ? "4" : "7" - }-user${type}-appeal-complain`; + return `${path}/chapter-${type ? "4" : "7"}-user${type}-appeal-complain`; } if (routeName.includes("KPI-evaluator")) { - return `${path}/manual/chapter-9-user-KPI-evaluator`; + return `${path}/chapter-9-user-KPI-evaluator`; } if (routeName.includes("scholarship")) { - return `${path}/manual/chapter-10-user-scholarship`; + return `${path}/chapter-10-user-scholarship`; } if (routeName.includes("idp")) { - return `${path}/manual/chapter-11-user-Individual-development`; + return `${path}/chapter-11-user-Individual-development`; } if (routeName.includes("probation-reportMain")) { - return `${path}/manual/chapter-14-user-service-testing`; + return `${path}/chapter-14-user-service-testing`; } if (routeName.includes("Retire")) { - return `${path}/manual/chapter-${type ? "5" : "11"}-user${type}-retire`; + return `${path}/chapter-${type ? "5" : "11"}-user${type}-retire`; } else { return manualConfig[routeName as keyof typeof manualConfig]; } }; const manualConfig = { - dashboard: `${path}/manual/chapter-1-user-organization-chart`, - leave: `${path}/manual/chapter-4-user-leave`, - organizationChart: `${path}/manual/chapter-1-user-organization-chart`, - registryMain: `${path}/manual/chapter-2-user-registry`, - addPortfolio: `${path}/manual/chapter-5-user-portfolio`, - addTransfer: `${path}/manual/chapter-6-user-transfer`, - KPIMain: `${path}/manual/chapter-8-user-KPI`, - KPIMainEvaluator: `${path}/manual/chapter-9-user-KPI-evaluator`, + dashboard: `${path}/chapter-1-user-organization-chart`, + leave: `${path}/chapter-4-user-leave`, + organizationChart: `${path}/chapter-1-user-organization-chart`, + registryMain: `${path}/chapter-2-user-registry`, + addPortfolio: `${path}/chapter-5-user-portfolio`, + addTransfer: `${path}/chapter-6-user-transfer`, + KPIMain: `${path}/chapter-8-user-KPI`, + KPIMainEvaluator: `${path}/chapter-9-user-KPI-evaluator`, }; export default { diff --git a/src/modules/08_KPI/components/Tab/Topic/03_Develop.vue b/src/modules/08_KPI/components/Tab/Topic/03_Develop.vue index 6ebb788..5af0613 100644 --- a/src/modules/08_KPI/components/Tab/Topic/03_Develop.vue +++ b/src/modules/08_KPI/components/Tab/Topic/03_Develop.vue @@ -157,10 +157,12 @@ function getDevelop() { const data = res.data.result; rows.value = data; - store.devScoreVal = rows.value.reduce( + const totalSummary = rows.value.reduce( (sum: number, e: any) => sum + e.summary, 0 ); + + store.devScoreVal = totalSummary / rows.value.length; }); } diff --git a/src/modules/10_registry/04_Achievement/05_Assessments.vue b/src/modules/10_registry/04_Achievement/05_Assessments.vue index 436ba5a..2e805f8 100644 --- a/src/modules/10_registry/04_Achievement/05_Assessments.vue +++ b/src/modules/10_registry/04_Achievement/05_Assessments.vue @@ -23,7 +23,8 @@ const rowsHistoryData = ref([]); const $q = useQuasar(); const mode = ref($q.screen.gt.xs); const mixin = useCounterMixin(); -const { showLoader, hideLoader, messageError, date2Thai,onSearchDataTable } = mixin; +const { showLoader, hideLoader, messageError, date2Thai, onSearchDataTable } = + mixin; const modalHistory = ref(false); /** ตัวแปรข้อมูล */ @@ -325,21 +326,21 @@ function getHistory() { function textRangePoint(val: number | undefined) { if (val == undefined) val = -1; - if (val >= 0 && val <= 60) return "(ต่ำกว่าร้อยละ 60)"; - if (val >= 60 && val <= 69) return "(ร้อยละ 60 – 69)"; - if (val >= 70 && val <= 79) return "(ร้อยละ 70 – 79)"; - if (val >= 80 && val <= 89) return "(ร้อยละ 80 – 89)"; - if (val >= 90 && val <= 100) return "(ร้อยละ 90 - 100)"; + if (val < 60.0) return "(คะแนนต่ำกว่าร้อยละ 60.00)"; + if (val >= 60.0 && val <= 69.99) return "(คะแนนร้อยละ 60.00 - 69.99)"; + if (val >= 70.0 && val <= 79.99) return "(คะแนนร้อยละ 70.00 - 79.99)"; + if (val >= 80.0 && val <= 89.99) return " (คะแนนร้อยละ 80.00 - 89.99)"; + if (val >= 90.0) return " (คะแนนร้อยละ 90.00 ขึ้นไป)"; else return ""; } function textPoint(val: number | undefined) { if (val == undefined) val = -1; - if (val >= 0 && val <= 60) return "ต้องปรับปรุง"; - if (val >= 60 && val <= 69) return "พอใช้"; - if (val >= 70 && val <= 79) return "ดี"; - if (val >= 80 && val <= 89) return "ดีมาก"; - if (val >= 90 && val <= 100) return "ดีเด่น"; + if (val < 60.0) return "ต้องปรับปรุง"; + if (val >= 60.0 && val <= 69.99) return "พอใช้"; + if (val >= 70.0 && val <= 79.99) return "ดี"; + if (val >= 80.0 && val <= 89.99) return "ดีมาก"; + if (val >= 90.0) return "ดีเด่น"; else return "-"; } diff --git a/src/modules/10_registry/04_Achievement/06_DevelopmentPlan.vue b/src/modules/10_registry/04_Achievement/06_DevelopmentPlan.vue index 5841e92..d84181f 100644 --- a/src/modules/10_registry/04_Achievement/06_DevelopmentPlan.vue +++ b/src/modules/10_registry/04_Achievement/06_DevelopmentPlan.vue @@ -12,6 +12,7 @@ import DialogHistory from "@/modules/10_registry/Dialog/DialogHistory.vue"; import DialogDevelop from "@/modules/10_registry/Dialog/DialogDevelopmant.vue"; +const typeIDP = ref(""); const link = ref(""); const dataPerson = useDataStore(); const idByRow = ref(""); @@ -191,6 +192,7 @@ function getHistory() { function openDialogDevelop(data: any) { modalDevelop.value = true; kpiDevelopmentId.value = data.kpiDevelopmentId; + typeIDP.value = data.type } function onSearch() { @@ -374,7 +376,7 @@ onMounted(async () => { - +