|
@@ -388,12 +388,12 @@
|
|
|
<div class="forthis">
|
|
|
<dv-border-box-13 backgroundColor="rgba(12, 19, 38, .90)" style="padding-bottom: 1rem;">
|
|
|
<img src="../assets/images/integrated/light.png" style="width: 100%; margin-top: .4rem;"/>
|
|
|
- <div class="this-title">
|
|
|
+ <div class="this-title" style="cursor: pointer" @click="setEventTypeId({eventTypeIdDl: [], eventTypeId: []})">
|
|
|
<span>事件分类</span>
|
|
|
<dv-decoration-3 style="width:150px;height:15px;margin-right: 1rem;"/>
|
|
|
</div>
|
|
|
<div class="i-list-con small-bottom-margin h-19">
|
|
|
- <dv-capsule-chart v-if="showEventKind" :config="eventKind"
|
|
|
+ <chart v-if="showEventKind" :config="eventKind" @setEventTypeId="setEventTypeId"
|
|
|
style="width: 90%;height: 18vh; padding:.5rem 1rem"/>
|
|
|
</div>
|
|
|
</dv-border-box-13>
|
|
@@ -459,7 +459,6 @@ import eventLocation from '@/components/eventLocation.vue' //事件定位弹窗
|
|
|
import TVWall from '@/components/TVWall.vue' //电视墙弹窗
|
|
|
import eventdetailsdialog from '@/views/eventdetailsdialog.vue' //事件详情弹窗
|
|
|
import firespread from '@/views/firespread.vue' //事件详情弹窗
|
|
|
-
|
|
|
/** ----------------------------------摄像头预览开始------------------------------------- */
|
|
|
import {
|
|
|
getDahuaVideoServer
|
|
@@ -468,7 +467,7 @@ import {
|
|
|
import Firespread from './firespread'
|
|
|
|
|
|
/** ----------------------------------摄像头预览结束------------------------------------- */
|
|
|
-
|
|
|
+import chart from "./from/dvCapsuleChart.vue";
|
|
|
let echarts = require('echarts')
|
|
|
export default {
|
|
|
components: {
|
|
@@ -479,6 +478,7 @@ export default {
|
|
|
vheader,
|
|
|
vBottomMenu,
|
|
|
eventLocation,
|
|
|
+ chart,
|
|
|
TVWall,
|
|
|
dateChoose,
|
|
|
eventdetailsdialog,
|
|
@@ -573,6 +573,8 @@ export default {
|
|
|
/** ----------------------------------weosocket开始------------------------------------- */
|
|
|
weosocket: false,
|
|
|
websock: '',
|
|
|
+ eventTypeIdDl:[],
|
|
|
+ eventTypeId:[],
|
|
|
setIntervalWesocketPush: null,
|
|
|
/** ----------------------------------weosocket结束------------------------------------- */
|
|
|
/** ----------------------------------摄像头预览开始------------------------------------- */
|
|
@@ -595,6 +597,21 @@ export default {
|
|
|
},
|
|
|
/** ----------------------------------weosocket结束------------------------------------- */
|
|
|
methods: {
|
|
|
+ setEventTypeId(data) {
|
|
|
+ // let data = {eventTypeIdDl: [], eventTypeId: []}
|
|
|
+ // let data = {eventTypeIdDl: that.eventTypeIdDl, eventTypeId: that.eventTypeId}
|
|
|
+ let that = this
|
|
|
+ that.eventTypeIdDl = data.eventTypeIdDl
|
|
|
+ that.eventTypeId = data.eventTypeId
|
|
|
+ that.getSupermap(that.calendarDay, false)
|
|
|
+ that.getTodayEvents(that.calendarDay, false)
|
|
|
+ that.getEventByEventType(that.calendarDay, false)
|
|
|
+ that.getExposureStage(that.calendarDay, false)
|
|
|
+ that.getEventByReportorOrder(that.calendarDay, false)
|
|
|
+ that.getDeptEventCount(that.calendarDay, false)
|
|
|
+ that.getEventList(that.calendarDay, that.pageSize, that.pageNum, '', false)
|
|
|
+ },
|
|
|
+
|
|
|
// searchEvent(pageSize,pageNum,eventSearch) {
|
|
|
// this.pageSize = pageSize;
|
|
|
// this.pageNum = pageNum;
|
|
@@ -833,7 +850,7 @@ export default {
|
|
|
getTodayEvents(day, loading) {
|
|
|
let that = this
|
|
|
//左侧获取事件信息统计
|
|
|
- getTodayEvents({ day: day }, loading).then(res => {
|
|
|
+ getTodayEvents({eventTypeIdDl: that.eventTypeIdDl,eventTypeId: that.eventTypeId,day: day}, loading).then(res => {
|
|
|
this.aiTotal = res.data.aiTotal
|
|
|
this.aiTotal_pre = res.data.aiTotal_pre
|
|
|
this.newReport = res.data.newReport
|
|
@@ -852,7 +869,7 @@ export default {
|
|
|
getDeptEventCount(day, loading) {
|
|
|
let that = this
|
|
|
//左侧获取事件部门数量
|
|
|
- getDeptEventCount({ day: day }, loading).then(res => {
|
|
|
+ getDeptEventCount({eventTypeIdDl: that.eventTypeIdDl,eventTypeId: that.eventTypeId,day: day}, loading).then(res => {
|
|
|
this.forestFarm = res.data
|
|
|
})
|
|
|
},
|
|
@@ -882,7 +899,7 @@ export default {
|
|
|
},
|
|
|
getSupermap(day, loading) {
|
|
|
let that = this
|
|
|
- getNearEvent('', '', day, loading).then(res => {
|
|
|
+ getNearEvent('', '', day, loading, that.eventTypeIdDl, that.eventTypeId).then(res => {
|
|
|
that.markersList = []
|
|
|
if (res.data != null && res.data.length > 0) {
|
|
|
for (let i = 0; i < res.data.length; i++) {
|
|
@@ -981,7 +998,7 @@ export default {
|
|
|
let that = this
|
|
|
this.eventList = []
|
|
|
//右侧获取事件列表
|
|
|
- getEventList({ day: day, pageSize: pageSize, pageNum: pageNum, eventName: eventSearch }, loading).then(res => {
|
|
|
+ getEventList({eventTypeIdDl: that.eventTypeIdDl,eventTypeId: that.eventTypeId, day: day, pageSize: pageSize, pageNum: pageNum, eventName: eventSearch}, loading).then(res => {
|
|
|
this.eventList = res.data
|
|
|
if (this.eventList != null && this.eventList.length > 0) {
|
|
|
if (this.eventList[0].eventStatusValue == 'forest_event_status_1') {
|
|
@@ -996,24 +1013,24 @@ export default {
|
|
|
getEventByEventType(day, loading) {
|
|
|
let that = this
|
|
|
//右侧获取事件分类
|
|
|
- getEventByEventType({ day: day }, loading).then(res => {
|
|
|
+ getEventByEventType({eventTypeIdDl: that.eventTypeIdDl,eventTypeId: that.eventTypeId, day: day}, loading).then(res => {
|
|
|
if (res.data != null && res.data.length > 0) {
|
|
|
this.showEventKind = true
|
|
|
this.eventKind.data = res.data
|
|
|
this.eventKind.colors = ['#1ce0a9', '#d6333b', '#e68d3f', '#32c5e9', '#2abc65']
|
|
|
this.eventKind.showValue = true
|
|
|
- this.eventKind = { ...this.eventKind }
|
|
|
+ this.eventKind = {...this.eventKind}
|
|
|
} else {
|
|
|
this.showEventKind = false
|
|
|
this.eventKind = {}
|
|
|
- this.eventKind = { ...this.eventKind }
|
|
|
+ this.eventKind = {...this.eventKind}
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
getEventByReportorOrder(day, loading) {
|
|
|
let that = this
|
|
|
//右侧获取上报排名
|
|
|
- getEventByReportorOrder({ day: day }, loading).then(res => {
|
|
|
+ getEventByReportorOrder({eventTypeIdDl: that.eventTypeIdDl,eventTypeId: that.eventTypeId,day: day}, loading).then(res => {
|
|
|
if (res.data != null && res.data.length > 0) {
|
|
|
this.reportList.data = res.data
|
|
|
this.reportList = { ...this.reportList }
|
|
@@ -1112,7 +1129,7 @@ export default {
|
|
|
getExposureStage(day, loading) {
|
|
|
let that = this
|
|
|
//右侧获取曝光台
|
|
|
- getExposureStage({ day: day }, loading).then(res => {
|
|
|
+ getExposureStage({eventTypeIdDl: that.eventTypeIdDl,eventTypeId: that.eventTypeId,day: day}, loading).then(res => {
|
|
|
this.exposureStageList = res.data
|
|
|
})
|
|
|
},
|