|
|
|
|
@ -34,7 +34,7 @@
|
|
|
|
|
</el-tooltip>
|
|
|
|
|
<!-- 消息 -->
|
|
|
|
|
<el-tooltip :content="proxy.$t('navbar.message')" effect="dark" placement="bottom">
|
|
|
|
|
<div style="display:flex;align-items:center">
|
|
|
|
|
<div style="display: flex; align-items: center">
|
|
|
|
|
<el-popover placement="bottom" trigger="click" transition="el-zoom-in-top" :width="300" :persistent="false">
|
|
|
|
|
<template #reference>
|
|
|
|
|
<el-badge :value="newNotice > 0 ? newNotice : ''" :max="99">
|
|
|
|
|
@ -47,13 +47,13 @@
|
|
|
|
|
</el-popover>
|
|
|
|
|
</div>
|
|
|
|
|
</el-tooltip>
|
|
|
|
|
<el-tooltip content="Github" effect="dark" placement="bottom">
|
|
|
|
|
<ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
|
|
|
|
|
</el-tooltip>
|
|
|
|
|
<!-- <el-tooltip content="Github" effect="dark" placement="bottom">-->
|
|
|
|
|
<!-- <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />-->
|
|
|
|
|
<!-- </el-tooltip>-->
|
|
|
|
|
|
|
|
|
|
<el-tooltip :content="proxy.$t('navbar.document')" effect="dark" placement="bottom">
|
|
|
|
|
<ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />
|
|
|
|
|
</el-tooltip>
|
|
|
|
|
<!-- <el-tooltip :content="proxy.$t('navbar.document')" effect="dark" placement="bottom">-->
|
|
|
|
|
<!-- <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />-->
|
|
|
|
|
<!-- </el-tooltip>-->
|
|
|
|
|
|
|
|
|
|
<el-tooltip :content="proxy.$t('navbar.full')" effect="dark" placement="bottom">
|
|
|
|
|
<screenfull id="screenfull" class="right-menu-item hover-effect" />
|
|
|
|
|
@ -105,8 +105,8 @@ import notice from './notice/index.vue';
|
|
|
|
|
import router from '@/router';
|
|
|
|
|
import { ElMessageBoxOptions } from 'element-plus/es/components/message-box/src/message-box.type';
|
|
|
|
|
import { NavTypeEnum } from '@/enums/NavTypeEnum';
|
|
|
|
|
import Logo from "@/layout/components/Sidebar/Logo.vue";
|
|
|
|
|
import TopBar from './TopBar'
|
|
|
|
|
import Logo from '@/layout/components/Sidebar/Logo.vue';
|
|
|
|
|
import TopBar from './TopBar';
|
|
|
|
|
|
|
|
|
|
const appStore = useAppStore();
|
|
|
|
|
const userStore = useUserStore();
|
|
|
|
|
@ -282,7 +282,6 @@ watch(
|
|
|
|
|
margin-left: 8px;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
.errLog-container {
|
|
|
|
|
display: inline-block;
|
|
|
|
|
vertical-align: top;
|
|
|
|
|
@ -310,7 +309,9 @@ watch(
|
|
|
|
|
|
|
|
|
|
&.hover-effect {
|
|
|
|
|
cursor: pointer;
|
|
|
|
|
transition: background 0.2s ease, color 0.2s ease;
|
|
|
|
|
transition:
|
|
|
|
|
background 0.2s ease,
|
|
|
|
|
color 0.2s ease;
|
|
|
|
|
|
|
|
|
|
&:hover {
|
|
|
|
|
background: var(--el-fill-color-light);
|
|
|
|
|
|