彭宇 преди 2 години
родител
ревизия
22d3426e61
променени са 3 файла, в които са добавени 26 реда и са изтрити 112 реда
  1. 2 37
      src/api/event.js
  2. 16 65
      src/api/forest.js
  3. 8 10
      src/views/forest.vue

+ 2 - 37
src/api/event.js

@@ -1,40 +1,5 @@
 import request from '@/utils/request'
 
-// 获取左侧菜单列表
-export function getTodayEvent() {
-  return request({
-    url: '/center-fire/VisuForestEventCenterController/getTodayEvent',
-    method: 'post',
-  })
-}
-// 点击今日事件前三个按钮列表
-export function getEventStatusList(eventStatus) {
-  return request({
-    url: '/center-fire/VisuForestEventCenterController/getEventList?eventStatus='+eventStatus,
-    method: 'post',
-  })
-}
-// 点击今日事件后三个按钮列表
-export function getEventSourceList(eventSource) {
-  return request({
-    url: '/center-fire/VisuForestEventCenterController/getEventList?eventSource='+eventSource,
-    method: 'post',
-  })
-}
-// 点击部门
-export function getEventListByDeptIdList(deptId) {
-  return request({
-    url: '/center-fire/VisuForestEventCenterController/getEventList?deptId='+deptId,
-    method: 'post',
-  })
-}
-// 点击类型
-export function getEventListByTypeList(eventType) {
-  return request({
-    url: '/center-fire/VisuForestEventCenterController/getEventList?eventType='+eventType,
-    method: 'post',
-  })
-}
 
 // 查询事件(森林防火)详细
 export function getForest(id) {
@@ -64,14 +29,14 @@ export function getImgUrl(data) {
 //获取附近事件
 export function getNearEvent(longitude,latitude) {
   return request({
-    url: '/center-fire/VisuForestEventCenterController/getNearEvent?longitude='+latitude+"&latitude="+latitude,
+    url: '/center-village/VisuForestEventCenterController/getNearEvent?longitude='+latitude+"&latitude="+latitude,
     method: 'get',
   })
 }
 //获取附近摄像头
 export function getNearCamera(longitude,latitude) {
   return request({
-    url: '/center-fire/VisuForestEventCenterController/getNearCamera?longitude='+latitude+"&latitude="+latitude,
+    url: '/center-village/VisuForestEventCenterController/getNearCamera?longitude='+latitude+"&latitude="+latitude,
     method: 'get',
   })
 }

+ 16 - 65
src/api/forest.js

@@ -1,50 +1,9 @@
 import request from '@/utils/request'
 
-// 左侧获取部门信息
-export function getBaseInfo() {
-  return request({
-    url: '/center-fire/VisuForestCloudMapController/getBaseInfo',
-    method: 'post',
-  })
-}
-// 左侧获取事件信息统计
-export function getTodayEvents(param) {
-  return request({
-    url: '/center-fire/VisuForestCloudMapController/getTodayEvents',
-    method: 'post',
-    data: param
-  })
-}
-// 左侧获取事件部门数量
-export function getDeptEventCount(param) {
-  return request({
-    url: '/center-fire/VisuForestCloudMapController/getDeptEventCount',
-    method: 'post',
-    data: param
-  })
-}
-// 右侧获取天气
-export function getWeather(param) {
-  return request({
-    url: '/center-fire/VisuForestCloudMapController/getWeather',
-    method: 'post',
-    data: param
-  })
-}
-
-
 // 右侧获取事件列表
 export function getEventList(param) {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/getEventList',
-    method: 'post',
-    data: param
-  })
-}
-// 右侧获取曝光台列表
-export function getExposureStage(param) {
-  return request({
-    url: 'center-fire/VisuForestCloudMapController/getExposureStage',
+    url: '/center-village/VisuVillageCloudController/getEventList',
     method: 'post',
     data: param
   })
@@ -53,7 +12,7 @@ export function getExposureStage(param) {
 // 获取事件详情
 export function getEventDetail(param) {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/getEventDetail',
+    url: '/center-village/VisuVillageCloudController/getEventDetail',
     method: 'post',
     data: param
   })
@@ -61,7 +20,7 @@ export function getEventDetail(param) {
 // 获取日历颜色状态
 export function getEventByCalendar(param) {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/getEventByCalendar',
+    url: '/center-village/VisuVillageCloudController/getEventByCalendar',
     method: 'post',
     data: param
   })
@@ -69,15 +28,7 @@ export function getEventByCalendar(param) {
 // 获取事件分类
 export function getEventByEventType(param) {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/getEventByEventType',
-    method: 'post',
-    data: param
-  })
-}
-// 获取上报排名
-export function getEventByReportorOrder(param) {
-  return request({
-    url: '/center-fire/VisuForestCloudMapController/getEventByReportorOrder',
+    url: '/center-village/VisuVillageCloudController/getEventByEventType',
     method: 'post',
     data: param
   })
@@ -101,7 +52,7 @@ export function sendEventLog(param) {
 // 事件处理流程
 export function updateCentereventTEventcatalogueStatus(param) {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/updateCentereventTEventcatalogueStatus',
+    url: '/center-village/VisuVillageCloudController/updateCentereventTEventcatalogueStatus',
     method: 'post',
     data: param
   })
@@ -109,7 +60,7 @@ export function updateCentereventTEventcatalogueStatus(param) {
 // 事件处理流程-事件类型
 export function listSJfl(param) {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/listSJfl',
+    url: '/center-village/VisuVillageCloudController/listSJfl',
     method: 'post',
     data: param
   })
@@ -117,21 +68,21 @@ export function listSJfl(param) {
 // 事件处理流程-关联预案
 export function listYuAn() {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/listYuAn',
+    url: '/center-village/VisuVillageCloudController/listYuAn',
     method: 'post'
   })
 }
 // 事件处理流程-签收部门
 export function selectByeventCode(eventCode) {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/selectByeventCode/'+eventCode,
+    url: '/center-village/VisuVillageCloudController/selectByeventCode/'+eventCode,
     method: 'post'
   })
 }
 // 事件处理流程-联动
 export function sendTask(param) {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/sendTask',
+    url: '/center-village/VisuVillageCloudController/sendTask',
     method: 'post',
     data:param
   })
