From e87012567c674cd69f7a8f87df7202eac60a8208 Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期二, 11 六月 2024 22:28:14 +0800
Subject: [PATCH] update

---
 src/layout/components/userbar.vue |   44 ++++++++++++++++++++++++++++++++------------
 1 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/src/layout/components/userbar.vue b/src/layout/components/userbar.vue
index 209824a..c59b3da 100644
--- a/src/layout/components/userbar.vue
+++ b/src/layout/components/userbar.vue
@@ -1,18 +1,28 @@
 <template>
 	<div class="user-bar">
-		<div class="panel-item hidden-sm-and-down" @click="search">
+		<!-- <div class="panel-item hidden-sm-and-down" @click="search">
 			<el-icon><el-icon-search /></el-icon>
-		</div>
-		<div class="screen panel-item hidden-sm-and-down" @click="screen">
-			<el-icon><el-icon-full-screen /></el-icon>
-		</div>
-		<div class="tasks panel-item" @click="tasks">
+		</div> -->
+		
+		<el-dropdown trigger="click">
+			<div class="screen panel-item hidden-sm-and-down">
+				<el-icon><el-icon-full-screen /></el-icon>
+			</div>
+			<template #dropdown>
+			<el-dropdown-menu>
+				<el-dropdown-item @click="closeOther">鍏抽棴鍏朵粬</el-dropdown-item>
+				<el-dropdown-item @click="closeAll">鍏抽棴鎵�鏈�</el-dropdown-item>
+			</el-dropdown-menu>
+			</template>
+		</el-dropdown>
+		<!-- <div class="tasks panel-item" @click="tasks">
 			<el-icon><el-icon-sort /></el-icon>
-		</div>
+		</div> -->
 		<div class="msg panel-item" @click="showMsg">
-			<el-badge :hidden="msgList.length==0" :value="msgList.length" class="badge" type="danger">
+			<el-icon><el-icon-chat-dot-round /></el-icon>
+			<!-- <el-badge :hidden="msgList.length==0" :value="msgList.length" class="badge newbadge" type="danger">
 				<el-icon><el-icon-chat-dot-round /></el-icon>
-			</el-badge>
+			</el-badge> -->
 			<el-drawer title="鏂版秷鎭�" v-model="msg" :size="400" append-to-body destroy-on-close>
 				<el-container>
 					<el-main class="nopadding">
@@ -21,7 +31,7 @@
 								<li v-for="item in msgList" v-bind:key="item.id">
 									<a :href="item.link" target="_blank">
 										<div class="msg-list__icon">
-											<el-badge is-dot type="danger">
+											<el-badge is-dot type="danger" calss="newbadge">
 												<el-avatar :size="40" :src="item.avatar"></el-avatar>
 											</el-badge>
 										</div>
@@ -72,6 +82,7 @@
 </template>
 
 <script>
+	import useTabs from '@/utils/useTabs'
 	import search from './search.vue'
 	import tasks from './tasks.vue'
 
@@ -124,6 +135,13 @@
 			this.userNameF = this.userName.substring(0,1);
 		},
 		methods: {
+			closeOther() {
+				useTabs.closeOther();
+			},
+			closeAll() {
+				useTabs.closeOther();
+				useTabs.close();
+			},
 			//涓汉淇℃伅
 			handleUser(command) {
 				if(command == "uc"){
@@ -166,7 +184,8 @@
 			},
 			//鏄剧ず鐭秷鎭�
 			showMsg(){
-				this.msg = true
+				//this.msg = true
+				this.$router.push({path: '/notification/notice/newsmail'});
 			},
 			//鏍囪宸茶
 			markRead(){
@@ -186,7 +205,7 @@
 
 <style scoped>
 	.user-bar {display: flex;align-items: center;height: 100%;}
-	.user-bar .panel-item {padding: 0 10px;cursor: pointer;height: 100%;display: flex;align-items: center;}
+	.user-bar .panel-item {padding: 0 0 0 10px;cursor: pointer;height: 100%;display: flex;align-items: center;}
 	.user-bar .panel-item i {font-size: 16px;}
 	.user-bar .panel-item:hover {background: rgba(0, 0, 0, 0.1);}
 	.user-bar .user-avatar {height:49px;display: flex;align-items: center;}
@@ -204,4 +223,5 @@
 	.dark .msg-list__main h2 {color: #d0d0d0;}
 	.dark .msg-list li {border-top:1px solid #363636;}
 	.dark .msg-list li a:hover {background: #383838;}
+	.newbadge /deep/ .el-badge__content{top: 13px;}
 </style>

--
Gitblit v1.9.3