浏览代码

振兴乡村首页

彭宇 2 年之前
父节点
当前提交
ca45d76821
共有 2 个文件被更改,包括 19 次插入13 次删除
  1. 3 2
      src/api/village.js
  2. 16 11
      src/views/forest.vue

+ 3 - 2
src/api/village.js

@@ -1,9 +1,10 @@
 import request from '@/utils/request'
 import request from '@/utils/request'
 
 
 // 获取左侧列表
 // 获取左侧列表
-export function selectVillageTypeXl() {
+export function getEventByEventType(param) {
   return request({
   return request({
-    url: 'center-village/VisuVillageCloudController/selectVillageTypeXl',
+    url: '/center-village/VisuVillageCloudController/getEventByEventType',
     method: 'post',
     method: 'post',
+    data:param
   })
   })
 }
 }

+ 16 - 11
src/views/forest.vue

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