球机

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>
@@ -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

src/views/monitor.vue

@@ -351,7 +351,7 @@
         }, 5000)
       },
       /* 电视墙替换开始 */
-      showTVWall(channelCode, channelName) {
+      showTVWall(channelCode, channelName,type) {
         let tvListJson = [{
           "switchTab": "2",
           "treeLabels": [{
@@ -365,7 +365,7 @@
               "id": "spcamera00010",
               "labelCode": channelCode,
               "labelName": channelName,
-              "cameraType": "1",
+              "cameraType": type,
               "parentLabelCode": "999"
             }
           ],
@@ -375,7 +375,7 @@
               "channelCode": channelCode,
               "channelName": channelName,
               "channelSn": null,
-              "cameraType": "1",
+              "cameraType": type,
               "online": "1",
               "cameraCode": "1"
             }]
@@ -1320,7 +1320,7 @@
                 markersMap.parameter = {
                   code: res.data.visuForestCloudCameraBOList[i].cameraCode,
                   name: res.data.visuForestCloudCameraBOList[i].cameraName,
-                  type: res.data.visuForestCloudCameraBOList[i].cameraFactory
+                  type: res.data.visuForestCloudCameraBOList[i].cameraType
                 }
               } else {
                 markersMap.parameter = []
@@ -1426,7 +1426,7 @@
                 markersMap.parameter = {
                   code: res.data[i].cameraCode,
                   name: res.data[i].cameraName,
-                  type: res.data[i].cameraFactory
+                  type: res.data[i].cameraType
                 }
               } else {
                 markersMap.parameter = []
@@ -1529,7 +1529,8 @@
       },
       /** 预览按钮操作 */
       preview(cameraParam) {
-        this.showTVWall(cameraParam.code, cameraParam.name);
+        this.showTVWall(cameraParam.code, cameraParam.name,cameraParam.type);
+
       },
 
       /** 预览按钮操作 */