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 | 48 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 39 insertions(+), 9 deletions(-)
diff --git a/src/view/index.vue b/src/view/index.vue
index df0ea64..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);
}
@@ -295,6 +295,9 @@
</div>
<div class="label">LIMS瀹為獙瀹ょ鐞嗙郴缁�</div>
<div class="user">
+ <el-badge :is-dot="newMsg" style="cursor: pointer;margin-right: 10px;">
+ <i class="el-icon-bell" style="font-size: 20px;" @click="openNotice"></i>
+ </el-badge>
<el-dropdown trigger="click" @command="handleCommand">
<el-avatar :size="26">{{ userName.substring(0, 1) }}</el-avatar>
<span>{{ userName }}</span>
@@ -354,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>
@@ -363,6 +366,7 @@
</el-card>
</el-col>
</div>
+ <!-- 淇敼瀵嗙爜 -->
<el-dialog
title="淇敼瀵嗙爜"
:visible.sync="editVisible"
@@ -389,6 +393,7 @@
<el-button type="primary" @click="handleEdit">纭� 瀹�</el-button>
</span>
</el-dialog>
+ <notice ref="notice" @goNoticeDetail="checkForUnreadData()" />
</div>
</template>
@@ -405,9 +410,10 @@
});
import menus from '../../static/js/menu.js'
import nullFace from '../view/404.vue'
+ import notice from './notice.vue'
comObj['nullFace'] = nullFace
export default {
- components: comObj,
+ components: {...comObj,notice},
data() {
return {
userName: "value",
@@ -421,7 +427,10 @@
activeIndex: 0,
power: [],
editVisible:false,
- query:{}
+ query:{},
+ newMsg:false,
+ timer:null,
+ menuId: 0
};
},
created() {
@@ -436,7 +445,7 @@
k: 0,
v: "涓汉棣栭〉",
i: "font icon-a-Group1124",
- u: "nullFace"
+ u: "index-index"
}]
}
this.tabActive = JSON.parse(localStorage.getItem('tabActive'))
@@ -452,6 +461,11 @@
this.activeBox = 0
}
this.getPower()
+ this.timer&&clearInterval(this.timer);
+ this.checkForUnreadData()
+ this.timer = setInterval(()=>{
+ this.checkForUnreadData()
+ },30000)
},
methods: {
saveClick(){
@@ -499,7 +513,7 @@
k: 0,
v: "涓汉棣栭〉",
i: "font icon-a-Group1124",
- u: "nullFace"
+ u: "index-index"
}]
this.saveClick()
},
@@ -533,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'
@@ -607,7 +622,22 @@
handleClose(){
this.editVisible = false
this.query = {}
+ },
+ openNotice(){
+ this.$refs.notice.open()
+ this.$refs.notice.handleType()
+ },
+ checkForUnreadData(){
+ this.$axios.get(this.$api.informationNotification.checkForUnreadData).then(res => {
+ if (res.code == 201) {
+ return
+ }
+ this.newMsg = res.data
+ })
}
- }
+ },
+ destroyed() {
+ this.timer&&clearInterval(this.timer);
+ }
};
</script>
--
Gitblit v1.9.3