Browse Source

事件详情日志上传文件展示

彭宇 2 years ago
parent
commit
859b616374
2 changed files with 25 additions and 16 deletions
  1. 22 15
      src/views/eventdetailsdialog.vue
  2. 3 1
      src/views/forest.vue

+ 22 - 15
src/views/eventdetailsdialog.vue

@@ -112,8 +112,8 @@
                           <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-s-flag">责任制
-                                </el-button>
+<!--                                <el-button size="small" icon="el-icon-s-flag">责任制-->
+<!--                                </el-button>-->
                                 <el-button size="small" icon="el-icon-upload" @click="showEventLogUpload()">上传
                                 </el-button>
                                 <el-button size="small" icon="el-icon-download" @click="toImage()">保存
@@ -955,6 +955,9 @@ export default {
 
     }
   },
+  props:{
+    calendarDay:null//首页日历选择
+  },
   methods: {
     // 判断是否为图片
     isAssetTypeAnImage(filePath) {
@@ -1185,7 +1188,7 @@ export default {
             if (res.code == 200) {
               this.$message.success(`联动发起成功!`)
               this.refreshEventDialog(this.eventCode);
-              this.showEventConfirm = false
+              this.showEventConfirm_gd = false
             }
           })
 
@@ -1202,11 +1205,13 @@ export default {
             fireRadius: this.sendHuoZaiBanJing,
             reserve: this.sendGuanLianYuAn
           }
-          sendTask(param).then(res => {
+          updateCentereventTEventcatalogueStatus(param).then(res => {
             if (res.code == 200) {
-              this.$message.success(`办结成功!`)
+              this.$message.success(`处理成功!`)
               this.refreshEvent(this.eventCode)
-              this.showEventConfirm_gd = false
+              this.showEventConfirm = false
+              this.$emit("getEventList",this.calendarDay)
+              this.$emit("getTodayEvents",this.calendarDay)
             }
           })
 
@@ -1228,6 +1233,9 @@ export default {
               this.$message.success(`处理成功!`)
               this.refreshEvent(this.eventCode)
               this.showEventConfirm = false
+              alert(this.calendarDay)
+              this.$emit("getEventList",this.calendarDay)
+              this.$emit("getTodayEvents",this.calendarDay)
             }
           })
         }
@@ -1312,17 +1320,16 @@ export default {
             isAggregation: false,
             radius: 0
           }
-          if (res.data.catalogue[0].eventStatusValue == 'forest_event_status_1' || res.data.catalogue[0].eventStatusValue == 'forest_event_status_2' || res.data.catalogue[0].eventStatusValue == 'forest_event_status_3') {
-            markersMap.icon = 'sj-icon-map-clz'
-            markersMap.isAggregation = false
-          } else if (res.data.catalogue[0].eventStatusValue == 'event_event_status_4') {
-            markersMap.icon = 'sj-icon-map-wcl'
-          } else if (res.data.catalogue[0].eventStatusValue == 'event_event_status_5') {
+
+          if (res.data.catalogue[0].eventStatusValue == 'forest_event_status_1') {
             markersMap.icon = 'sj-icon-map-wcl'
+            markersMap.isAggregation = false
+          } else if ( res.data.catalogue[0].eventStatusValue == 'forest_event_status_2' || res.data.catalogue[0].eventStatusValue == 'forest_event_status_3' || res.data.catalogue[0].eventStatusValue == 'event_event_status_4' || res.data.catalogue[0].eventStatusValue == 'event_event_status_5') {
+            markersMap.icon = 'sj-icon-map-clz'
           } else if (res.data.catalogue[0].eventStatusValue == 'event_event_status_6') {
-            markersMap.icon = 'sj-icon-map-wcl'
-          } else {
             markersMap.icon = 'sj-icon-map-ywc'
+          } else {
+            markersMap.icon = 'sj-icon-map-clz'
           }
           markersMap.lng = res.data.catalogue[0].longitude
           markersMap.lat = res.data.catalogue[0].latitude
@@ -1436,7 +1443,7 @@ export default {
       a.href = url
       a.download = '首页截图'
       a.click()
-    }
+    },
   }
 }
 </script>

+ 3 - 1
src/views/forest.vue

@@ -288,7 +288,7 @@
       </div>
       <vBottomMenu ref="bottomMenu"></vBottomMenu>
     </div>
-    <eventdetailsdialog ref="eventdetailsdialog"></eventdetailsdialog>
+    <eventdetailsdialog ref="eventdetailsdialog" :calendarDay="calendarDay" @getEventList="getEventList" @getTodayEvents="getTodayEvents"></eventdetailsdialog>
     <eventLocation ref="eventLocation"></eventLocation>
     <TVWall ref="TVWall"></TVWall>
   </div>
@@ -367,6 +367,7 @@ export default {
   },
   data() {
     return {
+      calendarDay:this.getCurrentDataStr(),
       //基本情况
       forestInfo: '', //基本情况
       //左侧获取事件信息统计
@@ -540,6 +541,7 @@ export default {
       this.getEventByEventType(day)
       this.getEventByReportorOrder(day)
       this.getExposureStage(day)
+      this.calendarDay=day
     },
 
     //事件数量统计chart 样例地址http://192.144.199.210:8080/editor/index.html?chart_id=jTXf0Rv4A3oiBONB