Browse Source

模型文件管理问题处理

zhangyu 5 năm trước cách đây
mục cha
commit
40d6dd6280

+ 1 - 1
src/assets/scss/point/point_config/common.scss

@@ -109,7 +109,7 @@ body .htFiltersConditionsMenu:not(.htGhostTable) {
     cursor: pointer;
 }
 
-@media screen and (max-width: 1200px) {
+@media screen and (max-width: 1366px) {
     .w {
         width: 560px;
     }

+ 1 - 1
src/assets/scss/point/point_config/reset.scss

@@ -1,4 +1,4 @@
-$WinWitdh:1200px;
+$WinWitdh:1366px;
 $BaseC:#555;
 $LinkC:#06f;
 $HoverC:#f60;

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

@@ -2,7 +2,7 @@
  * @Author: zhangyu
  * @Date: 2019-08-26 15:22:13
  * @Info: 
- * @LastEditTime: 2019-11-13 15:46:29
+ * @LastEditTime : 2020-01-03 10:59:36
  -->
 <template>
   <div class="notification-box" v-clickOutside="handleClose" @click="handleClickRead">
@@ -118,7 +118,7 @@ export default {
             Name: "project"
           }
         ],
-        Filters: `UserId='${this.userId}'`,
+        Filters: `UserId='${this.userId}';Type!='Refresh'`,
         Orders: "CreateTime desc, Id asc",
         PageNumber: 1,
         PageSize: 10
@@ -129,7 +129,7 @@ export default {
     },
     getUnreadCount() {//获取未读消息的数量
       let params = {
-        Filters: `Read=false;UserId='${this.userId}'`
+        Filters: `Read=false;UserId='${this.userId}';Type!='Refresh'`
       }
       messgeCount(params, res => {
         this.unreadNum = res.Count

+ 11 - 9
src/framework/components/messagesever/msmq.js

@@ -23,15 +23,17 @@ const MSMQ = {
         if(data.Module && data.Module == 'Model'){ //模型文件的消息触发模型文件列表刷新事件
           Bus.$emit('modelStatusChange', data)
         }
-        Notification({ 
-          title: `${data.Title?data.Title:''}`, 
-          dangerouslyUseHTMLString: true, 
-          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>` })
-        unreadNum++
-        Bus.$emit('messageListUpdate', data)//消息驱动消息列表刷新
+        if(data.Type != 'Refresh'){//消息列表可见消息(注类型为'Refresh'的消息用来驱动对应服务刷新,消息中心[用户]不可见)
+          Notification({ 
+            title: `${data.Title?data.Title:''}`, 
+            dangerouslyUseHTMLString: true, 
+            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>` })
+          unreadNum++
+          Bus.$emit('messageListUpdate', data)//消息驱动消息列表刷新
+        }
         return unreadNum
       }
     }

+ 2 - 2
src/utils/handsontable/notShow.js

@@ -1002,7 +1002,7 @@ const showTools = {
         ) {
             return {
                 data: item.Path,
-                renderer: text.picType,
+                renderer: text.picType(...{},onlyRead),
                 readOnly: onlyRead
             }
         }
@@ -1097,7 +1097,7 @@ const showTools = {
         ) {
             return {
                 data: item.Path,
-                renderer: text.picType,
+                renderer: text.picType(...{},onlyRead),
                 readOnly: !item.Editable
             }
         }