diff --git a/resources/assets/js/pages/manage.vue b/resources/assets/js/pages/manage.vue index d0e2123c..96640a98 100644 --- a/resources/assets/js/pages/manage.vue +++ b/resources/assets/js/pages/manage.vue @@ -214,6 +214,7 @@ @on-click="show768Menu=!show768Menu">
+
@@ -357,6 +358,10 @@ export default { return this.dashboardTask.today.length + this.dashboardTask.overdue.length }, + unreadTotal() { + return this.msgAllUnread + this.dashboardTotal + this.reportUnreadNumber; + }, + currentLanguage() { return this.languageList[this.languageType] || 'Language' }, @@ -421,24 +426,6 @@ export default { } }, - msgAllUnread() { - if (this.$Electron) { - this.$Electron.ipcRenderer.send('setDockBadge', this.msgAllUnread + this.dashboardTotal + this.reportUnreadNumber); - } - }, - - dashboardTotal() { - if (this.$Electron) { - this.$Electron.ipcRenderer.send('setDockBadge', this.msgAllUnread + this.dashboardTotal + this.reportUnreadNumber); - } - }, - - reportUnreadNumber() { - if (this.$Electron) { - this.$Electron.ipcRenderer.send('setDockBadge', this.msgAllUnread + this.dashboardTotal + this.reportUnreadNumber); - } - }, - projectKeyValue(val) { if (val == '') { return; @@ -468,6 +455,15 @@ export default { }, 5000) }, + unreadTotal: { + handler(num) { + if (this.$Electron) { + this.$Electron.ipcRenderer.send('setDockBadge', num); + } + }, + immediate: true + }, + wsMsg: { handler(info) { const {type, action} = info; diff --git a/resources/assets/sass/pages/page-manage.scss b/resources/assets/sass/pages/page-manage.scss index 3da3ef2f..46abc6e4 100644 --- a/resources/assets/sass/pages/page-manage.scss +++ b/resources/assets/sass/pages/page-manage.scss @@ -298,6 +298,13 @@ } .manage-mini-menu { display: none; + position: relative; + .ivu-badge { + position: absolute; + top: -6px; + left: 30px; + transform: scale(0.9); + } } }