|
@@ -14,7 +14,7 @@
|
|
|
<el-select
|
|
<el-select
|
|
|
v-if="userId === 1 && tenantEnabled"
|
|
v-if="userId === 1 && tenantEnabled"
|
|
|
v-model="companyName"
|
|
v-model="companyName"
|
|
|
- class="min-w-244px"
|
|
|
|
|
|
|
+ class="min-w-244px mr-2"
|
|
|
clearable
|
|
clearable
|
|
|
filterable
|
|
filterable
|
|
|
reserve-keyword
|
|
reserve-keyword
|
|
@@ -34,7 +34,7 @@
|
|
|
</el-tooltip>
|
|
</el-tooltip>
|
|
|
<!-- 消息 -->
|
|
<!-- 消息 -->
|
|
|
<el-tooltip :content="proxy.$t('navbar.message')" effect="dark" placement="bottom">
|
|
<el-tooltip :content="proxy.$t('navbar.message')" effect="dark" placement="bottom">
|
|
|
- <div>
|
|
|
|
|
|
|
+ <div style="display:flex;align-items:center">
|
|
|
<el-popover placement="bottom" trigger="click" transition="el-zoom-in-top" :width="300" :persistent="false">
|
|
<el-popover placement="bottom" trigger="click" transition="el-zoom-in-top" :width="300" :persistent="false">
|
|
|
<template #reference>
|
|
<template #reference>
|
|
|
<el-badge :value="newNotice > 0 ? newNotice : ''" :max="99">
|
|
<el-badge :value="newNotice > 0 ? newNotice : ''" :max="99">
|
|
@@ -298,12 +298,6 @@ watch(
|
|
|
outline: none;
|
|
outline: none;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- // 消息等有包裹层的图标,确保中间层不破坏对齐
|
|
|
|
|
- & > * {
|
|
|
|
|
- display: flex;
|
|
|
|
|
- align-items: center;
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
.right-menu-item {
|
|
.right-menu-item {
|
|
|
display: inline-flex;
|
|
display: inline-flex;
|
|
|
align-items: center;
|
|
align-items: center;
|