|
@@ -136,7 +136,8 @@
|
|
|
</div>
|
|
|
<vBottomMenu ref="bottomMenu"></vBottomMenu>
|
|
|
</div>
|
|
|
- <eventdetailsdialog ref="eventdetailsdialog" :calendarDay="calendarDay" @getEventList="getEventList" ></eventdetailsdialog>
|
|
|
+ <eventdetailsdialog ref="eventdetailsdialog" :calendarDay="calendarDay"
|
|
|
+ @getEventList="getEventList"></eventdetailsdialog>
|
|
|
<eventLocation ref="eventLocation"></eventLocation>
|
|
|
<TVWall ref="TVWall"></TVWall>
|
|
|
</div>
|
|
@@ -150,11 +151,11 @@ import Cookies from 'js-cookie'
|
|
|
|
|
|
import {
|
|
|
getDeptEventCount,
|
|
|
- getEventList,
|
|
|
+ getEventList
|
|
|
} from '@/api/forest'
|
|
|
|
|
|
import {
|
|
|
- selectVillageTypeXl,
|
|
|
+ getEventByEventType
|
|
|
} from '@/api/village'
|
|
|
import supermap from '@/components/supermap' //超图
|
|
|
import supermapNotProcessed from '@/components/supermap' //超图
|
|
@@ -199,8 +200,8 @@ export default {
|
|
|
/** ----------------------------------底部按钮公用组件结束------------------------------------- */
|
|
|
},
|
|
|
mounted() {
|
|
|
- this.selectVillageTypeXl(this.getCurrentDataStr())
|
|
|
- this.getEventList(this.getCurrentDataStr())
|
|
|
+ this.getEventByEventType(this.getCurrentDataStr())
|
|
|
+ this.getEventList(this.getCurrentDataStr(),1,0)
|
|
|
/** ----------------------------------weosocket开始------------------------------------- */
|
|
|
// this.initWebSocket()
|
|
|
/** ----------------------------------weosocket结束------------------------------------- */
|
|
@@ -356,27 +357,31 @@ export default {
|
|
|
return y + '-' + m + '-' + d
|
|
|
},
|
|
|
selectDay(day) {//日历点击
|
|
|
- this.selectVillageTypeXl(day)
|
|
|
- this.getEventList(day)
|
|
|
+ this.getEventByEventType(day)
|
|
|
+ this.getEventList(day,1,0)
|
|
|
this.calendarDay = day
|
|
|
},
|
|
|
|
|
|
selectTaskList() {
|
|
|
this.$refs.bottomMenu.selectTaskList()
|
|
|
},
|
|
|
- selectVillageTypeXl(day) {
|
|
|
+ getEventByEventType(day) {
|
|
|
let that = this
|
|
|
//左侧获取事件部门数量
|
|
|
- selectVillageTypeXl({ day: day }).then(res => {
|
|
|
+ getEventByEventType({ day: day }).then(res => {
|
|
|
this.villageTypeXlList = res.data
|
|
|
})
|
|
|
},
|
|
|
- getEventList(day) {
|
|
|
+ getEventList(day,eventTypeIdDl,eventTypeId) {
|
|
|
let that = this
|
|
|
this.eventList = []
|
|
|
this.eventListAll = []
|
|
|
//右侧获取事件列表
|
|
|
- getEventList({ day: day }).then(res => {
|
|
|
+ getEventList({
|
|
|
+ day: day,
|
|
|
+ eventTypeIdDl: [eventTypeIdDl],
|
|
|
+ eventTypeId: [eventTypeId]
|
|
|
+ }).then(res => {
|
|
|
this.eventList = res.data
|
|
|
this.eventListAll = res.data
|
|
|
that.markersList = []
|