diff --git a/public/toc.json b/public/toc.json index 856939be..704be890 100644 --- a/public/toc.json +++ b/public/toc.json @@ -12,19 +12,19 @@ "children": [ { "label": "การใช้งานผู้ดูแลระบบ", - "path": "/manual/chapter-1-superadmin-maintenance" + "path": "/chapter-1-superadmin-maintenance" }, { "label": "การใช้งานผู้ดูแลระบบระดับสูง", - "path": "/manual/chapter-2-superadmin-maintenance" + "path": "/chapter-2-superadmin-maintenance" }, { "label": "คู่มือการตรวจสอบและแก้ไข", - "path": "/manual/chapter-3-superadmin-debug" + "path": "/chapter-3-superadmin-debug" }, { "label": "คู่มือการจัดการระบบ", - "path": "/manual/chapter-4-superadmin-build-and-deploy" + "path": "/chapter-4-superadmin-build-and-deploy" } ] }, @@ -35,7 +35,7 @@ "children": [ { "label": "การเข้าสู่ระบบ", - "path": "/manual/chapter-1-admin-login" + "path": "/chapter-1-admin-login" }, { @@ -46,39 +46,39 @@ "children": [ { "label": "ตามแผน", - "path": "/manual/chapter-2-admin-evaluate" + "path": "/chapter-2-admin-evaluate" }, { "label": "ตามตำแหน่ง", - "path": "/manual/chapter-2-1-2-admin-evaluate" + "path": "/chapter-2-1-2-admin-evaluate" }, { "label": "งานอื่นๆ ที่ได้รับมอบหมาย", - "path": "/manual/chapter-2-1-3-admin-evaluate" + "path": "/chapter-2-1-3-admin-evaluate" } ] }, { "label": "สมรรถนะ", - "path": "/manual/chapter-2-2-admin-evaluate" + "path": "/chapter-2-2-admin-evaluate" }, { "label": "ยุทธศาสตร์", - "path": "/manual/chapter-2-3-admin-evaluate" + "path": "/chapter-2-3-admin-evaluate" } ] }, { "label": "ระบบโครงสร้างอัตรากำลัง", - "path": "/manual/chapter-3-admin-organization" + "path": "/chapter-3-admin-organization" }, { "label": "ระบบรักษาการในตำแหน่ง", - "path": "/manual/chapter-4-admin-acting" + "path": "/chapter-4-admin-acting" }, { "label": "ระบบอัตรากำลังลูกจ้าง", - "path": "/manual/chapter-5-admin-position-employee" + "path": "/chapter-5-admin-position-employee" }, { "key": "3.6", @@ -86,39 +86,39 @@ "children": [ { "label": "ข้าราชการ กทม. สามัญ", - "path": "/manual/chapter-6-1-admin-registry" + "path": "/chapter-6-1-admin-registry" }, { "label": "ลูกจ้างประจำ กทม.", - "path": "/manual/chapter-6-2-admin-registry" + "path": "/chapter-6-2-admin-registry" }, { "label": "ลูกจ้างชั่วคราว", - "path": "/manual/chapter-6-3-admin-registry" + "path": "/chapter-6-3-admin-registry" } ] }, { "label": "ระบบออกคำสั่ง", - "path": "/manual/chapter-7-admin-order" + "path": "/chapter-7-admin-order" }, { "label": "ระบบสรรหา", "children": [ { "label": "ตั้งค่าระบบสรรหา", - "path": "/manual/chapter-8-admin-recruit" + "path": "/chapter-8-admin-recruit" }, { "label": "สอบแข่งขัน", "children": [ { "label": "จัดการรอบสอบแข่งขัน", - "path": "/manual/chapter-8-3-admin-compete-period" + "path": "/chapter-8-3-admin-compete-period" }, { "label": "สถิติสมัครสอบแข่งขัน", - "path": "/manual/chapter-8-3-2-admin-compete-period-stat" + "path": "/chapter-8-3-2-admin-compete-period-stat" } ] }, @@ -127,23 +127,23 @@ "children": [ { "label": "จัดการรอบคัดเลือก", - "path": "/manual/chapter-8-4-1-admin-qualify-period" + "path": "/chapter-8-4-1-admin-qualify-period" }, { "label": "จัดการรอบคัดเลือกคนพิการ", - "path": "/manual/chapter-8-4-2-admin-disable-period" + "path": "/chapter-8-4-2-admin-disable-period" }, { "label": "จัดการรายชื่อคัดเลือก", - "path": "/manual/chapter-8-4-3-admin-qualify-manage" + "path": "/chapter-8-4-3-admin-qualify-manage" }, { "label": "สถิติสมัครคัดเลือก", - "path": "/manual/chapter-8-4-4-admin-qualify-period-stat" + "path": "/chapter-8-4-4-admin-qualify-period-stat" }, { "label": "สถิติสมัครคัดเลือกคนพิการ", - "path": "/manual/chapter-8-4-5-admin-qualify-disable-stat" + "path": "/chapter-8-4-5-admin-qualify-disable-stat" } ] } @@ -154,68 +154,68 @@ "children": [ { "label": "รายชื่อผู้สอบผ่าน", - "path": "/manual/chapter-9-admin-placement" + "path": "/chapter-9-admin-placement" }, { "label": "รายการขอโอน", - "path": "/manual/chapter-9-2-admin-transfer" + "path": "/chapter-9-2-admin-transfer" }, { "label": "รายการรับโอน", - "path": "/manual/chapter-9-3-admin-receive" + "path": "/chapter-9-3-admin-receive" }, { "label": "รายการช่วยราชการ", - "path": "/manual/chapter-9-4-admin-help-government" + "path": "/chapter-9-4-admin-help-government" }, { "label": "รายการส่งตัวกลับ", - "path": "/manual/chapter-9-5-admin-repatriate" + "path": "/chapter-9-5-admin-repatriate" }, { "label": "รายการแต่งตั้ง-เลื่อน-ย้าย", - "path": "/manual/chapter-9-6-admin-appoint-promote" + "path": "/chapter-9-6-admin-appoint-promote" }, { "label": "ปรับระดับชั้นงาน-ย้ายลูกจ้าง", - "path": "/manual/chapter-9-7-admin-appoint-employee" + "path": "/chapter-9-7-admin-appoint-employee" }, { "label": "รายการอื่นๆ", - "path": "/manual/chapter-9-8-admin-other" + "path": "/chapter-9-8-admin-other" } ] }, { "label": "ทดลองปฏิบัติหน้าที่ราชการ", - "path": "/manual/chapter-10-admin-probation" + "path": "/chapter-10-admin-probation" }, { "label": "ระบบพ้นจากราชการ", "children": [ { "label": "ประกาศเกษณียณ", - "path": "/manual/chapter-11-admin-retirement" + "path": "/chapter-11-admin-retirement" }, { "label": "รายการลาออก", - "path": "/manual/chapter-11-2-admin-retirement" + "path": "/chapter-11-2-admin-retirement" }, { "label": "รายการลาออก(ลูกจ้าง)", - "path": "/manual/chapter-11-3-admin-retirement" + "path": "/chapter-11-3-admin-retirement" }, { "label": "Exit interview", - "path": "/manual/chapter-11-4-admin-retirement" + "path": "/chapter-11-4-admin-retirement" }, { "label": "รายการบันทึกการถึงแก่กรรม", - "path": "/manual/chapter-11-5-admin-retirement" + "path": "/chapter-11-5-admin-retirement" }, { "label": "รายการให้ออก", - "path": "/manual/chapter-11-6-admin-retirement" + "path": "/chapter-11-6-admin-retirement" } ] }, @@ -224,27 +224,27 @@ "children": [ { "label": "รอบการเสนอขอ", - "path": "/manual/chapter-12-admin-insignia" + "path": "/chapter-12-admin-insignia" }, { "label": "จัดการคำขอ", - "path": "/manual/chapter-12-2-admin-insignia" + "path": "/chapter-12-2-admin-insignia" }, { "label": "บันทึกผลการเสนอขอ", - "path": "/manual/chapter-12-3-admin-insignia" + "path": "/chapter-12-3-admin-insignia" }, { "label": "จัดสรรเครื่องราชอิสริยาภรณ์", - "path": "/manual/chapter-12-4-admin-insignia" + "path": "/chapter-12-4-admin-insignia" }, { "label": "ยืม – คืนเครื่องราชอิสริยาภรณ์", - "path": "/manual/chapter-12-5-admin-insignia" + "path": "/chapter-12-5-admin-insignia" }, { "label": "รายงาน", - "path": "/manual/chapter-12-6-admin-insignia" + "path": "/chapter-12-6-admin-insignia" } ] }, @@ -253,27 +253,27 @@ "children": [ { "label": "รอบการปฏิบัติงาน", - "path": "/manual/chapter-13-admin-leave" + "path": "/chapter-13-admin-leave" }, { "label": "รายการลงเวลาปฏิบัติงาน", - "path": "/manual/chapter-13-2-admin-leave" + "path": "/chapter-13-2-admin-leave" }, { "label": "แก้ไขรอบการปฏิบัติงานของผู้ใช้งาน", - "path": "/manual/chapter-13-3-admin-leave" + "path": "/chapter-13-3-admin-leave" }, { "label": "ลงเวลากรณีพิเศษ", - "path": "/manual/chapter-13-4-admin-leave" + "path": "/chapter-13-4-admin-leave" }, { "label": "รายการลา", - "path": "/manual/chapter-13-5-admin-leave" + "path": "/chapter-13-5-admin-leave" }, { "label": "รายงานสถิติการลา", - "path": "/manual/chapter-13-6-admin-leave" + "path": "/chapter-13-6-admin-leave" } ] }, @@ -282,38 +282,38 @@ "children": [ { "label": "เรื่องร้องเรียน", - "path": "/manual/chapter-14-admin-discipline-complaints" + "path": "/chapter-14-admin-discipline-complaints" }, { "label": "สืบสวนข้อเท็จจริง", - "path": "/manual/chapter-14-2-admin-discipline-investigatefacts" + "path": "/chapter-14-2-admin-discipline-investigatefacts" }, { "label": "สอบสวนความผิดทางวินัย", - "path": "/manual/chapter-14-3-admin-discipline-disciplinary" + "path": "/chapter-14-3-admin-discipline-disciplinary" }, { "label": "สรุปผลการพิจารณาความผิดทางวินัย", - "path": "/manual/chapter-14-4-admin-discipline-result" + "path": "/chapter-14-4-admin-discipline-result" }, { "label": "รายชื่อผู้ถูกพักราชการ", - "path": "/manual/chapter-14-5-admin-discipline-suspend" + "path": "/chapter-14-5-admin-discipline-suspend" }, { "label": "รายการอุทธรณ์/ร้องทุกข์", - "path": "/manual/chapter-14-6-admin-discipline-appealcomplain" + "path": "/chapter-14-6-admin-discipline-appealcomplain" }, { "label": "ข้อมูลพื้นฐาน", "children": [ { "label": "กรรมการ", - "path": "/manual/chapter-14-7-admin-discipline-director" + "path": "/chapter-14-7-admin-discipline-director" }, { "label": "ช่องทางการร้องเรียน", - "path": "/manual/chapter-14-7-2-admin-discipline-channel" + "path": "/chapter-14-7-2-admin-discipline-channel" } ] } @@ -324,18 +324,18 @@ "children": [ { "label": "คำขอประเมิน", - "path": "/manual/chapter-15-admin-KPI" + "path": "/chapter-15-admin-KPI" }, { "label": "กรรมการและการประชุม", "children": [ { "label": "กรรมการ", - "path": "/manual/chapter-15-2-admin-KPI" + "path": "/chapter-15-2-admin-KPI" }, { "label": "การประชุม", - "path": "/manual/chapter-15-2-2-admin-KPI" + "path": "/chapter-15-2-2-admin-KPI" } ] } @@ -346,23 +346,23 @@ "children": [ { "label": "รอบการปฏิบัติงาน", - "path": "/manual/chapter-16-admin-salary" + "path": "/chapter-16-admin-salary" }, { "label": "ผังบัญชีค่าจ้างลูกจ้างประจำ", - "path": "/manual/chapter-16-2-admin-salary" + "path": "/chapter-16-2-admin-salary" }, { "label": "รอบการเลื่อนเงินเดือน", - "path": "/manual/chapter-16-3-admin-salary" + "path": "/chapter-16-3-admin-salary" }, { "label": "เลื่อนเงินเดือนข้าราชการฯ", - "path": "/manual/chapter-16-4-admin-salary" + "path": "/chapter-16-4-admin-salary" }, { "label": "เลื่อนเงินเดือนลูกจ้างประจำ", - "path": "/manual/chapter-16-5-admin-salary" + "path": "/chapter-16-5-admin-salary" } ] }, @@ -371,19 +371,19 @@ "children": [ { "label": "รอบการประเมิน", - "path": "/manual/chapter-17-admin-development" + "path": "/chapter-17-admin-development" }, { "label": "รายการประเมินผล ", - "path": "/manual/chapter-17-2-admin-development-history" + "path": "/chapter-17-2-admin-development-history" }, { "label": "ประกาศผล", - "path": "/manual/chapter-17-3-admin-development-employee-history" + "path": "/chapter-17-3-admin-development-employee-history" }, { "label": "จัดทำประกาศผู้มีผลการปฏิบัติราชการระดับดีเด่นและดีมาก", - "path": "/manual/chapter-17-4-admin-development-scholarship" + "path": "/chapter-17-4-admin-development-scholarship" } ] }, @@ -392,19 +392,19 @@ "children": [ { "label": "โครงการ/หลักสูตรการฝึกอบรม", - "path": "/manual/chapter-18-admin-development" + "path": "/chapter-18-admin-development" }, { "label": "ประวัติฝึกอบรม/ดูงาน ขรก.", - "path": "/manual/chapter-18-2-admin-development-history" + "path": "/chapter-18-2-admin-development-history" }, { "label": "ประวัติฝึกอบรม/ดูงานลูกจ้าง", - "path": "/manual/chapter-18-3-admin-development-employee-history" + "path": "/chapter-18-3-admin-development-employee-history" }, { "label": "ทุนการศึกษา/ฝึกอบรม", - "path": "/manual/chapter-18-4-admin-development-scholarship" + "path": "/chapter-18-4-admin-development-scholarship" } ] }, @@ -424,59 +424,59 @@ "children": [ { "label": "ระบบแผนผังองค์กร", - "path": "/manual/chapter-1-user-organization-chart" + "path": "/chapter-1-user-organization-chart" }, { "label": "ระบบทะเบียนประวัติ", - "path": "/manual/chapter-2-user-registry" + "path": "/chapter-2-user-registry" }, { "label": "ระบบประเมินบุคคล", - "path": "/manual/chapter-3-user-evaluate" + "path": "/chapter-3-user-evaluate" }, { "label": "ระบบการลา", - "path": "/manual/chapter-4-user-leave" + "path": "/chapter-4-user-leave" }, { "label": "ระบบผลงาน", - "path": "/manual/chapter-5-user-portfolio" + "path": "/chapter-5-user-portfolio" }, { "label": "ระบบขอโอน", - "path": "/manual/chapter-6-user-transfer" + "path": "/chapter-6-user-transfer" }, { "label": "ระบบอุทธรณ์ร้องทุกข์", - "path": "/manual/chapter-7-user-appeal-complain" + "path": "/chapter-7-user-appeal-complain" }, { "label": "ระบบผู้ขอรับประเมิน (KPI)", - "path": "/manual/chapter-8-user-KPI" + "path": "/chapter-8-user-KPI" }, { "label": "ระบบผู้ประเมิน (KPI)", - "path": "/manual/chapter-9-user-KPI-evaluator" + "path": "/chapter-9-user-KPI-evaluator" }, { "label": "ระบบทุนการศึกษา/ฝึกอบรม", - "path": "/manual/chapter-10-user-scholarship" + "path": "/chapter-10-user-scholarship" }, { "label": "ระบบการพัฒนารายบุคคล", - "path": "/manual/chapter-11-user-Individual-development" + "path": "/chapter-11-user-Individual-development" }, { "label": "ระบบลาออก", - "path": "/manual/chapter-12-user-retire" + "path": "/chapter-12-user-retire" }, { "label": "ระบบบันทึกการลงเวลาปฏิบัติงาน", - "path": "/manual/chapter-13-user-worktimerecord" + "path": "/chapter-13-user-worktimerecord" }, { "label": "ระบบทุนการศึกษา/ฝึกอบรม", - "path": "/manual/chapter-14-user-service-testing" + "path": "/chapter-14-user-service-testing" } ] }, @@ -486,31 +486,31 @@ "children": [ { "label": "ระบบแผนผังองค์กร", - "path": "/manual/chapter-1-user-employee-organization-chart" + "path": "/chapter-1-user-employee-organization-chart" }, { "label": "ระบบทะเบียนประวัติ", - "path": "/manual/chapter-2-user-employee-registry" + "path": "/chapter-2-user-employee-registry" }, { "label": "ระบบการลา", - "path": "/manual/chapter-3-user-employee-leave" + "path": "/chapter-3-user-employee-leave" }, { "label": "ระบบลงเวลา", - "path": "/manual/chapter-13-user-employee-worktimerecord" + "path": "/chapter-13-user-employee-worktimerecord" }, { "label": "ระบบอุทธรณ์ร้องทุกข์", - "path": "/manual/chapter-5-user-employee-appeal-complain" + "path": "/chapter-5-user-employee-appeal-complain" }, { "label": "ระบบลาออก", - "path": "/manual/chapter-6-user-employee-retire" + "path": "/chapter-6-user-employee-retire" }, { "label": "ระบบบันทึกการลงเวลาปฏิบัติงาน", - "path": "/manual/chapter-7-user-employee-worktimerecord" + "path": "/chapter-7-user-employee-worktimerecord" } ] } diff --git a/src/modules/router.ts b/src/modules/router.ts index 6c213eb3..02d03d94 100644 --- a/src/modules/router.ts +++ b/src/modules/router.ts @@ -2,7 +2,7 @@ import type { RouteRecordRaw } from "vue-router"; // import { ref } from "vue"; // import { useRoute } from "vue-router"; const Error404NotFound = () => import("@/views/Error404NotFound.vue"); -const data = await fetch("/manual/toc.json").then((r) => r.json()); +const data = await fetch("/toc.json").then((r) => r.json()); // const routes = useRoute(); // const hasQueryParam = ref(false); @@ -41,14 +41,12 @@ const manualRoute = mergeManual.map( const route: RouteRecordRaw[] = [ { - path: "/manual/:name", + path: "/:name", name: "Manual", component: () => import("@/modules/01_manual/MainPage.vue"), beforeEnter: (to, from, next) => { const mergeAll = [...mainDataInfo, ...manualRoute]; - const itemExists = mergeAll.some( - (item) => item.path === window.location.pathname - ); + const itemExists = mergeAll.some((item) => item.name === "Manual"); if (itemExists) { next(); diff --git a/src/router/index.ts b/src/router/index.ts index 6c0813f9..a5f858ab 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -10,7 +10,7 @@ import ModuleManual from "@/modules/router"; // import keycloak from "@/plugins/keycloak" const router = createRouter({ - history: createWebHistory(import.meta.env.BASE_URL), + history: createWebHistory(`/manual/`), routes: [ { path: "/", diff --git a/src/views/MainLayout.vue b/src/views/MainLayout.vue index d84e00f9..6838e740 100644 --- a/src/views/MainLayout.vue +++ b/src/views/MainLayout.vue @@ -50,7 +50,7 @@ function getLocalStorageItem(key: string): string | null { onMounted(async () => { { - const data = await fetch("/manual/toc.json").then((r) => r.json()); + const data = await fetch("/toc.json").then((r) => r.json()); if (!!queryRole) { setLocalStorageItem("role", queryRole); diff --git a/vite.config.ts b/vite.config.ts index e93d0272..1488b5cc 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -7,7 +7,7 @@ import { quasar, transformAssetUrls } from "@quasar/vite-plugin"; // https://vitejs.dev/config/ export default defineConfig({ - base: "/manual", + base: "", plugins: [ vue({ template: { transformAssetUrls },