@@ -139,14 +90,14 @@ export function sendTask(param) {
 // 任务接口
 export function selectTaskBO() {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/selectTaskBO',
+    url: '/center-village/VisuVillageCloudController/selectTaskBO',
     method: 'post',
   })
 }
 // 搜索物资
 export function listResourceByWz(param) {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/listResourceByWz',
+    url: '/center-village/VisuVillageCloudController/listResourceByWz',
     method: 'post',
     data:param
   })
@@ -154,7 +105,7 @@ export function listResourceByWz(param) {
 // 任务领取部门列表
 export function selectTaskDtpts(param) {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/selectTaskDtpts',
+    url: '/center-village/VisuVillageCloudController/selectTaskDtpts',
     method: 'post',
     data:param
   })
@@ -162,7 +113,7 @@ export function selectTaskDtpts(param) {
 // 任务领取
 export function receiveTask(param) {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/receiveTask',
+    url: '/center-village/VisuVillageCloudController/receiveTask',
     method: 'post',
     data:param
   })
@@ -170,7 +121,7 @@ export function receiveTask(param) {
 // 任务拒绝
 export function refusedTask(param) {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/refusedTask',
+    url: '/center-village/VisuVillageCloudController/refusedTask',
     method: 'post',
     data:param
   })
@@ -178,7 +129,7 @@ export function refusedTask(param) {
 // 事件调整关联预案
 export function updateYjYuAn(param) {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/updateYjYuAn',
+    url: '/center-village/VisuVillageCloudController/updateYjYuAn',
     method: 'post',
     data:param
   })
@@ -186,7 +137,7 @@ export function updateYjYuAn(param) {
 // 事件详情截图直接上传日志
 export function uploadBase64(param) {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/uploadBase64',
+    url: '/center-village/VisuVillageCloudController/uploadBase64',
     method: 'post',
     data:param
   })

+ 8 - 10
src/views/forest.vue

@@ -14,14 +14,13 @@
             <div class="i-list-con h-80" style="padding-left: 1rem;">
               <el-collapse accordion>
                 <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}"
-                         v-on:click="selectCameraByDeptId(item.deptId)">
+                    <div class="d-l-con sj-collapse" :class="{on:listCurrentIndex1==item.id}"
+                         v-on:click="getEventList(calendarDay,item.id)">
                       <div class="d-l-l-text">
-                        <h4 class="collapse-title">{{ item.deptName }}</h4>
+                        <h4 class="collapse-title">{{ item.name }}</h4>
                       </div>
-                      <div class="d-l-l-count">{{ item.eventCount }}</div>
+                      <div class="d-l-l-count">{{ item.value }}</div>
                     </div>
                   </template>
                 </el-collapse-item>
@@ -150,7 +149,6 @@ import Cookies from 'js-cookie'
 /** ----------------------------------weosocket结束------------------------------------- */
 
 import {
-  getDeptEventCount,
   getEventList
 } from '@/api/forest'
 
@@ -201,7 +199,7 @@ export default {
   },
   mounted() {
     this.getEventByEventType(this.getCurrentDataStr())
-    this.getEventList(this.getCurrentDataStr(),1,0)
+    this.getEventList(this.getCurrentDataStr(),0)
     /** ----------------------------------weosocket开始------------------------------------- */
     // this.initWebSocket()
     /** ----------------------------------weosocket结束------------------------------------- */
@@ -358,7 +356,7 @@ export default {
     },
     selectDay(day) {//日历点击
       this.getEventByEventType(day)
-      this.getEventList(day,1,0)
+      this.getEventList(day,0)
       this.calendarDay = day
     },
 
@@ -372,14 +370,14 @@ export default {
         this.villageTypeXlList = res.data
       })
     },
-    getEventList(day,eventTypeIdDl,eventTypeId) {
+    getEventList(day,eventTypeId) {
+      this.listCurrentIndex1=eventTypeId
       let that = this
       this.eventList = []
       this.eventListAll = []
       //右侧获取事件列表
       getEventList({
         day: day,
-        eventTypeIdDl: [eventTypeIdDl],
         eventTypeId: [eventTypeId]
       }).then(res => {
         this.eventList = res.data