From 71c4ece010f68a74eeff5e986caecb9a0bb2e36c Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期四, 25 四月 2024 17:37:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/view/index.vue | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/src/view/index.vue b/src/view/index.vue
index df0ea64..827cf8e 100644
--- a/src/view/index.vue
+++ b/src/view/index.vue
@@ -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>
@@ -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" />
</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,9 @@
activeIndex: 0,
power: [],
editVisible:false,
- query:{}
+ query:{},
+ newMsg:false,
+ timer:null,
};
},
created() {
@@ -436,7 +444,7 @@
k: 0,
v: "涓汉棣栭〉",
i: "font icon-a-Group1124",
- u: "nullFace"
+ u: "index-index"
}]
}
this.tabActive = JSON.parse(localStorage.getItem('tabActive'))
@@ -452,6 +460,10 @@
this.activeBox = 0
}
this.getPower()
+ this.timer&&clearInterval(this.timer);
+ this.timer = setInterval(()=>{
+ this.checkForUnreadData()
+ },20000)
},
methods: {
saveClick(){
@@ -499,7 +511,7 @@
k: 0,
v: "涓汉棣栭〉",
i: "font icon-a-Group1124",
- u: "nullFace"
+ u: "index-index"
}]
this.saveClick()
},
@@ -607,7 +619,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