From 28dc37d0edcaf46b08cb840f5144c78e79b0b3ce Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Tue, 18 Feb 2025 16:25:25 +0700 Subject: [PATCH] updated dashboard --- .env.production | 11 +--- docker/entrypoint.sh | 11 ---- src/api/index.ts | 94 ++------------------------------ src/api/reports/api.dashboard.ts | 14 ----- src/app.config.ts | 4 -- src/stores/menuList.ts | 85 ----------------------------- src/views/DashboardAll.vue | 93 +++++++++---------------------- 7 files changed, 30 insertions(+), 282 deletions(-) delete mode 100644 src/api/reports/api.dashboard.ts diff --git a/.env.production b/.env.production index 57a251050..76faebdd3 100644 --- a/.env.production +++ b/.env.production @@ -8,13 +8,4 @@ VITE_URL_SSO=VITE_URL_SSO VITE_URL_LANDING=VITE_URL_LANDING VITE_API_URI_CONFIG=VITE_API_URI_CONFIG VITE_API_URI_REPORT_CONFIG=VITE_API_URI_REPORT_CONFIG -VITE_DASHBOARD_PANEL=VITE_DASHBOARD_PANEL -VITE_DASHBOARDID_ORG=VITE_DASHBOARDID_ORG -VITE_DASHBOARDID_REGISTRY=VITE_DASHBOARDID_REGISTRY -VITE_DASHBOARDID_LEAVE=VITE_DASHBOARDID_LEAVE -VITE_DASHBOARDID_PLACEMENT=VITE_DASHBOARDID_PLACEMENT -VITE_DASHBOARDID_RETIRE=VITE_DASHBOARDID_RETIRE -VITE_DASHBOARDID_DISCIPLINE=VITE_DASHBOARDID_DISCIPLINE -VITE_DASHBOARDID_DEVELOP=VITE_DASHBOARDID_DEVELOP -VITE_DASHBOARDID_SALARY=VITE_DASHBOARDID_SALARY -VITE_DASHBOARDID_KPI=VITE_DASHBOARDID_KPI \ No newline at end of file +VITE_DASHBOARD_PANEL=VITE_DASHBOARD_PANEL \ No newline at end of file diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index 56d4c830d..62ac741e0 100644 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -19,17 +19,6 @@ do sed -i 's|VITE_API_URI_CONFIG|'${VITE_API_URI_CONFIG}'|g' $file sed -i 's|VITE_API_URI_REPORT_CONFIG|'${VITE_API_URI_REPORT_CONFIG}'|g' $file sed -i 's|VITE_DASHBOARD_PANEL|'${VITE_DASHBOARD_PANEL}'|g' $file - - sed -i 's|VITE_DASHBOARDID_ORG|'${VITE_DASHBOARDID_ORG}'|g' $file - sed -i 's|VITE_DASHBOARDID_REGISTRY|'${VITE_DASHBOARDID_REGISTRY}'|g' $file - sed -i 's|VITE_DASHBOARDID_LEAVE|'${VITE_DASHBOARDID_LEAVE}'|g' $file - sed -i 's|VITE_DASHBOARDID_PLACEMENT|'${VITE_DASHBOARDID_PLACEMENT}'|g' $file - sed -i 's|VITE_DASHBOARDID_RETIRE|'${VITE_DASHBOARDID_RETIRE}'|g' $file - sed -i 's|VITE_DASHBOARDID_DISCIPLINE|'${VITE_DASHBOARDID_DISCIPLINE}'|g' $file - sed -i 's|VITE_DASHBOARDID_DEVELOP|'${VITE_DASHBOARDID_DEVELOP}'|g' $file - sed -i 's|VITE_DASHBOARDID_SALARY|'${VITE_DASHBOARDID_SALARY}'|g' $file - sed -i 's|VITE_DASHBOARDID_KPI|'${VITE_DASHBOARDID_KPI}'|g' $file - done echo "Starting Nginx" diff --git a/src/api/index.ts b/src/api/index.ts index de50a41f0..e83c37800 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -39,33 +39,7 @@ const config = ref({ API_REPORT_TEMPLATE_URI: "https://report-server.frappet.synology.me/api/v1/report-template", API_SUPPORT_URI: "https://bma-ehr.frappet.synology.me/api/v1/support", - DASHBOARD_ORG_URL: `${dashboardPanelUrl}/${ - import.meta.env.VITE_DASHBOARDID_ORG - }`, - DASHBOARD_REGISTRY_URL: `${dashboardPanelUrl}/${ - import.meta.env.VITE_DASHBOARDID_REGISTRY - }`, - DASHBOARD_LEAVE_URL: `${dashboardPanelUrl}/${ - import.meta.env.VITE_DASHBOARDID_LEAVE - }`, - DASHBOARD_PLACEMENT_URL: `${dashboardPanelUrl}/${ - import.meta.env.VITE_DASHBOARDID_PLACEMENT - }`, - DASHBOARD_RETIRE_URL: `${dashboardPanelUrl}/${ - import.meta.env.VITE_DASHBOARDID_RETIRE - }`, - DASHBOARD_DISCIPLINE_URL: `${dashboardPanelUrl}/${ - import.meta.env.VITE_DASHBOARDID_DISCIPLINE - }`, - DASHBOARD_DEVELOP_URL: `${dashboardPanelUrl}/${ - import.meta.env.VITE_DASHBOARDID_DEVELOP - }`, - DASHBOARD_SALARY_URL: `${dashboardPanelUrl}/${ - import.meta.env.VITE_DASHBOARDID_SALARY - }`, - DASHBOARD_KPI_URL: `${dashboardPanelUrl}/${ - import.meta.env.VITE_DASHBOARDID_KPI - }`, + DASHBOARD_URL: dashboardPanelUrl, }, test: { API_URI: "http://localhost:5010/api/v1", @@ -91,33 +65,7 @@ const config = ref({ LINK_EVALUATE_PUBLISH: apiUrlConfigPublish, API_REPORT_TEMPLATE_URI: apiUrlConfigReport, API_SUPPORT_URI: `${apiUrlConfigPublish}/support`, - DASHBOARD_ORG_URL: `${dashboardPanelUrl}/${ - import.meta.env.VITE_DASHBOARDID_ORG - }`, - DASHBOARD_REGISTRY_URL: `${dashboardPanelUrl}/${ - import.meta.env.VITE_DASHBOARDID_REGISTRY - }`, - DASHBOARD_LEAVE_URL: `${dashboardPanelUrl}/${ - import.meta.env.VITE_DASHBOARDID_LEAVE - }`, - DASHBOARD_PLACEMENT_URL: `${dashboardPanelUrl}/${ - import.meta.env.VITE_DASHBOARDID_PLACEMENT - }`, - DASHBOARD_RETIRE_URL: `${dashboardPanelUrl}/${ - import.meta.env.VITE_DASHBOARDID_RETIRE - }`, - DASHBOARD_DISCIPLINE_URL: `${dashboardPanelUrl}/${ - import.meta.env.VITE_DASHBOARDID_DISCIPLINE - }`, - DASHBOARD_DEVELOP_URL: `${dashboardPanelUrl}/${ - import.meta.env.VITE_DASHBOARDID_DEVELOP - }`, - DASHBOARD_SALARY_URL: `${dashboardPanelUrl}/${ - import.meta.env.VITE_DASHBOARDID_SALARY - }`, - DASHBOARD_KPI_URL: `${dashboardPanelUrl}/${ - import.meta.env.VITE_DASHBOARDID_KPI - }`, + DASHBOARD_URL: dashboardPanelUrl, }, }); @@ -155,33 +103,7 @@ const API_REPORT_TEMPLATE_URI = ref( config.value[env.value].API_REPORT_TEMPLATE_URI ); -const DASHBOARD_ORG_URL = ref( - config.value[env.value].DASHBOARD_ORG_URL -); -const DASHBOARD_REGISTRY_URL = ref( - config.value[env.value].DASHBOARD_REGISTRY_URL -); -const DASHBOARD_LEAVE_URL = ref( - config.value[env.value].DASHBOARD_LEAVE_URL -); -const DASHBOARD_PLACEMENT_URL = ref( - config.value[env.value].DASHBOARD_PLACEMENT_URL -); -const DASHBOARD_RETIRE_URL = ref( - config.value[env.value].DASHBOARD_RETIRE_URL -); -const DASHBOARD_DISCIPLINE_URL = ref( - config.value[env.value].DASHBOARD_DISCIPLINE_URL -); -const DASHBOARD_DEVELOP_URL = ref( - config.value[env.value].DASHBOARD_DEVELOP_URL -); -const DASHBOARD_SALARY_URL = ref( - config.value[env.value].DASHBOARD_SALARY_URL -); -const DASHBOARD_KPI_URL = ref( - config.value[env.value].DASHBOARD_KPI_URL -); +const DASHBOARD_URL = ref(config.value[env.value].DASHBOARD_URL); export default { env: env.value, @@ -201,13 +123,5 @@ export default { LINK_EVALUATE_PUBLISH: LINK_EVALUATE_PUBLISH.value, API_REPORT_TEMPLATE_URI: API_REPORT_TEMPLATE_URI.value, API_SUPPORT_URI: API_SUPPORT_URI.value, - DASHBOARD_ORG_URL: DASHBOARD_ORG_URL.value, - DASHBOARD_REGISTRY_URL: DASHBOARD_REGISTRY_URL.value, - DASHBOARD_LEAVE_URL: DASHBOARD_LEAVE_URL.value, - DASHBOARD_PLACEMENT_URL: DASHBOARD_PLACEMENT_URL.value, - DASHBOARD_RETIRE_URL: DASHBOARD_RETIRE_URL.value, - DASHBOARD_DISCIPLINE_URL: DASHBOARD_DISCIPLINE_URL.value, - DASHBOARD_DEVELOP_URL: DASHBOARD_DEVELOP_URL.value, - DASHBOARD_SALARY_URL: DASHBOARD_SALARY_URL.value, - DASHBOARD_KPI_URL: DASHBOARD_KPI_URL.value, + DASHBOARD_URL: DASHBOARD_URL.value, }; diff --git a/src/api/reports/api.dashboard.ts b/src/api/reports/api.dashboard.ts deleted file mode 100644 index 7902a382b..000000000 --- a/src/api/reports/api.dashboard.ts +++ /dev/null @@ -1,14 +0,0 @@ -/*** dashboard panel url */ -import env from "../index"; - -export default { - dashboardPanelOrg: `${env.DASHBOARD_ORG_URL}`, - dashboardPanelRegistry: `${env.DASHBOARD_REGISTRY_URL}`, - dashboardPanelLeave: `${env.DASHBOARD_LEAVE_URL}`, - dashboardPanelPlacement: `${env.DASHBOARD_PLACEMENT_URL}`, - dashboardPanelRetire: `${env.DASHBOARD_RETIRE_URL}`, - dashboardPanelDiscipline: `${env.DASHBOARD_DISCIPLINE_URL}`, - dashboardPanelDevelop: `${env.DASHBOARD_DEVELOP_URL}`, - dashboardPanelSalary: `${env.DASHBOARD_SALARY_URL}`, - dashboardPanelKPI: `${env.DASHBOARD_KPI_URL}`, -}; diff --git a/src/app.config.ts b/src/app.config.ts index cf26b6493..9dd8f3ead 100644 --- a/src/app.config.ts +++ b/src/app.config.ts @@ -72,8 +72,6 @@ import command from "./api/18_command/api.command"; import file from "./api/file/api.file"; -import dashboard from "./api/reports/api.dashboard"; - // environment variables export const compettitivePanel = import.meta.env.VITE_COMPETITIVE_EXAM_PANEL; export const qualifyDisableExamPanel = import.meta.env @@ -142,8 +140,6 @@ const API = { /*file*/ ...file, - - ...dashboard, }; const path = import.meta.env.VITE_MANUAL_URL ?? ""; diff --git a/src/stores/menuList.ts b/src/stores/menuList.ts index cfdba272d..f2506dd4f 100644 --- a/src/stores/menuList.ts +++ b/src/stores/menuList.ts @@ -15,91 +15,6 @@ export const useMenuDataStore = defineStore("menuUse", () => { /** รายการเมนู*/ const menuList = ref([]); - /** ข้อมูล Level3*/ - const childLevelTree = ref({ - SYS_EVA_INDICATOR: [ - { - sysName: "ตามแผน", - path: "KPIIndicatorByPlan", - meta: { - Auth: true, - Key: "SYS_EVA_INDICATOR", - Role: "STAFF", - }, - }, - { - sysName: "ตามตำแหน่ง", - path: "KPIIndicatorByRole", - meta: { - Auth: true, - Key: "SYS_EVA_INDICATOR", - Role: "STAFF", - }, - }, - { - sysName: "งานอื่นๆ ที่ได้รับมอบหมาย", - path: "KPIAssignment", - meta: { - Auth: true, - Key: "SYS_EVA_INDICATOR", - Role: "STAFF", - }, - }, - ], - SYS_EXAM_CONTEST: [ - { - sysName: "จัดการรอบสอบแข่งขัน", - path: "competePeriod", - }, - { - sysName: "สถิติสมัครสอบแข่งขัน", - path: "competePeriodStat", - }, - ], - SYS_EXAM_SELECT: [ - { - sysName: "จัดการรอบคัดเลือก", - path: "qualifyPeriod", - }, - { - sysName: "จัดการรอบคัดเลือกคนพิการ", - path: "disablePeriod", - }, - { - sysName: "จัดการรายชื่อคัดเลือก", - path: "manage", - }, - { - sysName: "สถิติสมัครคัดเลือก", - path: "qualifyPeriodStat", - }, - { - sysName: "สถิติสมัครคัดเลือกคนพิการ", - path: "qualifyPeriodStatDisable", - }, - ], - SYS_DISCIPLINE_INFO: [ - { - sysName: "กรรมการ", - path: "disciplineDirector", - }, - { - sysName: "ช่องทางการร้องเรียน", - path: "disciplineChannel", - }, - ], - SYS_EVA_INFO: [ - { - sysName: "กรรมการ", - path: "evaluateDirector", - }, - { - sysName: "การประชุม", - path: "evaluateMeeting", - }, - ], - }); - /** * function เรียกรายการเมนูทั้งหมด * @param data ข้อมูลรายการทั้งหมด diff --git a/src/views/DashboardAll.vue b/src/views/DashboardAll.vue index 780714255..1f8ec55b1 100644 --- a/src/views/DashboardAll.vue +++ b/src/views/DashboardAll.vue @@ -1,4 +1,28 @@ - + + -