Kaynağa Gözat

消息通知相关修改

zhangyu 5 yıl önce
ebeveyn
işleme
b663a31c93

+ 4 - 3
src/framework/components/messagesever/index.vue

@@ -2,7 +2,7 @@
  * @Author: zhangyu
  * @Date: 2019-08-26 15:22:13
  * @Info: 
- * @LastEditTime: 2019-10-25 19:57:48
+ * @LastEditTime: 2019-10-28 11:36:09
  -->
 <template>
   <div class="notification-box" v-clickOutside="handleClose" @click="handleClickRead">
@@ -103,6 +103,7 @@ export default {
   methods:{
     getMessageList(){//获取消息列表(最新10条)
       let params = {
+        Filters: `UserId='${this.userId}'`,
         Orders: "CreateTime desc, Id asc",
         PageNumber: 1,
         PageSize: 10
@@ -113,7 +114,7 @@ export default {
     },
     getUnreadCount(){//获取未读消息的数量
       let params = {
-        Filters: `Read=false`
+        Filters: `Read=false;UserId='${this.userId}'`
       }
       messgeCount(params, res => {
         this.unreadNum = res.Count
@@ -209,7 +210,7 @@ export default {
       left: 50%;
       margin-left: -220px;
       cursor: auto;
-      z-index: 9999;
+      z-index: 1000;
       text-align: left;
       width: 272px;
       height: 362px;

+ 4 - 5
src/framework/components/messagesever/msmq.js

@@ -18,16 +18,15 @@ const MSMQ = {
     } catch (err) {
       return false
     }
-
-    if(data.projectId && projects.some((item) => {return item.id == data.projectId})) { //判断消息是否是当前用户拥有的项目
+    if(data.ProjectId && projects.some((item) => {return item.id == data.ProjectId})) { //判断消息是否是当前用户拥有的项目
       if(!data.UserList || (userId && data.UserList && data.UserList.includes(userId))){//判断消息接收人是否是当前用户
         if(data.Module && data.Module == 'Model'){ //模型文件的消息触发模型文件列表刷新事件
           Bus.$emit('modelStatusChange', data)
         }
-        Notification.$notify({ 
-          title: `【${this.moduleMap[data.Module]?this.moduleMap[data.Module]:data.Module}}】${data.Title?data.Title:''}`, 
+        Notification({ 
+          title: `${data.Title?data.Title:''}`, 
           dangerouslyUseHTMLString: true, 
-          message: data.Content?data.Content.Message?data.Content.Message:'':'',
+          message: `【${this.moduleMap[data.Module]?this.moduleMap[data.Module]:data.Module}】${data.Content?data.Content.Message?data.Content.Message:'':''}`,
           type: this.msgTypeMap[data.Type]?this.msgTypeMap[data.Type]:'info'
         })
         // Notification.info({ title: '消息',dangerouslyUseHTMLString: true, message: `项目编号:${data.projectId}<br>消息类型:${data.type}<br>描述信息:${data.description}<br>` })