xuhongjie
严飞永 2 months ago
parent 6161bb2b9f
commit 5ba5d688ad

File diff suppressed because it is too large Load Diff

@ -84,7 +84,7 @@
overflow: hidden !important; overflow: hidden !important;
text-overflow: ellipsis !important; text-overflow: ellipsis !important;
white-space: nowrap !important; white-space: nowrap !important;
border-radius: 0.25rem; // border-radius: 0.25rem;
height: 45px; height: 45px;
line-height: 45px; line-height: 45px;
} }
@ -102,8 +102,8 @@
} }
& .is-active > .el-submenu__title { & .is-active > .el-submenu__title {
background-color: #2b62f1 !important; background-color: rgb(227, 236, 254);
color: white !important; // color: white !important;
} }
& .nest-menu .el-submenu > .el-submenu__title, & .nest-menu .el-submenu > .el-submenu__title,

@ -60,7 +60,7 @@ export default {
// , ['png', 'jpg', 'jpeg'] // , ['png', 'jpg', 'jpeg']
fileType: { fileType: {
type: Array, type: Array,
default: () => ["doc", "xls", "ppt", "txt", "pdf"], default: () => ["doc", "docx", "xls", "ppt", "txt", "pdf"],
}, },
// //
isShowTip: { isShowTip: {

@ -1,29 +1,25 @@
<template> <template>
<div> <div>
<!-- 政务端消息通知数量 --> <!-- 政务端消息通知数量 -->
<!-- 大于0的时候显示的图标 --> <!-- 大于0的时候显示的图标 -->
<el-badge :is-dot="countstwo > 0" class="item" v-if="checkRole(['common'])"> <el-badge :is-dot="countstwo > 0" class="item" v-if="checkRole(['common'])">
<span class="el-dropdown-link"> <img src="@/assets/images/icon-tz@2x.png" alt="">
<i class="el-icon-bell"></i>
</span>
</el-badge> </el-badge>
<!-- 企业端消息通知数量 --> <!-- 企业端消息通知数量 -->
<el-badge :is-dot="counts > 0" class="item" v-if="showCompanySection"> <el-badge :is-dot="counts > 0" class="item" v-if="showCompanySection">
<span class="el-dropdown-link"> <img src="@/assets/images/icon-tz@2x.png" alt="">
<i class="el-icon-bell"></i>
</span>
</el-badge> </el-badge>
</div> </div>
</template> </template>
<script> <script>
import { checkRole } from "@/utils/permission"; import { checkRole } from "@/utils/permission";
import { getMessageCount,getMessageCounttwo } from '@/api/ManageApi/index' import { getMessageCount, getMessageCounttwo } from '@/api/ManageApi/index'
export default { export default {
data() { data() {
return { return {
counts: 0 , counts: 0,
countstwo: 0, countstwo: 0,
} }
}, },
@ -54,8 +50,8 @@ export default {
console.error('获取数据失败:', error); console.error('获取数据失败:', error);
} }
}, },
// //
async getCountstwo() { async getCountstwo() {
try { try {
const response = await getMessageCounttwo(); const response = await getMessageCounttwo();
if (response && response.code === 200) { if (response && response.code === 200) {
@ -84,8 +80,13 @@ export default {
color: black; color: black;
} }
img {
width: 1.5rem;
height: 1.6rem;
}
.el-dropdown-link i { .el-dropdown-link i {
font-size: 2rem; font-size: 1rem;
/* 增大图标的大小 */ /* 增大图标的大小 */
} }
} }

@ -45,10 +45,11 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.app-main { .app-main {
/* 50= navbar 50 */ /* 50= navbar 50 */
min-height: 100%; height: 100%;
width: 100%; width: 100%;
position: relative; position: relative;
overflow: hidden; overflow: hidden;
overflow-y: auto;
} }
.fixed-header + .app-main { .fixed-header + .app-main {

@ -8,7 +8,7 @@
</div> </div>
<div class="right-menu"> <div class="right-menu">
<bearicon /> <bearicon />
<el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click"> <div class="avatar-container right-menu-item hover-effect" >
<div class="avatar-wrapper"> <div class="avatar-wrapper">
<div v-if="checkRole(['common'])"> <div v-if="checkRole(['common'])">
<span>{{ name }}</span> <span>{{ name }}</span>
@ -16,14 +16,9 @@
<div v-if="showCompanySection"> <div v-if="showCompanySection">
<span>{{ name }}</span> <span>{{ name }}</span>
</div> </div>
<i class="el-icon-caret-bottom" /> <img src="@/assets/images/退出登录.png" alt="" @click="logout">
</div> </div>
<el-dropdown-menu slot="dropdown"> </div>
<el-dropdown-item @click.native="logout" >
<span>退出登录</span>
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div> </div>
</div> </div>
</template> </template>
@ -192,16 +187,20 @@ export default {
.avatar-wrapper { .avatar-wrapper {
margin-top: 2px; margin-top: 2px;
position: relative; position: relative;
display: flex;
align-items: center;
.user-avatar { .user-avatar {
cursor: pointer;
width: 40px; width: 40px;
height: 40px; height: 40px;
border-radius: 10px; border-radius: 10px;
} }
img{
.el-icon-caret-bottom { width: 1rem;
height: 1rem;
margin-left: 1rem;
cursor: pointer; cursor: pointer;
}
.el-icon-caret-bottom {
position: absolute; position: absolute;
right: -20px; right: -20px;
top: 17px; top: 17px;
@ -215,7 +214,6 @@ export default {
margin-top: .5rem; margin-top: .5rem;
.el-dropdown-link { .el-dropdown-link {
cursor: pointer;
color: black; color: black;
} }

@ -17,7 +17,7 @@
<!-- 右侧内容区域 --> <!-- 右侧内容区域 -->
<div class="content-container"> <div class="content-container">
<app-main style="background-color: #FAFAFA;" /> <app-main style="background-color: #FAFAFA;" />
</div> </div>
<!-- <el-backtop target=".content-container" :visibility-height = "0"></el-backtop> --> <!-- <el-backtop target=".content-container" :visibility-height = "0"></el-backtop> -->
</div> </div>
@ -102,7 +102,8 @@ export default {
border-radius: 1rem 1rem 0 0; border-radius: 1rem 1rem 0 0;
margin-right: .3rem; margin-right: .3rem;
flex: 1; flex: 1;
overflow: hidden; // overflow: hidden;
overflow-y: auto;
background-color: #FAFAFA; background-color: #FAFAFA;
} }

Loading…
Cancel
Save