From a2441175073f8b09a7eff29effd7e3e617de2f7d Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期四, 06 六月 2024 18:23:01 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/smart-web
---
src/layout/components/userbar.vue | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/src/layout/components/userbar.vue b/src/layout/components/userbar.vue
index 133f4cc..c59b3da 100644
--- a/src/layout/components/userbar.vue
+++ b/src/layout/components/userbar.vue
@@ -3,16 +3,26 @@
<!-- <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>
+
+ <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 class="msg panel-item" @click="showMsg">
- <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 :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">
@@ -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(){
--
Gitblit v1.9.3