修改

src/components/TVWall.vue

@@ -403,7 +403,7 @@
           'domId': 'dom1'
         }]
         if(array1 != undefined && array1 != null ){
-          params.ctrlProperty.splitNum = (array1.length == 1 ? 1 : 4)
+          params[0].ctrlProperty.splitNum = (array1.length == 1 ? 1 : 4)
         }
         this.setPos()
         this.customizeTree(tvListJson);

src/components/vBottomMenu.vue

@@ -194,11 +194,11 @@
               </div>
             </div>
             <div class="btm-r-pop-info-btm">
-              <el-link type="success" v-if="item.eventCode!=null" @click="showEventDialog_message(item.eventCode)">
+              <el-link type="success" v-if="item.eventCode!=null&&item.type ==1" @click="showEventDialog_message(item.eventCode)">
                 查看事件详情
               </el-link>
               <div class="btm-r-pop-info-btm-btn">
-                <el-button type="primary" @click="selectMessageById(item.id)">标记已读
+                <el-button type="primary" v-if="item.type ==2" @click="selectMessageById(item.id)">标记已读
                 </el-button>
               </div>
             </div>
@@ -468,14 +468,14 @@
                     <div class="this-con h-25 no-padding">
                       <div class="z-info-list" style="margin-top: 0;">
                         <div class="z-info-btm-grp">
-<!--                          <div class="z-info-btm-grp-top">-->
-<!--                            <div class="z-info-btm-grp-left">-->
-<!--                              <el-button size="small" icon="el-icon-upload" @click="showEventLogUpload()">上传-->
-<!--                              </el-button>-->
-<!--                              <el-button size="small" icon="el-icon-download" @click="toImage()">截图上传-->
-<!--                              </el-button>-->
-<!--                            </div>-->
-<!--                          </div>-->
+                          <!--                          <div class="z-info-btm-grp-top">-->
+                          <!--                            <div class="z-info-btm-grp-left">-->
+                          <!--                              <el-button size="small" icon="el-icon-upload" @click="showEventLogUpload()">上传-->
+                          <!--                              </el-button>-->
+                          <!--                              <el-button size="small" icon="el-icon-download" @click="toImage()">截图上传-->
+                          <!--                              </el-button>-->
+                          <!--                            </div>-->
+                          <!--                          </div>-->
                           <div class="z-info-btm-input">
                             <el-input type="textarea" v-model="eventLog" :autosize="{ minRows: 7, maxRows: 7}"
                                       placeholder="请输入反馈信息">
@@ -914,8 +914,8 @@ export default {
         this.messageList = response.data
         this.messageCount = response.data.length
       })
-        this.initWebSocket('MESSAGE_SOCKET', '/messagePush/', this.websockSid.userId)
-        this.initWebSocket('MESSAGE_SOCKET', '/messageDeptPush/', this.websockSid.deptId)
+      this.initWebSocket('MESSAGE_SOCKET', '/messagePush/', this.websockSid.userId)
+      this.initWebSocket('MESSAGE_SOCKET', '/messageDeptPush/', this.websockSid.deptId)
 
     },
     filterbanNode(value, data) {
@@ -1367,6 +1367,7 @@ export default {
             if (res.code == 200) {
               that.$message.success(`处理成功!`)
               that.refreshEvent(that.eventCode)
+              that.selectMessageList()
               that.cancelEventConfirm_send()
               that.showEventConfirm = false
             } else if (res.code == 304) {
@@ -1403,6 +1404,7 @@ export default {
             if (res.code == 200) {
               that.$message.success(`处理成功!`)
               that.refreshEvent(that.eventCode)
+              that.selectMessageList()
               that.cancelEventConfirm_send()
               that.showEventConfirm = false
             } else if (res.code == 304) {
@@ -1426,7 +1428,6 @@ export default {
         eventCode: eventCode
       }).then(res => {
         let markersMapList = [];
-        that.eventDialog = true
         that.eventLogList = res.data.eventlog
         that.visuForestCloudYuAnBo = res.data.visuForestCloudYuAnBo //应急预案
         that.address = res.data.catalogue.address