|
@@ -13,7 +13,7 @@
|
|
|
<img src="../assets/images/integrated/light.png" style="width: 100%; margin-top: .4rem;"/>
|
|
|
<div class="i-list-con h-80" style="padding-left: 1rem;">
|
|
|
<el-collapse accordion>
|
|
|
- <el-collapse-item v-for="(item,index) in forestFarm" :key="index">
|
|
|
+ <el-collapse-item v-for="(item,index) in villageTypeXlList" :key="index">
|
|
|
<!-- deptId -->
|
|
|
<template slot="title">
|
|
|
<div class="d-l-con sj-collapse" :class="{on:listCurrentIndex1==item.deptId}"
|
|
@@ -152,6 +152,10 @@ import {
|
|
|
getDeptEventCount,
|
|
|
getEventList,
|
|
|
} from '@/api/forest'
|
|
|
+
|
|
|
+import {
|
|
|
+ selectVillageTypeXl,
|
|
|
+} from '@/api/village'
|
|
|
import supermap from '@/components/supermap' //超图
|
|
|
import supermapNotProcessed from '@/components/supermap' //超图
|
|
|
import supermapProcessed from '@/components/supermap' //超图
|
|
@@ -195,7 +199,7 @@ export default {
|
|
|
/** ----------------------------------底部按钮公用组件结束------------------------------------- */
|
|
|
},
|
|
|
mounted() {
|
|
|
- this.getDeptEventCount(this.getCurrentDataStr())
|
|
|
+ this.selectVillageTypeXl(this.getCurrentDataStr())
|
|
|
this.getEventList(this.getCurrentDataStr())
|
|
|
/** ----------------------------------weosocket开始------------------------------------- */
|
|
|
// this.initWebSocket()
|
|
@@ -206,7 +210,7 @@ export default {
|
|
|
return {
|
|
|
calendarDay: this.getCurrentDataStr(),
|
|
|
//左侧部门事件数量
|
|
|
- forestFarm: [],
|
|
|
+ villageTypeXlList: [],
|
|
|
//右侧事件列表
|
|
|
eventList: [],
|
|
|
eventListnew: [],
|
|
@@ -352,7 +356,7 @@ export default {
|
|
|
return y + '-' + m + '-' + d
|
|
|
},
|
|
|
selectDay(day) {//日历点击
|
|
|
- this.getDeptEventCount(day)
|
|
|
+ this.selectVillageTypeXl(day)
|
|
|
this.getEventList(day)
|
|
|
this.calendarDay = day
|
|
|
},
|
|
@@ -360,11 +364,11 @@ export default {
|
|
|
selectTaskList() {
|
|
|
this.$refs.bottomMenu.selectTaskList()
|
|
|
},
|
|
|
- getDeptEventCount(day) {
|
|
|
+ selectVillageTypeXl(day) {
|
|
|
let that = this
|
|
|
//左侧获取事件部门数量
|
|
|
- getDeptEventCount({ day: day }).then(res => {
|
|
|
- this.forestFarm = res.data
|
|
|
+ selectVillageTypeXl({ day: day }).then(res => {
|
|
|
+ this.villageTypeXlList = res.data
|
|
|
})
|
|
|
},
|
|
|
getEventList(day) {
|