diff --git a/dvadmin-backend/apps/vadmin/system/views.py b/dvadmin-backend/apps/vadmin/system/views.py index a35338f..e2beb55 100644 --- a/dvadmin-backend/apps/vadmin/system/views.py +++ b/dvadmin-backend/apps/vadmin/system/views.py @@ -200,7 +200,7 @@ class MessagePushModelViewSet(CustomModelViewSet): serializer_class = MessagePushSerializer create_serializer_class = MessagePushCreateUpdateSerializer update_serializer_class = MessagePushCreateUpdateSerializer - extra_filter_backends = [DataLevelPermissionsFilter] + # extra_filter_backends = [DataLevelPermissionsFilter] update_extra_permission_classes = (CommonPermission,) destroy_extra_permission_classes = (CommonPermission,) create_extra_permission_classes = (CommonPermission,) diff --git a/dvadmin-ui/src/layout/components/Navbar.vue b/dvadmin-ui/src/layout/components/Navbar.vue index c300c63..76e7800 100755 --- a/dvadmin-ui/src/layout/components/Navbar.vue +++ b/dvadmin-ui/src/layout/components/Navbar.vue @@ -14,7 +14,7 @@
- +
@@ -81,11 +81,11 @@ export default { }, data() { return { - count: store.getters.unread_msg_count, + count: store.unread_msg_count, }; }, computed: { - ...mapGetters(["sidebar", "avatar", "device"]), + ...mapGetters(["sidebar", "avatar", "device", "unread_msg_count"]), setting: { get() { return this.$store.state.settings.showSettings; diff --git a/dvadmin-ui/src/store/modules/user.js b/dvadmin-ui/src/store/modules/user.js index 895a689..9e4b5a5 100755 --- a/dvadmin-ui/src/store/modules/user.js +++ b/dvadmin-ui/src/store/modules/user.js @@ -7,7 +7,8 @@ const user = { name: '', avatar: '', roles: [], - permissions: [] + permissions: [], + unread_msg_count: 0 }, mutations: { diff --git a/dvadmin-ui/src/views/vadmin/system/message/Mymessage.vue b/dvadmin-ui/src/views/vadmin/system/message/Mymessage.vue index 1bbcd87..43a2581 100644 --- a/dvadmin-ui/src/views/vadmin/system/message/Mymessage.vue +++ b/dvadmin-ui/src/views/vadmin/system/message/Mymessage.vue @@ -103,9 +103,11 @@ // 修改通知查询状态 if (this.badgeType === "danger") { updateIsRead(this.showingMsgItem).then(response => { - store.getters.unread_msg_count - this.open = false; - this.getList(); + if(response.code === 200){ + store.commit('SET_UNREAD_MSG_COUNT', store.getters.unread_msg_count - 1); + this.open = false; + this.getList(); + } }); } }