diff --git a/src/router/elegant/routes.ts b/src/router/elegant/routes.ts index 8ca4e4f..e77663a 100644 --- a/src/router/elegant/routes.ts +++ b/src/router/elegant/routes.ts @@ -56,7 +56,8 @@ export const generatedRoutes: GeneratedRoute[] = [ component: 'layout.base$view.department', meta: { title: 'department', - i18nKey: 'route.department' + i18nKey: 'route.department', + order: 22 } }, { @@ -65,7 +66,8 @@ export const generatedRoutes: GeneratedRoute[] = [ component: 'layout.base$view.employee', meta: { title: 'employee', - i18nKey: 'route.employee' + i18nKey: 'route.employee', + order: 23 } }, { @@ -74,7 +76,8 @@ export const generatedRoutes: GeneratedRoute[] = [ component: 'layout.base$view.facility', meta: { title: 'facility', - i18nKey: 'route.facility' + i18nKey: 'route.facility', + order: 24 } }, { @@ -363,7 +366,8 @@ export const generatedRoutes: GeneratedRoute[] = [ component: 'layout.base$view.orders', meta: { title: 'orders', - i18nKey: 'route.orders' + i18nKey: 'route.orders', + order: 20 } }, { @@ -372,7 +376,8 @@ export const generatedRoutes: GeneratedRoute[] = [ component: 'layout.base$view.plan', meta: { title: 'plan', - i18nKey: 'route.plan' + i18nKey: 'route.plan', + order: 21 } }, { diff --git a/src/store/modules/auth/index.ts b/src/store/modules/auth/index.ts index fc09b81..c1c7672 100644 --- a/src/store/modules/auth/index.ts +++ b/src/store/modules/auth/index.ts @@ -65,13 +65,11 @@ export const useAuthStore = defineStore(SetupStoreId.Auth, () => { const { response, error } = await fetchLogin(userName, password); - console.log(response) - let accessToken = response.data.token; let loginToken: Api.Auth.LoginToken = { token: accessToken, refreshToken: "" }; let userId = response.data.employeeId - if (1) { + if (error?.status == 200) { const pass = await loginByToken(loginToken,userId); if (pass) { @@ -109,8 +107,9 @@ export const useAuthStore = defineStore(SetupStoreId.Auth, () => { async function getUserInfo() { const { response, error } = await fetchGetUserInfo(); let data:any = response.data.data - console.log(data.name) - console.log(error?.status == 200) + + //console.log(data.name) + //console.log(error?.status == 200) if (error?.status == 200) { let info: Api.Auth.UserInfo = { @@ -121,6 +120,7 @@ export const useAuthStore = defineStore(SetupStoreId.Auth, () => { }; Object.assign(userInfo, info); + console.log("getUserInfo") return true; } diff --git a/src/views/orders/index.vue b/src/views/orders/index.vue index 116e0e0..d442c03 100644 --- a/src/views/orders/index.vue +++ b/src/views/orders/index.vue @@ -1,7 +1,127 @@ - - - + + + \ No newline at end of file