diff --git a/src/layout/components/Breadcrumb/src/Breadcrumb.vue b/src/layout/components/Breadcrumb/src/Breadcrumb.vue index 80770a8..63a7a4f 100644 --- a/src/layout/components/Breadcrumb/src/Breadcrumb.vue +++ b/src/layout/components/Breadcrumb/src/Breadcrumb.vue @@ -78,10 +78,8 @@ export default defineComponent({ ) return () => ( - - + {renderBreadcrumb()} - ) } diff --git a/src/layout/components/ToolHeader.vue b/src/layout/components/ToolHeader.vue index 7d05886..1525e05 100644 --- a/src/layout/components/ToolHeader.vue +++ b/src/layout/components/ToolHeader.vue @@ -9,13 +9,10 @@ import RouterSearch from '@/components/RouterSearch/index.vue' import { useAppStore } from '@/store/modules/app' import { useDesign } from '@/hooks/web/useDesign' -const { variables } = useDesign() - +const { variables } = useDesign() const appStore = useAppStore() - - // 全屏图标 const screenfull = computed(() => appStore.getScreenfull) @@ -25,21 +22,15 @@ const search = computed(() => appStore.search) // 尺寸图标 const size = computed(() => appStore.getSize) - // 多语言图标 const locale = computed(() => appStore.getLocale) - - export default defineComponent({ name: 'ToolHeader', setup() { return () => ( -
-
+
+
{screenfull.value ? ( @@ -49,10 +40,7 @@ export default defineComponent({ ) : undefined} {locale.value ? ( - + ) : undefined}
@@ -68,12 +56,12 @@ $prefix-cls: #{$namespace}-tool-header; .#{$prefix-cls} { transition: left var(--transition-time-02); } -.block{ - display: flex; - height: 100%; - padding: 0 10px; - cursor: pointer; - align-items: center; - transition: background var(--transition-time-02); +.block { + display: flex; + height: 100%; + padding: 0 10px; + cursor: pointer; + align-items: center; + transition: background var(--transition-time-02); } diff --git a/src/layout/components/UserInfo/src/UserInfo.vue b/src/layout/components/UserInfo/src/UserInfo.vue index b335b02..adec1c5 100644 --- a/src/layout/components/UserInfo/src/UserInfo.vue +++ b/src/layout/components/UserInfo/src/UserInfo.vue @@ -5,19 +5,16 @@ import avatarImg from '@/assets/imgs/avatar.gif' import { useTagsViewStore } from '@/store/modules/tagsView' import { useUserStore } from '@/store/modules/user' - defineOptions({ name: 'UserInfo' }) const { t } = useI18n() -const { replace } = useRouter() +const { replace } = useRouter() const userStore = useUserStore() const tagsViewStore = useTagsViewStore() - - const avatar = computed(() => userStore.user.avatar || avatarImg) const realName = computed(() => userStore.user.realName ?? '管理员') const deptName = computed(() => userStore.user.deptName ?? '管理员') @@ -34,7 +31,6 @@ const loginOut = async () => { replace('/login?redirect=/index') } catch {} } - diff --git a/src/views/qualification/index.vue b/src/views/qualification/index.vue index 57a7f0d..0c7ce2d 100644 --- a/src/views/qualification/index.vue +++ b/src/views/qualification/index.vue @@ -1,114 +1,90 @@