Merge branch 'visu_environment' of D:\D\workspaces\webstorm\yitihua\yitihua_3 with conflicts.

src/api/forest.js

@@ -1,20 +1,5 @@
 import request from '@/utils/request'
 
-// 获取绑定的事件类型
-export function getMenuEventType() {
-  return request({
-    url: '/center-environment/VisuForestCloudMapController/getMenuEventType',
-    method: 'get',
-  })
-}
-// 获取事件详情
-export function getEventPush(param) {
-  return request({
-    url: '/center-environment/VisuForestCloudMapController/getEventPush',
-    method: 'post',
-    data: param
-  })
-}
 // 左侧获取部门信息
 export function getBaseInfo() {
   return request({
@@ -23,25 +8,19 @@ export function getBaseInfo() {
   })
 }
 // 左侧获取事件信息统计
-export function getTodayEvents(param,loading) {
+export function getTodayEvents(param) {
   return request({
     url: '/center-environment/VisuForestCloudMapController/getTodayEvents',
     method: 'post',
-    data: param,
-    headers: {
-      loading: loading
-    },
+    data: param
   })
 }
 // 左侧获取事件部门数量
-export function getDeptEventCount(param,loading) {
+export function getDeptEventCount(param) {
   return request({
     url: '/center-environment/VisuForestCloudMapController/getDeptEventCount',
     method: 'post',
-    data: param,
-    headers: {
-      loading: loading
-    },
+    data: param
   })
 }
 // 右侧获取天气
@@ -53,26 +32,21 @@ export function getWeather(param) {
   })
 }
 
+
 // 右侧获取事件列表
-export function getEventList(param,loading) {
+export function getEventList(param) {
   return request({
     url: '/center-environment/VisuForestCloudMapController/getEventList',
     method: 'post',
-    data: param,
-    headers: {
-      loading: loading
-    },
+    data: param
   })
 }
 // 右侧获取曝光台列表
-export function getExposureStage(param,loading) {
+export function getExposureStage(param) {
   return request({
     url: 'center-environment/VisuForestCloudMapController/getExposureStage',
     method: 'post',
-    data: param,
-    headers: {
-      loading: loading
-    },
+    data: param
   })
 }
 
@@ -93,25 +67,19 @@ export function getEventByCalendar(param) {
   })
 }
 // 获取事件分类
-export function getEventByEventType(param,loading) {
+export function getEventByEventType(param) {
   return request({
     url: '/center-environment/VisuForestCloudMapController/getEventByEventType',
     method: 'post',
-    data: param,
-    headers: {
-      loading: loading
-    },
+    data: param
   })
 }
 // 获取上报排名
-export function getEventByReportorOrder(param,loading) {
+export function getEventByReportorOrder(param) {
   return request({
     url: '/center-environment/VisuForestCloudMapController/getEventByReportorOrder',
     method: 'post',
-    data: param,
-    headers: {
-      loading: loading
-    },
+    data: param
   })
 }
 // 日志文件上传
@@ -223,7 +191,6 @@ export function uploadBase64(param) {
     data:param
   })
 }
-
 // 通过事件code查询事件责任部门
 export function centereventtdepteventList(param) {
   return request({
@@ -258,52 +225,19 @@ export function dutysystemRemove(param) {
   })
 }
 
-// 通过部门id获取责任人
+// 事件短信联系人
 export function userFeginlist(param) {
   return request({
-    url: '/system/user/selectUserWithPostByDeptId',
-    method: 'get',
-    params:param
-  })
-}
-
-// 获取消息个数
-export function selectMessageCount(userId) {
-  return request({
-    url: '/center-message/centerMessageFeign/selectMessageCount/'+userId,
-    method: 'get'
-  })
-}
-// 获取消息列表
-export function selectMessageList(userId) {
-  return request({
-    url: '/center-message/centerMessageFeign/selectMessageList/'+userId,
-    method: 'get'
-  })
-}
-// 获取消息详情
-export function selectMessageById(messageId) {
-  return request({
-    url: '/center-message/centerMessageFeign/selectMessageById/'+messageId,
-    method: 'get'
+    url: '/center-environment/VisuForestCloudMapController/userFeginlist',
+    method: 'post'
   })
 }
 
-// 事件处置
-export function eventHandling(id,eventCode) {
+// 会议添加联系人并发送短信
+export function sendMessage(param) {
   return request({
-    url: '/center-environment/VisuForestEventCenterController/eventHandling',
+    url: '/center-fire/VisuForestCloudMapController/sendMeetingMsg',
     method: 'post',
-    data: { id: id, eventCode: eventCode, dataStatus: "1" }
+    data:param
   })
 }
-  //范围摄像头
-  export function initByCameras(param) {
-    return request({
-      url: '/center-monitor/TVWallController/initByCameras',
-      method: 'get',
-      params:param
-    })
-
-
-}