|
|
@@ -6,15 +6,19 @@
|
|
|
</div>
|
|
|
<template #dropdown>
|
|
|
<el-dropdown-menu>
|
|
|
- <el-dropdown-item command="large" :disabled="disabledSize === 'large'">{{ $t('message.user.dropdownLarge') }}</el-dropdown-item>
|
|
|
- <el-dropdown-item command="default" :disabled="disabledSize === 'default'">{{ $t('message.user.dropdownDefault') }}</el-dropdown-item>
|
|
|
- <el-dropdown-item command="small" :disabled="disabledSize === 'small'">{{ $t('message.user.dropdownSmall') }}</el-dropdown-item>
|
|
|
+ <el-dropdown-item command="large" :disabled="disabledSize === 'large'">{{
|
|
|
+ $t('message.user.dropdownLarge') }}</el-dropdown-item>
|
|
|
+ <el-dropdown-item command="default" :disabled="disabledSize === 'default'">{{
|
|
|
+ $t('message.user.dropdownDefault') }}</el-dropdown-item>
|
|
|
+ <el-dropdown-item command="small" :disabled="disabledSize === 'small'">{{
|
|
|
+ $t('message.user.dropdownSmall') }}</el-dropdown-item>
|
|
|
</el-dropdown-menu>
|
|
|
</template>
|
|
|
</el-dropdown>
|
|
|
<el-dropdown :show-timeout="70" :hide-timeout="50" trigger="click" @command="onLanguageChange">
|
|
|
<div class="layout-navbars-breadcrumb-user-icon">
|
|
|
- <i class="iconfont" :class="disabledI18n === 'en' ? 'icon-fuhao-yingwen' : 'icon-fuhao-zhongwen'" :title="$t('message.user.title1')"></i>
|
|
|
+ <i class="iconfont" :class="disabledI18n === 'en' ? 'icon-fuhao-yingwen' : 'icon-fuhao-zhongwen'"
|
|
|
+ :title="$t('message.user.title1')"></i>
|
|
|
</div>
|
|
|
<template #dropdown>
|
|
|
<el-dropdown-menu>
|
|
|
@@ -47,11 +51,8 @@
|
|
|
</el-popover>
|
|
|
</div>
|
|
|
<div class="layout-navbars-breadcrumb-user-icon mr10" @click="onScreenfullClick">
|
|
|
- <i
|
|
|
- class="iconfont"
|
|
|
- :title="isScreenfull ? $t('message.user.title6') : $t('message.user.title5')"
|
|
|
- :class="!isScreenfull ? 'icon-fullscreen' : 'icon-tuichuquanping'"
|
|
|
- ></i>
|
|
|
+ <i class="iconfont" :title="isScreenfull ? $t('message.user.title6') : $t('message.user.title5')"
|
|
|
+ :class="!isScreenfull ? 'icon-fullscreen' : 'icon-tuichuquanping'"></i>
|
|
|
</div>
|
|
|
<el-dropdown :show-timeout="70" :hide-timeout="50" @command="onHandleCommandClick">
|
|
|
<span class="layout-navbars-breadcrumb-user-link">
|
|
|
@@ -63,11 +64,11 @@
|
|
|
</span>
|
|
|
<template #dropdown>
|
|
|
<el-dropdown-menu>
|
|
|
- <el-dropdown-item command="/home">{{ $t('message.user.dropdown1') }}</el-dropdown-item>
|
|
|
- <el-dropdown-item command="wareHouse">{{ $t('message.user.dropdown6') }}</el-dropdown-item>
|
|
|
+ <!-- <el-dropdown-item command="/dashboard/workbench">{{ $t('message.user.dropdown1') }}</el-dropdown-item> -->
|
|
|
+ <!-- <el-dropdown-item command="wareHouse">{{ $t('message.user.dropdown6') }}</el-dropdown-item> -->
|
|
|
<el-dropdown-item command="/personal">{{ $t('message.user.dropdown2') }}</el-dropdown-item>
|
|
|
- <el-dropdown-item command="/404">{{ $t('message.user.dropdown3') }}</el-dropdown-item>
|
|
|
- <el-dropdown-item command="/401">{{ $t('message.user.dropdown4') }}</el-dropdown-item>
|
|
|
+ <!-- <el-dropdown-item command="/404">{{ $t('message.user.dropdown3') }}</el-dropdown-item>
|
|
|
+ <el-dropdown-item command="/401">{{ $t('message.user.dropdown4') }}</el-dropdown-item> -->
|
|
|
<el-dropdown-item divided command="logOut">{{ $t('message.user.dropdown5') }}</el-dropdown-item>
|
|
|
</el-dropdown-menu>
|
|
|
</template>
|
|
|
@@ -140,6 +141,7 @@ export default defineComponent({
|
|
|
closeOnPressEscape: false,
|
|
|
title: t('message.user.logOutTitle'),
|
|
|
message: t('message.user.logOutMessage'),
|
|
|
+ type: 'warning',
|
|
|
showCancelButton: true,
|
|
|
confirmButtonText: t('message.user.logOutConfirm'),
|
|
|
cancelButtonText: t('message.user.logOutCancel'),
|
|
|
@@ -153,7 +155,7 @@ export default defineComponent({
|
|
|
setTimeout(() => {
|
|
|
instance.confirmButtonLoading = false;
|
|
|
}, 300);
|
|
|
- }, 700);
|
|
|
+ }, 500);
|
|
|
} else {
|
|
|
done();
|
|
|
}
|
|
|
@@ -165,7 +167,7 @@ export default defineComponent({
|
|
|
// 使用 reload 时，不需要调用 resetRoute() 重置路由
|
|
|
window.location.reload();
|
|
|
})
|
|
|
- .catch(() => {});
|
|
|
+ .catch(() => { });
|
|
|
} else if (path === 'wareHouse') {
|
|
|
window.open('https://gitee.com/lyt-top/vue-next-admin');
|
|
|
} else {
|
|
|
@@ -195,7 +197,7 @@ export default defineComponent({
|
|
|
};
|
|
|
// 设置 element plus 组件的国际化
|
|
|
const setI18nConfig = (locale: string) => {
|
|
|
- proxy.mittBus.emit('getI18nConfig',proxy.i18n.global.messages.value[locale]);
|
|
|
+ proxy.mittBus.emit('getI18nConfig', proxy.i18n.global.messages.value[locale]);
|
|
|
};
|
|
|
// 初始化言语国际化
|
|
|
const initI18n = () => {
|
|
|
@@ -256,17 +258,20 @@ export default defineComponent({
|
|
|
display: flex;
|
|
|
align-items: center;
|
|
|
justify-content: flex-end;
|
|
|
+
|
|
|
&-link {
|
|
|
height: 100%;
|
|
|
display: flex;
|
|
|
align-items: center;
|
|
|
white-space: nowrap;
|
|
|
+
|
|
|
&-photo {
|
|
|
width: 25px;
|
|
|
height: 25px;
|
|
|
border-radius: 100%;
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
&-icon {
|
|
|
padding: 0 10px;
|
|
|
cursor: pointer;
|
|
|
@@ -275,23 +280,28 @@ export default defineComponent({
|
|
|
line-height: 50px;
|
|
|
display: flex;
|
|
|
align-items: center;
|
|
|
+
|
|
|
&:hover {
|
|
|
background: var(--next-color-user-hover);
|
|
|
+
|
|
|
i {
|
|
|
display: inline-block;
|
|
|
animation: logoAnimation 0.3s ease-in-out;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
:deep(.el-dropdown) {
|
|
|
color: var(--next-bg-topBarColor);
|
|
|
}
|
|
|
+
|
|
|
:deep(.el-badge) {
|
|
|
height: 40px;
|
|
|
line-height: 40px;
|
|
|
display: flex;
|
|
|
align-items: center;
|
|
|
}
|
|
|
+
|
|
|
:deep(.el-badge__content.is-fixed) {
|
|
|
top: 12px;
|
|
|
}
|
zuohuaijun
