diff --git a/src/modules/01_dashboard/views/Dashboard.vue b/src/modules/01_dashboard/views/Dashboard.vue index 93a0bc9..3ea5742 100644 --- a/src/modules/01_dashboard/views/Dashboard.vue +++ b/src/modules/01_dashboard/views/Dashboard.vue @@ -1,5 +1,5 @@ + + diff --git a/src/router/index.ts b/src/router/index.ts index 53bb5de..af9989a 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -19,6 +19,8 @@ import ModuleProbation from "@/modules/11_probation/router"; import ModuleOrganization from "@/modules/12_organization/router"; import ModulePortfolio from "@/modules/13_portfolio/router"; import ModuleDevelop from "@/modules/14_IDP/router"; +import ModuleProbationReport from "@/modules/15_probationReport/router"; + import { authenticated, tokenParsed } from "@/plugins/auth"; import { ro } from "date-fns/locale"; // TODO: ใช้หรือไม่? @@ -59,6 +61,7 @@ const router = createRouter({ ...ModuleOrganization, ...ModulePortfolio, ...ModuleDevelop, + ...ModuleProbationReport, ], }, { diff --git a/src/stores/data.ts b/src/stores/data.ts index 74c3907..aa45beb 100644 --- a/src/stores/data.ts +++ b/src/stores/data.ts @@ -5,6 +5,7 @@ export const useDataStore = defineStore("data", () => { // ref() คือการประกาศ state เหมือน vuex const count = ref(0); const loader = ref(false); + const isProbation = ref(false) const expandedReport2 = ref([]); const selectedReport2 = ref(""); @@ -66,6 +67,7 @@ export const useDataStore = defineStore("data", () => { expandedRegister, selectedRegister, changeTreeRegister, + isProbation }; }); diff --git a/src/views/MainLayout.vue b/src/views/MainLayout.vue index afda82c..d813309 100644 --- a/src/views/MainLayout.vue +++ b/src/views/MainLayout.vue @@ -9,11 +9,15 @@ import CustomComponent from "@/components/CustomDialog.vue"; import avatar from "@/assets/avatar_user.jpg"; import { tokenParsed, logout } from "@/plugins/auth"; +import { useDataStore } from '@/stores/data' + const route = useRoute(); const router = useRouter(); const $q = useQuasar(); const profileImg = ref(""); +const dataStore = useDataStore() + const mixin = useCounterMixin(); const { date2Thai, @@ -46,7 +50,7 @@ async function checkUser() { .get(config.API.profilePosition()) .then(async (res) => { const data = res.data.result; - + dataStore.isProbation = data.isProbation if (data.avatarName) { await getImg(data.profileId, data.avatarName); } else {