qinhouyu 1 year ago
parent
commit
ca30d449e4
2 changed files with 4 additions and 3 deletions
  1. 2 1
      src/components/vBottomMenu.vue
  2. 2 2
      src/views/monitor.vue

+ 2 - 1
src/components/vBottomMenu.vue

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

+ 2 - 2
src/views/monitor.vue

@@ -1113,7 +1113,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 = []
@@ -1217,7 +1217,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 = []