From c2ff8bcb7627a65808b9e9eac82a0702a607852c Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 01 七月 2024 14:13:24 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master
---
src/view/index.vue | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/view/index.vue b/src/view/index.vue
index 827cf8e..b9ff928 100644
--- a/src/view/index.vue
+++ b/src/view/index.vue
@@ -225,8 +225,8 @@
.component_view {
height: calc(100vh - 84px);
- width: calc(100% - 52px);
- padding: 0 26px;
+ width: calc(100% - 40px);
+ padding: 0 20px;
background: rgb(245, 247, 251);
}
@@ -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>
@@ -393,7 +393,7 @@
<el-button type="primary" @click="handleEdit">纭� 瀹�</el-button>
</span>
</el-dialog>
- <notice ref="notice" />
+ <notice ref="notice" @goNoticeDetail="checkForUnreadData()" />
</div>
</template>
@@ -430,6 +430,7 @@
query:{},
newMsg:false,
timer:null,
+ menuId: 0
};
},
created() {
@@ -461,9 +462,10 @@
}
this.getPower()
this.timer&&clearInterval(this.timer);
+ this.checkForUnreadData()
this.timer = setInterval(()=>{
this.checkForUnreadData()
- },20000)
+ },30000)
},
methods: {
saveClick(){
@@ -545,7 +547,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