|
@@ -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>
|
|
@@ -460,11 +460,14 @@
|
|
|
import eventdetailsdialog from '@/views/eventdetailsdialog.vue' //事件详情弹窗
|
|
|
import firespread from '@/views/firespread.vue' //事件详情弹窗
|
|
|
import Firespread from "./firespread";
|
|
|
+ import chart from "./from/dvCapsuleChart.vue";
|
|
|
+
|
|
|
|
|
|
|
|
|
let echarts = require('echarts')
|
|
|
export default {
|
|
|
components: {
|
|
|
+ chart,
|
|
|
Firespread,
|
|
|
supermap,
|
|
|
// supermapNotProcessed,
|
|
@@ -499,13 +502,13 @@
|
|
|
/** ----------------------------------weosocket结束------------------------------------- */
|
|
|
setInterval(() => {
|
|
|
if (this.calendarDay == this.getCurrentDataStr()) {
|
|
|
- this.getTodayEvents(this.getCurrentDataStr(), true);
|
|
|
- this.getDeptEventCount(this.getCurrentDataStr(), true);
|
|
|
- this.getEventList(this.getCurrentDataStr(), this.pageSize, this.pageNum, '', true);
|
|
|
- this.getEventByEventType(this.getCurrentDataStr(), true);
|
|
|
- this.getEventByReportorOrder(this.getCurrentDataStr(), true);
|
|
|
- this.getExposureStage(this.getCurrentDataStr(), true);
|
|
|
- this.getSupermap(this.getCurrentDataStr(), true);
|
|
|
+ this.getTodayEvents(this.getCurrentDataStr(), false);
|
|
|
+ this.getDeptEventCount(this.getCurrentDataStr(), false);
|
|
|
+ this.getEventList(this.getCurrentDataStr(), this.pageSize, this.pageNum, '', false);
|
|
|
+ this.getEventByEventType(this.getCurrentDataStr(), false);
|
|
|
+ this.getEventByReportorOrder(this.getCurrentDataStr(), false);
|
|
|
+ this.getExposureStage(this.getCurrentDataStr(), false);
|
|
|
+ this.getSupermap(this.getCurrentDataStr(), false);
|
|
|
}
|
|
|
}, 10000)
|
|
|
this.bottomMenuList() //获取底部公共组件消息和任务
|
|
@@ -528,6 +531,8 @@
|
|
|
total: '',
|
|
|
aiTotal_pre: '',
|
|
|
newReport_pre: '',
|
|
|
+ eventTypeIdDl: [],
|
|
|
+ eventTypeId: [],
|
|
|
otherTotal_pre: '',
|
|
|
readyFinish_pre: '',
|
|
|
readySure_pre: '',
|
|
@@ -825,7 +830,7 @@
|
|
|
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
|
|
@@ -844,7 +849,7 @@
|
|
|
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
|
|
|
})
|
|
|
},
|
|
@@ -874,7 +879,7 @@
|
|
|
},
|
|
|
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++) {
|
|
@@ -963,6 +968,20 @@
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
+ 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)
|
|
|
+ },
|
|
|
getEventList(day, pageSize, pageNum, eventSearch, loading) {
|
|
|
if (pageNum < 1) {
|
|
|
this.$modal.msg('当前已是第一页')
|
|
@@ -973,7 +992,7 @@
|
|
|
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') {
|
|
@@ -988,7 +1007,7 @@
|
|
|
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
|
|
@@ -1005,7 +1024,7 @@
|
|
|
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}
|
|
@@ -1104,7 +1123,7 @@
|
|
|
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
|
|
|
})
|
|
|
},
|