事件分类,上报排名

src/api/forest.js

@@ -56,3 +56,19 @@ export function getEventByCalendar(param) {
     data: param
   })
 }
+// 获取事件分类
+export function getEventByEventType(param) {
+  return request({
+    url: '/center-fire/VisuForestCloudMapController/getEventByEventType',
+    method: 'post',
+    data: param
+  })
+}
+// 获取上报排名
+export function getEventByReportorOrder(param) {
+  return request({
+    url: '/center-fire/VisuForestCloudMapController/getEventByReportorOrder',
+    method: 'post',
+    data: param
+  })
+}

src/views/eventdetailsdialog.vue

@@ -229,6 +229,7 @@ export default {
       getEventDetail({ eventCode: eventCode }).then(res => {
         this.eventDialog = true
         this.eventlog=res.data.eventlog
+        console.log(this.eventlog)
         if(res.data.catalogue!=null&&res.data.catalogue.length>0){
           let markersMap = {
             lng: 124.59,

src/views/forest.vue

@@ -104,7 +104,8 @@
       </div>
       <!-- 地图 -->
       <supermap ref="supermap" style="width: 100%;height: 100vh;" :mapDiv="'forestMap'" :dynamicPlotting="false"
-                :mapSite="{doubleClickZoom:false}" :codes="['9fa5']" :isSideBySide="false" @showEventDialog="showEventDialog"></supermap>
+                :mapSite="{doubleClickZoom:false}" :codes="['9fa5']" :isSideBySide="false"
+                @showEventDialog="showEventDialog"></supermap>
       <!-- 右侧 -->
       <div class="rightbar rightbar-index" ref="right">
         <div class="right-item1">
@@ -201,31 +202,31 @@
                     <div v-if="item.eventStatusValue=='forest_event_status_2'" class="event-state-qs">
                       <i class="el-icon-caret-left"></i>
                       <div class="event-list-state-qs">
-                      签收
+                        签收
                       </div>
                     </div>
                     <div v-if="item.eventStatusValue=='forest_event_status_3'" class="event-state-wb">
                       <i class="el-icon-caret-left"></i>
                       <div class="event-list-state-wb">
-                      误报
+                        误报
                       </div>
                     </div>
                     <div v-if="item.eventStatusValue=='forest_event_status_4'" class="event-state-cf">
                       <i class="el-icon-caret-left"></i>
                       <div class="event-list-state-cf">
-                      重复
+                        重复
                       </div>
                     </div>
                     <div v-if="item.eventStatusValue=='forest_event_status_5'" class="event-state-bj">
                       <i class="el-icon-caret-left"></i>
                       <div class="event-list-state-bj">
-                      办结
+                        办结
                       </div>
                     </div>
                     <div v-if="item.eventStatusValue=='forest_event_status_6'" class="event-state-gd">
                       <i class="el-icon-caret-left"></i>
                       <div class="event-list-state-gd">
-                      归档
+                        归档
                       </div>
                     </div>
                     <div class="bgt-info-name">{{ item.reportor }}</div>
@@ -299,7 +300,9 @@ import {
   getTodayEvents,
   getDeptEventCount,
   getWeather,
-  getEventList
+  getEventList,
+  getEventByEventType,
+  getEventByReportorOrder
 } from '@/api/forest'
 import supermap from '@/components/supermap' //超图
 import supermapNotProcessed from '@/components/supermap' //超图
@@ -320,7 +323,6 @@ import DHWs from '@/dahua/lib/DHWs'
 
 let echarts = require('echarts')
 export default {
-  dicts: ['event_source'],
   components: {
     supermap,
     supermapNotProcessed,
@@ -349,6 +351,8 @@ export default {
     this.getDeptEventCount(this.getCurrentDataStr())
     this.getWeather(this.getCurrentDataStr())
     this.getEventList(this.getCurrentDataStr())
+    this.getEventByEventType(this.getCurrentDataStr())
+    this.getEventByReportorOrder(this.getCurrentDataStr())
     /** ----------------------------------weosocket开始------------------------------------- */
     // this.initWebSocket()
     /** ----------------------------------weosocket结束------------------------------------- */
@@ -386,65 +390,10 @@ export default {
 
       listCurrentIndex1: '',
       // ----------------------------------事件分类柱状----------------------------------------
-      eventKind: {
-        data: [
-          {
-            name: '森林防火',
-            value: 167
-          },
-          {
-            name: '病虫灾害',
-            value: 123
-          },
-          {
-            name: '乱砍乱伐',
-            value: 98
-          },
-          {
-            name: '动物保护',
-            value: 75
-          },
-          {
-            name: '偷盗偷猎',
-            value: 66
-          }
-        ],
-        colors: ['#1ce0a9', '#d6333b', '#e68d3f', '#32c5e9', '#2abc65'],
-        unit: '',
-        showValue: true
-      },
+      eventKind: {},
       // ----------------------------------上报排行----------------------------------------
       reportList: {
-        data: [
-          {
-            name: '周口',
-            value: 55
-          },
-          {
-            name: '南阳',
-            value: 120
-          },
-          {
-            name: '西峡',
-            value: 78
-          },
-          {
-            name: '驻马店',
-            value: 66
-          },
-          {
-            name: '新乡',
-            value: 80
-          },
-          {
-            name: '信阳',
-            value: 45
-          },
-          {
-            name: '漯河',
-            value: 29
-          }
-        ]
+        data: []
       },
       eventSearch: '',//事件列表搜索
       /** ----------------------------------weosocket开始------------------------------------- */
@@ -490,6 +439,8 @@ export default {
       this.getDeptEventCount(day)
       this.getWeather(day)
       this.getEventList(day)
+      this.getEventByEventType(day)
+      this.getEventByReportorOrder(day)
     },
 
     //事件数量统计chart 样例地址http://192.144.199.210:8080/editor/index.html?chart_id=jTXf0Rv4A3oiBONB
@@ -743,10 +694,10 @@ export default {
             } else if (this.eventList[i].eventStatusValue == 'event_event_status_4') {
               markersMap.click = 'showEventDialog'
               markersMap.icon = 'sj-icon-map-wcl'
-            }else if (this.eventList[i].eventStatusValue == 'event_event_status_5') {
+            } else if (this.eventList[i].eventStatusValue == 'event_event_status_5') {
               markersMap.click = 'showEventDialog'
               markersMap.icon = 'sj-icon-map-wcl'
-            }else if (this.eventList[i].eventStatusValue == 'event_event_status_6') {
+            } else if (this.eventList[i].eventStatusValue == 'event_event_status_6') {
               markersMap.click = 'showEventDialog'
               markersMap.icon = 'sj-icon-map-wcl'
             } else {
@@ -794,6 +745,35 @@ export default {
         }
       })
     },
+    getEventByEventType(day) {
+      let that = this
+      //右侧获取事件分类
+      getEventByEventType({ day: day }).then(res => {
+        if (res.data != null && res.data.length > 0) {
+          this.eventKind.data = res.data
+          this.eventKind.colors = ['#1ce0a9', '#d6333b', '#e68d3f', '#32c5e9', '#2abc65']
+          this.eventKind.showValue = true
+          this.eventKind = { ...this.eventKind }
+        } else {
+          this.eventKind={}
+          this.eventKind = { ...this.eventKind }
+        }
+        console.log(this.eventKind)
+      })
+    },
+    getEventByReportorOrder(day) {
+      let that = this
+      //右侧获取上报排名
+      getEventByReportorOrder({ day: day }).then(res => {
+        if (res.data != null && res.data.length > 0) {
+          this.reportList.data = res.data
+          this.reportList = { ...this.reportList }
+        } else {
+          this.reportList.data = []
+          this.reportList = { ...this.reportList }
+        }
+      })
+    },
     /** ----------------------------------weosocket开始------------------------------------- */
     initWebSocket() { //初始化weosocket
       const wsuri = 'wss://www.hmzzxc.com:10012/websocket/forest-' + Cookies.get('username')
@@ -845,44 +825,44 @@ export default {
     },
     /** ----------------------------------weosocket结束------------------------------------- */
 
-     /** ----------------------------------底部按钮公用组件开始------------------------------------- */
-        showDialog(click) {
-          if (click == 'eventLocation') {
-            this.$refs.eventLocation.showEventLocation()
-            this.$refs.supermap.isEditableLayers = false
-            this.$refs.bottomMenu.showChild = false
-    		this.$refs.bottomMenu.showBanChild = false
-          } else if (click == 'editableLayers') {
-            this.$refs.bottomMenu.showChild = false
-    		this.$refs.bottomMenu.showBanChild = false
-            if (!this.$refs.supermap.isEditableLayers) {
-              this.$refs.supermap.isEditableLayers = true
-            } else {
-              this.$refs.supermap.isEditableLayers = false
-            }
-          } else if (click == 'layerSwitching') {
-            this.$refs.supermap.isEditableLayers = false
-    		this.$refs.bottomMenu.showBanChild = false
-            if (!this.$refs.bottomMenu.showChild) {
-              this.$refs.bottomMenu.showChild = true
-            } else {
-              this.$refs.bottomMenu.showChild = false
-            }
-          } else if (click == 'TVWall') {
-            this.$refs.TVWall.showTVWall()
-            this.$refs.supermap.isEditableLayers = false
-            this.$refs.bottomMenu.showChild = false
-    		this.$refs.bottomMenu.showBanChild = false
-          }  else if (click == 'forestban') {
-    		    this.$refs.bottomMenu.showBanChild = true
-            this.$refs.supermap.isEditableLayers = false
-    		this.$refs.bottomMenu.showChild = false
-            if (!this.$refs.bottomMenu.showBanChild) {
-              this.$refs.bottomMenu.showBanChild = false
-            } 
-          }
-    			
-        },
+    /** ----------------------------------底部按钮公用组件开始------------------------------------- */
+    showDialog(click) {
+      if (click == 'eventLocation') {
+        this.$refs.eventLocation.showEventLocation()
+        this.$refs.supermap.isEditableLayers = false
+        this.$refs.bottomMenu.showChild = false
+        this.$refs.bottomMenu.showBanChild = false
+      } else if (click == 'editableLayers') {
+        this.$refs.bottomMenu.showChild = false
+        this.$refs.bottomMenu.showBanChild = false
+        if (!this.$refs.supermap.isEditableLayers) {
+          this.$refs.supermap.isEditableLayers = true
+        } else {
+          this.$refs.supermap.isEditableLayers = false
+        }
+      } else if (click == 'layerSwitching') {
+        this.$refs.supermap.isEditableLayers = false
+        this.$refs.bottomMenu.showBanChild = false
+        if (!this.$refs.bottomMenu.showChild) {
+          this.$refs.bottomMenu.showChild = true
+        } else {
+          this.$refs.bottomMenu.showChild = false
+        }
+      } else if (click == 'TVWall') {
+        this.$refs.TVWall.showTVWall()
+        this.$refs.supermap.isEditableLayers = false
+        this.$refs.bottomMenu.showChild = false
+        this.$refs.bottomMenu.showBanChild = false
+      } else if (click == 'forestban') {
+        this.$refs.bottomMenu.showBanChild = true
+        this.$refs.supermap.isEditableLayers = false
+        this.$refs.bottomMenu.showChild = false
+        if (!this.$refs.bottomMenu.showBanChild) {
+          this.$refs.bottomMenu.showBanChild = false
+        }
+      }
+
+    },
     //选择图层
     choseLayerSwitching(url) {
       this.$refs.supermap.layerSwitching(url, true)