diff --git a/orion-ops-ui/src/components/app/footer/index.vue b/orion-ops-ui/src/components/app/footer/index.vue index f2651dfd..9834fb26 100644 --- a/orion-ops-ui/src/components/app/footer/index.vue +++ b/orion-ops-ui/src/components/app/footer/index.vue @@ -10,7 +10,7 @@ v{{ version }} - Copyright 2023 By OrionOpsPro + Copyright 2023 By lijiahang diff --git a/orion-ops-ui/src/components/app/navbar/index.vue b/orion-ops-ui/src/components/app/navbar/index.vue index e5c2ea0c..7c1d93be 100644 --- a/orion-ops-ui/src/components/app/navbar/index.vue +++ b/orion-ops-ui/src/components/app/navbar/index.vue @@ -206,12 +206,12 @@ import { useDark, useFullscreen, useToggle } from '@vueuse/core'; import { useAppStore, useTabBarStore, useTipsStore, useUserStore } from '@/store'; import { LOCALE_OPTIONS } from '@/locale'; - import { triggerMouseEvent } from '@/utils'; + import { triggerMouseEvent } from '@/utils/event'; import { openAppSettingKey, toggleDrawerMenuKey } from '@/types/symbol'; import { preferenceTipsKey } from './const'; import { REDIRECT_ROUTE_NAME, routerToTag } from '@/router/constants'; import Menu from '@/components/system/menu/tree/index.vue'; - import UpdatePasswordModal from '@/components/user/role/update-password-modal.vue'; + import UpdatePasswordModal from '@/components/user/user/update-password-modal.vue'; import MessageBox from '@/components/system/message-box/index.vue'; const tipsStore = useTipsStore(); diff --git a/orion-ops-ui/src/components/user/role/user-role-selector.vue b/orion-ops-ui/src/components/user/role/role-selector.vue similarity index 84% rename from orion-ops-ui/src/components/user/role/user-role-selector.vue rename to orion-ops-ui/src/components/user/role/role-selector.vue index a07db8a7..ad3fc6e8 100644 --- a/orion-ops-ui/src/components/user/role/user-role-selector.vue +++ b/orion-ops-ui/src/components/user/role/role-selector.vue @@ -45,12 +45,14 @@ // 初始化选项 onBeforeMount(() => { - optionData.value = cacheStore.roles.map(s => { - return { - label: `${s.name} (${s.code})`, - disabled: s.status === RoleStatus.DISABLED, - value: s.id, - }; + cacheStore.loadRoles().then(roles => { + optionData.value = roles.map(s => { + return { + label: `${s.name} (${s.code})`, + disabled: s.status === RoleStatus.DISABLED, + value: s.id, + }; + }); }); }); diff --git a/orion-ops-ui/src/components/user/role/update-password-modal.vue b/orion-ops-ui/src/components/user/user/update-password-modal.vue similarity index 100% rename from orion-ops-ui/src/components/user/role/update-password-modal.vue rename to orion-ops-ui/src/components/user/user/update-password-modal.vue diff --git a/orion-ops-ui/src/components/user/role/user-selector.vue b/orion-ops-ui/src/components/user/user/user-selector.vue similarity index 79% rename from orion-ops-ui/src/components/user/role/user-selector.vue rename to orion-ops-ui/src/components/user/user/user-selector.vue index 4ed574f1..e5d6a114 100644 --- a/orion-ops-ui/src/components/user/role/user-selector.vue +++ b/orion-ops-ui/src/components/user/user/user-selector.vue @@ -18,7 +18,7 @@