From cd0252da419d4065e322b945da2d836796bc0e1f Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 29 四月 2024 11:23:46 +0800
Subject: [PATCH] 合并冲突
---
src/view/index.vue | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/view/index.vue b/src/view/index.vue
index 827cf8e..2d2d851 100644
--- a/src/view/index.vue
+++ b/src/view/index.vue
@@ -357,7 +357,7 @@
<el-col :span="24">
<el-card :body-style="{padding: '6px'}">
<ul>
- <li @click="removeTab(activeIndex)"><i class="el-icon-close"></i>鍏抽棴</li>
+ <li @click="removeTab(activeIndex)" v-show="menuId!=0"><i class="el-icon-close"></i>鍏抽棴</li>
<li @click="allDel"><i class="el-icon-delete"></i>鍏抽棴鎵�鏈�</li>
<li @click="rightDel(activeIndex)"><i class="el-icon-d-arrow-right"></i>鍏抽棴鍙充晶椤电</li>
<el-divider></el-divider>
@@ -430,6 +430,7 @@
query:{},
newMsg:false,
timer:null,
+ menuId: 0
};
},
created() {
@@ -463,7 +464,7 @@
this.timer&&clearInterval(this.timer);
this.timer = setInterval(()=>{
this.checkForUnreadData()
- },20000)
+ },30000)
},
methods: {
saveClick(){
@@ -545,7 +546,8 @@
},
// 鍙抽敭鑿滃崟
rightKeyMenu(id, e) {
- if (id == 0) return
+ // if (id == 0) return
+ this.menuId = id
this.activeIndex = id
var x = e.clientX + 'px'
var y = e.clientY + 'px'
--
Gitblit v1.9.3