1

src/api/event.js

@@ -27,18 +27,31 @@ export function getNearEvent(longitude, latitude, day, loading, eventTypeIdDl, e
     },
   })
 }
-//获取附近事件
-export function getNearEvent1(longitude, latitude ) {
+// //获取附近事件
+// export function getNearEvent1(longitude, latitude ) {
+//   return request({
+//     url: '/center-emergency/VisuEmergencyEventCenterController/getNearEvent?longitude=' + longitude + "&latitude=" + latitude,
+//     method: 'get',
+//   })
+// }
+// //获取附近摄像头
+// export function getNearCamera(longitude,latitude) {
+//   return request({
+//     url: '/center-emergency/VisuEmergencyMonitorCenterController/getNearCamera?longitude='+longitude+"&latitude="+latitude+"&type=1,2,3,4,5,6,7,8",
+//     method: 'get',
+//   })
+// }
+
+export function getNearEvent1_direct(longitude, latitude ,vo) {
   return request({
-    url: '/center-emergency/VisuEmergencyEventCenterController/getNearEvent?longitude=' + longitude + "&latitude=" + latitude,
-    method: 'get',
+    url: '/center-event/eventview/getNearEvent',
+    method: 'post',
+    data:{longitude:longitude,latitude:latitude,eventTypeId:vo.eventTypeId,eventTypeIdDl:vo.eventTypeIdDl,day:vo.day}
   })
 }
-//获取附近摄像头
-export function getNearCamera(longitude,latitude) {
+export function getNearCamera_monitor(longitude,latitude,type) {
   return request({
-    url: '/center-emergency/VisuEmergencyMonitorCenterController/getNearCamera?longitude='+longitude+"&latitude="+latitude+"&type=1,2,3,4,5,6,7,8",
+    url: `/center-monitor/camera/selectFjsxt/${longitude}/${latitude}/${type}`,
     method: 'get',
   })
 }
-

src/api/forest.js

@@ -7,71 +7,21 @@ export function getTodayEvents(param) {
     data: param
   })
 }
-export function selectByMenuId(data) {
-  return request({
-    url: '/system/menuEventType/selectByMenuId',
-    method: 'post',
-    data: data
-  })
-}
-export function getWeather(param) {
-  return request({
-    url: '/center-data/weatherinformation/getWeather',
-    method: 'post',
-    data: param
-  })
-}
-// 右侧获取事件列表
-export function getEventList(param,loading) {
-  return request({
-    url: '/center-event/eventview/selectEventList',
-    method: 'post',
-    data: param,
-    headers: {
-      loading: loading
-    },
-  })
-}
-// 获取事件分类
-export function getEventByEventType(param,loading) {
-  return request({
-    url: '/center-event/eventview/getEventByEventType',
-    method: 'post',
-    data: param,
-    headers: {
-      loading: loading
-    },
-  })
-}
-// 获取日历颜色状态
-export function getEventByCalendar(param) {
-  return request({
-    url: '/center-event/eventview/selectEventByCalendar',
-    method: 'post',
-    data: param
-  })
-}
-export function fireControlViewList(type) {
-  return request({
-    url: '/sooka-middleware/visual/getResourceList?type='+type,
-    method: 'get',
-  })
-}
+// 获取消防左侧菜单列表
+// export function fireControlViewList() {
+//   return request({
+//     url: '/center-firecontrol/VisuForestDataCenterController/fireControlViewList',
+//     method: 'post',
+//   })
+// }
 // 点击左侧菜单列表查询落点
-export function fireControlViewPoint(param) {
-  return request({
-    url: '/sooka-middleware/visual/getResourcePoint?type='+param.type+'&longitude='+param.longitude+'&latitude='+param.latitude+'&radius='+param.radius,
-    method: 'get'
-
-  })
-}
-export function esViewDetail(params) {
-  return request({
-    url: `/sooka-middleware/visual/getResourceDetail?type=${params.type}&id=${params.id}`,
-    method: 'get'
-
-  })
-}
+// export function fireControlViewPoint(type, name) {
+//   return request({
+//     url: '/center-firecontrol/VisuForestDataCenterController/fireControlViewPoint',
+//     method: 'post',
+//     data: type
+//   })
+// }
 export function getNewDataByDate(data) {
   return request({
     url: '/center-event/spread/getNewDataByDate?Date='+data,
@@ -79,7 +29,14 @@ export function getNewDataByDate(data) {
 
   })
 }
+export function initByCameras(param) {
+  return request({
+    url: '/center-monitor/TVWallController/initByCameras',
+    method: 'get',
+    params:param
+  })
 
+}
 // 获取绑定的事件类型
 export function getMenuEventType() {
   return request({
@@ -95,6 +52,7 @@ export function getEventPush(param) {
     data: param
   })
 }
+
 // 左侧获取部门信息
 export function getBaseInfo() {
   return request({
@@ -102,10 +60,25 @@ export function getBaseInfo() {
     method: 'post',
   })
 }
+export function selectByMenuId(data) {
+  return request({
+    url: '/system/menuEventType/selectByMenuId',
+    method: 'post',
+    data: data
+  })
+}
+// 获取日历颜色状态
+export function getEventByCalendar(param) {
+  return request({
+    url: '/center-event/eventview/selectEventByCalendar',
+    method: 'post',
+    data: param
+  })
+}
 // 左侧获取事件信息统计
 // export function getTodayEvents(param,loading) {
 //   return request({
-//     url: '/center-emergency/VisuEmergencyCloudMapController/getTodayEvents',
+//     url: '/center-water/WaterController/getTodayEvents',
 //     method: 'post',
 //     data: param,
 //     headers: {
@@ -113,20 +86,19 @@ export function getBaseInfo() {
 //     },
 //   })
 // }
+
+
+export function getWeather_direct(param,loading) {
+  return request({
+    url: '/center-data/weatherinformation/getWeather',
+    method: 'post',
+    data: param
+  })
+}
 // 左侧获取事件部门数量
-// export function getDeptEventCount(param,loading) {
-//   return request({
-//     url: '/center-emergency/VisuEmergencyCloudMapController/getDeptEventCount',
-//     method: 'post',
-//     data: param,
-//     headers: {
-//       loading: loading
-//     },
-//   })
-// }
-export function getDeptEventCount_direct(param,loading) {
+export function getDeptEventCount(param,loading) {
   return request({
-    url: '/center-event/eventview/selectDeptEventCount',
+    url: '/center-emergency/VisuEmergencyCloudMapController/getDeptEventCount',
     method: 'post',
     data: param,
     headers: {
@@ -134,15 +106,16 @@ export function getDeptEventCount_direct(param,loading) {
     },
   })
 }
-// 右侧获取天气
+// // 右侧获取天气
 // export function getWeather(param) {
 //   return request({
-//     url: '/center-emergency/VisuEmergencyCloudMapController/getWeather',
+//     url: '/center-water/WaterController/getWeather',
 //     method: 'post',
 //     data: param
 //   })
 // }
 // 任务接口
+
 export function selectTaskBO(data) {
   return request({
     url: '/center-task/centerTaskFeign/selectUnclaimedTaskBO',
@@ -150,79 +123,74 @@ export function selectTaskBO(data) {
     data:data
   })
 }
+// 获取事件分类
+export function getEventByEventType(param,loading) {
+  return request({
+    url: '/center-event/eventview/getEventByEventType',
+    method: 'post',
+    data: param,
+    headers: {
+      loading: loading
+    },
+  })
+}
+
 // 右侧获取事件列表
-// export function getEventList(param,loading) {
-//   return request({
-//     url: '/center-emergency/VisuEmergencyCloudMapController/getEventList',
-//     method: 'post',
-//     data: param,
-//     headers: {
-//       loading: loading
-//     },
-//   })
-// }
-// 右侧获取曝光台列表
-// export function getExposureStage(param,loading) {
+export function getEventList(param,loading) {
+  return request({
+    url: '/center-event/eventview/selectEventList',
+    method: 'post',
+    data: param,
+    headers: {
+      loading: loading
+    },
+  })
+}
+
+export function getDeptEventCount_direct(param,loading) {
+  return request({
+    url: '/center-event/eventview/selectDeptEventCount',
+    method: 'post',
+    data: param,
+    headers: {
+      loading: loading
+    },
+  })
+}
+// 获取事件详情
+// export function getEventDetail(param) {
 //   return request({
-//     url: 'center-emergency/VisuEmergencyCloudMapController/getExposureStage',
+//     url: '/center-emergency/VisuEmergencyCloudMapController/getEventDetail',
 //     method: 'post',
-//     data: param,
-//     headers: {
-//       loading: loading
-//     },
+//     data: param
 //   })
 // }
-
-// 获取事件详情
-export function getEventDetail(param) {
+export function getEventDetail_direct(param) {
   return request({
-    url: '/center-emergency/VisuEmergencyCloudMapController/getEventDetail',
+    url: '/center-event/eventview/getEventDetail',
     method: 'post',
     data: param
   })
 }
-// // 获取日历颜色状态
+// 获取日历颜色状态
 // export function getEventByCalendar(param) {
 //   return request({
-//     url: '/center-emergency/VisuEmergencyCloudMapController/getEventByCalendar',
+//     url: '/center-water/WaterController/getEventByCalendar',
 //     method: 'post',
 //     data: param
 //   })
 // }
-// 获取事件分类
-// export function getEventByEventType(param,loading) {
-//   return request({
-//     url: '/center-emergency/VisuEmergencyCloudMapController/getEventByEventType',
-//     method: 'post',
-//     data: param,
-//     headers: {
-//       loading: loading
-//     },
-//   })
-// }
-// 获取上报排名
-// export function getEventByReportorOrder(param,loading) {
-//   return request({
-//     url: '/center-emergency/VisuEmergencyCloudMapController/getEventByReportorOrder',
-//     method: 'post',
-//     data: param,
-//     headers: {
-//       loading: loading
-//     },
-//   })
-// }
-//右侧获取曝光台
-export function getExposureStage(param) {
+export function getEventByReportorOrder(param) {
   return request({
-    url: '/center-event/eventview/selectExposureStage',
+    url: '/center-event/eventview/getEventByReportorOrder',
     method: 'post',
     data: param
   })
 }
-// 获取上报排名
-export function getEventByReportorOrder(param) {
+//右侧获取曝光台
+export function getExposureStage(param) {
   return request({
-    url: '/center-event/eventview/getEventByReportorOrder',
+    url: '/center-event/eventview/selectExposureStage',
     method: 'post',
     data: param
   })
@@ -251,127 +219,197 @@ export function updateCentereventTEventcatalogueStatus(param) {
     data: param
   })
 }
-// 事件处理流程-事件类型
-export function listSJfl(param) {
+// // 事件处理流程-事件类型
+// export function listSJfl(param) {
+//   return request({
+//     url: '/center-water/WaterController/listSJfl',
+//     method: 'post',
+//     data: param
+//   })
+// }
+export function listSJfl_direct(param) {
   return request({
-    url: '/center-emergency/VisuEmergencyCloudMapController/listSJfl',
-    method: 'post',
-    data: param
+    url: '/center-event/eventtype/getCentereventTEventtypeByParentId?parentId='+param.parentId,
+    method: 'get',
   })
 }
 // 事件处理流程-关联预案
-export function listYuAn() {
+// export function listYuAn() {
+//   return request({
+//     url: '/center-water/WaterController/listYuAn',
+//     method: 'post'
+//   })
+// }
+export function listYuAn_direct(param) {
   return request({
-    url: '/center-emergency/VisuEmergencyCloudMapController/listYuAn',
-    method: 'post'
+    url: '/center-data/reserve/listYuAnFegin',
+    method: 'post',
+    data:param
   })
 }
 // 事件处理流程-签收部门
-export function selectByeventCode(eventCode) {
+// export function selectByeventCode(eventCode) {
+//   return request({
+//     url: '/center-water/WaterController/selectByeventCode/'+eventCode,
+//     method: 'post'
+//   })
+// }
+export function selectByeventCode_direct(eventCode) {
   return request({
-    url: '/center-emergency/VisuEmergencyCloudMapController/selectByeventCode/'+eventCode,
-    method: 'post'
+    url: '/center-event/centereventtdeptevent/selectByEventCode?eventCode='+eventCode,
+    method: 'get'
   })
 }
-// 事件处理流程-联动
-export function sendTask(param) {
+// // 事件处理流程-联动
+// export function sendTask(param) {
+//   return request({
+//     url: '/center-water/WaterController/sendTask',
+//     method: 'post',
+//     data:param
+//   })
+// }
+export function sendTask_direct(param) {
   return request({
-    url: '/center-emergency/VisuEmergencyCloudMapController/sendTask',
+    url: '/sooka-middlevisualization/visuMiddleVisualizationController/sendTask',
     method: 'post',
     data:param
   })
 }
-// 任务接口
+// // 任务接口
 // export function selectTaskBO() {
 //   return request({
-//     url: '/center-emergency/VisuEmergencyCloudMapController/selectTaskBO',
+//     url: '/center-water/WaterController/selectTaskBO',
 //     method: 'post',
 //   })
 // }
 // 搜索物资
 export function listResourceByWz(param) {
   return request({
-    url: '/center-emergency/VisuEmergencyCloudMapController/listResourceByWz',
+    url: '/sooka-middlevisualization/visuMiddleVisualizationController/listResourceByWz',
     method: 'post',
     data:param
   })
 }
-// 任务领取部门列表
-export function selectTaskDtpts(param) {
-  return request({
-    url: '/center-emergency/VisuEmergencyCloudMapController/selectTaskDtpts',
-    method: 'post',
-    data:param
-  })
-}
-// 任务领取
-export function receiveTask(param) {
+// // 任务领取部门列表
+// export function selectTaskDtpts(param) {
+//   return request({
+//     url: '/center-water/WaterController/selectTaskDtpts',
+//     method: 'post',
+//     data:param
+//   })
+// }
+export function selectTaskDtpts_direct(param) {
+    return request({
+      url: '/center-task/centerTaskFeign/selectTaskDtpts',
+      method: 'post',
+      data:param
+    })
+  }
+// // 任务领取
+// export function receiveTask(param) {
+//   return request({
+//     url: '/center-water/WaterController/receiveTask',
+//     method: 'post',
+//     data:param
+//   })
+// }
+export function receiveTask_direct(param) {
   return request({
-    url: '/center-emergency/VisuEmergencyCloudMapController/receiveTask',
+    url: '/sooka-middlevisualization/visuMiddleVisualizationController/receiveTask',
     method: 'post',
     data:param
   })
 }
 // 任务拒绝
-export function refusedTask(param) {
+// export function refusedTask(param) {
+//   return request({
+//     url: '/center-water/WaterController/refusedTask',
+//     method: 'post',
+//     data:param
+//   })
+// }
+export function refusedTask_direct(param) {
   return request({
-    url: '/center-emergency/VisuEmergencyCloudMapController/refusedTask',
+    url: '/sooka-middlevisualization/visuMiddleVisualizationController/refusedTask',
     method: 'post',
     data:param
   })
 }
 // 事件调整关联预案
-export function updateYjYuAn(param) {
+// export function updateYjYuAn(param) {
+//   return request({
+//     url: '/center-water/WaterController/updateYjYuAn',
+//     method: 'post',
+//     data:param
+//   })
+// }
+export function updateYjYuAn_direct(param) {
   return request({
-    url: '/center-emergency/VisuEmergencyCloudMapController/updateYjYuAn',
-    method: 'post',
+    url: '/center-event/centereventtfireevent',
+    method: 'put',
     data:param
   })
 }
 // 事件详情截图直接上传日志
-export function uploadBase64(param) {
-  return request({
-    url: '/center-emergency/VisuEmergencyCloudMapController/uploadBase64',
-    method: 'post',
-    data:param
-  })
+  export function uploadBase64(param) {
+    param.originalfilename='应急截图上传.png'
+    return request({
+      url: '/sooka-middlevisualization/visuMiddleVisualizationController/uploadBase64',
+      method: 'post',
+      data:param
+    })
 }
-
-// 通过事件code查询事件责任部门
-export function centereventtdepteventList(param) {
+export function centereventtdepteventList_direct(param) {
   return request({
-    url: '/center-emergency/VisuEmergencyCloudMapController/centereventtdepteventList',
-    method: 'post',
-    data:param
+    url: `/center-event/centereventtdeptevent/getAllCentereventDeptEvent?eventCode=${param.eventCode}`,
+    method: 'get',
   })
 }
 // 通过责任部门查询责任人
-export function dutysystemList(param) {
+// export function dutysystemList(param) {
+//   return request({
+//     url: '/center-water/WaterController/dutysystemList',
+//     method: 'post',
+//     data:param
+//   })
+// }
+export function dutysystemList_direct(param) {
   return request({
-    url: '/center-emergency/VisuEmergencyCloudMapController/dutysystemList',
-    method: 'post',
-    data:param
+    url: `/center-event/dutysystem/getAllCentereventTDutySystem?depteventId=${param.depteventId}`,
+    method: 'get',
   })
 }
 
-// 事件责任制添加联系人
-export function dutysystemAdd(param) {
+// // 事件责任制添加联系人
+// export function dutysystemAdd(param) {
+//   return request({
+//     url: '/center-water/WaterController/dutysystemAdd',
+//     method: 'post',
+//     data:param
+//   })
+// }
+export function dutysystemAdd_direct(param) {
   return request({
-    url: '/center-emergency/VisuEmergencyCloudMapController/dutysystemAdd',
+    url: '/center-event/dutysystem/addOrUpdateAll',
     method: 'post',
     data:param
   })
 }
 // 事件责任制删除联系人
-export function dutysystemRemove(param) {
+// export function dutysystemRemove(param) {
+//   return request({
+//     url: '/center-water/WaterController/dutysystemRemove',
+//     method: 'get',
+//     params:param
+//   })
+// }
+export function dutysystemRemove_direct(ids) {
   return request({
-    url: '/center-emergency/VisuEmergencyCloudMapController/dutysystemRemove',
-    method: 'get',
-    params:param
+    url: `/center-event/dutysystem/${ids}`,
+    method: 'delete',
   })
 }
-
-// 通过部门id获取责任人
+// 事件短信联系人
 export function userFeginlist(param) {
   return request({
     url: '/system/user/selectUserWithPostByDeptId',
@@ -379,8 +417,14 @@ export function userFeginlist(param) {
     params:param
   })
 }
-
-
+// 左侧获取通知公共
+export function getLatestNotice() {
+  return request({
+    url: '/system/notice/getLatestNotice',
+    method: 'get',
+    params: {},
+  })
+}
 // 获取消息个数
 export function selectMessageCount(userId,deptId) {
   return request({
@@ -402,32 +446,17 @@ export function selectMessageById(messageId) {
     method: 'get'
   })
 }
-
-
-// 右侧获取隐患列表
-export function getAllDanger(param,loading) {
-  return request({
-    url: '/center-emergency/VisuEmergencyCloudMapController/getAllDanger',
-    method: 'post',
-    data: param,
-    headers: {
-      loading: loading
-    },
-  })
-}
-
-// 右侧获取隐患详情
-export function getInfoView(dangerId) {
-  return request({
-    url: '/center-emergency/VisuEmergencyCloudMapController/getInfoView/'+dangerId,
-    method: 'get',
-  })
-}
-
-// 事件处置
-export function eventHandling(id,eventCode) {
+// // 事件处置
+// export function eventHandling(id,eventCode) {
+//   return request({
+//     url: '/center-water/VisuForestEventCenterController/eventHandling',
+//     method: 'post',
+//     data: {id:id,eventCode:eventCode,dataStatus:"1"}
+//   })
+// }
+export function eventHandling_direct(id,eventCode) {
   return request({
-    url: '/center-emergency/VisuEmergencyEventCenterController/eventHandling',
+    url: '/center-event/eventcatalogue/eventHandling',
     method: 'post',
     data: {id:id,eventCode:eventCode,dataStatus:"1"}
   })
@@ -436,7 +465,7 @@ export function eventHandling(id,eventCode) {
 // // 会议添加联系人并发送短信
 // export function sendMessage(param) {
 //   return request({
-//     url: '/center-emergency/VisuEmergencyCloudMapController/sendMeetingMsgEmergency',
+//     url: '/center-water/WaterController/sendMeetingMsgWater',
 //     method: 'post',
 //     data:param
 //   })
@@ -449,14 +478,6 @@ export function sendMessage(param) {
     data:param
   })
 }
-// 左侧获取通知公共
-export function getLatestNotice() {
-  return request({
-    url: '/system/notice/getLatestNotice',
-    method: 'get',
-    params: {},
-  })
-}
 
 // 事件审核
 export function eventExamine(param) {
@@ -467,11 +488,39 @@ export function eventExamine(param) {
   })
 }
 
-export function initByCameras(param) {
+
+// 获取消防左侧菜单列表
+export function fireControlViewList(type) {
   return request({
-    url: '/center-monitor/TVWallController/initByCameras',
+    url: '/sooka-middleware/visual/getResourceList?type='+type,
     method: 'get',
-    params:param
   })
+}
+// 点击左侧菜单列表查询落点
+export function fireControlViewPoint(param) {
+  return request({
+    url: '/sooka-middleware/visual/getResourcePoint?type='+param.type+'&longitude='+param.longitude+'&latitude='+param.latitude+'&radius='+param.radius,
+    method: 'get'
+  })
+}
+export function getWeather(param) {
+  return request({
+    url: '/center-data/weatherinformation/getWeather',
+    method: 'post',
+    data: param
+  })
+}
+export function esViewDetail(params) {
+  return request({
+    url: `/sooka-middleware/visual/getResourceDetail?type=${params.type}&id=${params.id}`,
+    method: 'get'
 
+  })
+}
+export function getRlt_direct(param) {
+  return request({
+    url: '/center-event/eventreport/getHeatMap',
+    method: 'post',
+    data : param
+  })
 }

src/api/haikang/haikang.js

@@ -8,10 +8,17 @@ export function getHaiKangVideoServer(param) {
     params: param
   })
 }
-// 查询电视墙
+// // 查询电视墙
 export function tvCameraList() {
   return request({
     url: '/center-emergency/VisuEmergencyMonitorCenterController/tvCameraList',
     method: 'get',
   })
 }
+export function tvCameraList_direct() {
+  return request({
+    url: '/center-monitor/HaiKangController/cameraTVHaiKangList',
+    method: 'post',
+    data:{"type":5}
+  })
+}

src/api/monitor.js

@@ -16,7 +16,13 @@ export function selectCameraByDeptId(deptId) {
     data:{"deptId":deptId}
   })
 }
-
+export function selectDeviceType_direct(param) {
+  return request({
+    url: '/sooka-middlevisualization/visuMiddleVisualizationController/selectDeviceType',
+    method: 'post',
+    data:param
+  })
+}
 export function selectCameraByDeptId_direct(deptId) {
   return request({
     url: '/center-monitor/camera/selectCameraByDeptId',

src/components/eventLocation.vue

@@ -36,7 +36,7 @@
                         <img v-else-if="item.eventType == '511'" src="../assets/images/水流速.png"
                              style="width: 93px;height: 64px" />
                         <img v-else-if="item.eventType == '403'" src="../assets/images/土壤墒情监测.png"
-                             style="width: 93px;hei 64px" />
+                             style="width: 93px;height: 64px" />
                         <img v-else-if="item.eventType == '601'" src="../assets/images/大气监测.png"
                              style="width: 93px;height: 64px" />
                         <img v-else-if="item.eventType == '602'" src="../assets/images/水质监测.png"
@@ -149,7 +149,7 @@
 <script>
 import {
   getNearEvent1,
-  getNearCamera
+  getNearCamera, getNearEvent1_direct, getNearCamera_monitor
 } from '@/api/event'
 import {
   getHaiKangVideoServer
@@ -163,6 +163,7 @@ import {
 } from '@/api/dahua/dahua'
 import DHWs from '@/dahua/lib/DHWs'
 import TVWall from "@/components/TVWall.vue";
+import {selectByMenuId} from "@/api/forest";
 /** ----------------------------------摄像头预览结束------------------------------------- */
 export default {
   dicts: ['event_source'],
@@ -320,7 +321,7 @@ export default {
       //事件信息弹出
       this.$refs.eventdetailsdialog.showEventDialog(eventCode)
     },
-    getNearEvent() {
+    async getNearEvent() {
       if (this.longitude == null || this.longitude == '' || this.latitude == null || this.latitude == '') {
         this.$modal.msgError('请输入经纬度！')
         return
@@ -341,7 +342,18 @@ export default {
         isAggregation: false
       }]
       let that = this
-      getNearEvent1(that.longitude, that.latitude).then(res => {
+      let res = await selectByMenuId({ menuId: 6 });
+      let vo = {};
+      let eventType = [];
+      let eventTypeDl = [];
+      res.data.forEach(item => {
+        eventType.push(item.eventTypeXl);
+        eventTypeDl.push(item.eventTypeDl);
+      });
+      vo.eventTypeId = eventType;
+      vo.eventTypeIdDl = eventType;
+      vo.day = that.getCurrentDataStr();
+      getNearEvent1_direct(that.longitude, that.latitude,vo).then(res => {
         that.markersList = []
         that.eventList = res.data
         if (that.eventList != null && that.eventList.length > 0) {
@@ -460,7 +472,7 @@ export default {
         }
         that.cameraMarkersList = []
         that.cameraList = []
-        getNearCamera(that.longitude, that.latitude).then(res => {
+        getNearCamera_monitor(that.longitude, that.latitude,5).then(res => {
           //根据设备类型查看列表
           that.cameraList = res.data
 

src/components/vBottomMenu.vue

@@ -589,8 +589,8 @@ import {
   listYuAn,
   selectByeventCode,
   sendTask,
-  eventExamine,
-  eventHandling, sendEventLog
+  eventExamine,getEventDetail_direct,
+  eventHandling, sendEventLog, receiveTask_direct, refusedTask_direct, selectTaskDtpts_direct
 } from '@/api/forest'
 import {
   selectFarmByDeptId, linBanTreeselect, selectBanBylinBanTreesId, userDeptSelect
@@ -1057,7 +1057,7 @@ export default {
         eventCode: eventCode,
         // centerTaskTaskDepts: this.centerTaskTaskDepts
       }
-      receiveTask(param).then(res => {
+      receiveTask_direct(param).then(res => {
         //任务领取
         if (res.code == 200) {
           this.$message.success(`任务领取成功!`)
@@ -1076,7 +1076,7 @@ export default {
         eventCode: eventCode,
         // centerTaskTaskDepts: this.centerTaskTaskDepts
       }
-      refusedTask(param).then(res => {
+      refusedTask_direct(param).then(res => {
         //任务拒绝
         if (res.code == 200) {
           this.$message.success(`任务拒绝成功!`)
@@ -1092,7 +1092,7 @@ export default {
     selectTaskDtpts(taskId, eventCode, state) {
       this.taskId = taskId
       this.eventCode = eventCode
-      selectTaskDtpts({
+      selectTaskDtpts_direct({
         taskId: taskId
       }).then(res => {
         //任务领取部门列表
@@ -1157,7 +1157,7 @@ export default {
       this.eventCode = eventCode
       let that = this
       //获取事件详情
-      getEventDetail({
+      getEventDetail_direct({
         eventCode: eventCode
       }).then(res => {
         this.eventDialog = true
@@ -1213,7 +1213,7 @@ export default {
       this.eventCode = eventCode
       let that = this
       //获取事件详情
-      getEventDetail({
+      getEventDetail_direct({
         eventCode: eventCode
       }).then(res => {
         let markersMapList = [];
@@ -1429,7 +1429,7 @@ export default {
       this.eventCode = eventCode
       let that = this
       //刷新--事件详情
-      getEventDetail({
+      getEventDetail_direct({
         eventCode: eventCode
       }).then(res => {
         let markersMapList = [];
@@ -1523,7 +1523,7 @@ export default {
     },
     refreshEventDialog(eventCode) {
       //刷新--事件日志12
-      getEventDetail({
+      getEventDetail_driect({
         eventCode: eventCode
       }).then(res => {
         this.eventLogList = res.data.eventlog

src/views/bigdata/bigdata.vue

@@ -164,8 +164,8 @@ import chartGridDistribution from './chart-gridDistribution.vue' //10 企业分
 // import chartGridStaff from './chart-gridStaff.vue' //13 网格人员、、
 // import chartWeatherStation from './chart-weatherStation.vue' //14 气象站、、
 import chartEquipmentDistribution from './chart-equipmentDistribution' //16 应急工作情况、、
-
-import { getRlt } from '@/api/bigdata'
+import {selectByMenuId} from "@/api/forest";
+import { getRlt,getRlt_direct } from '@/api/bigdata'
 import { fontConfig } from '@/api/login'
 
 export default {
@@ -242,9 +242,19 @@ export default {
     },
   },
   methods: {
-    rlt() {
+    async rlt() {
       let that = this
-      getRlt().then(resp => {
+      let res = await selectByMenuId({ menuId: 6 });
+      // 创建vo对象并设置属性eventTypeId
+      let vo = {};
+      let eventType = [];
+      res.data.forEach(item => {
+        eventType.push(item.eventTypeXl);
+      });
+      vo.eventTypeId = eventType;
+      let myDate = new Date();
+      vo.day = myDate.getFullYear();
+      await getRlt_direct(vo).then(resp => {
         setTimeout(() => {
           //事件分布
           that.$refs.bigdataSupermap.loadHeatMap(resp.data)

src/views/eventdetailsdialog.vue

@@ -2094,6 +2094,15 @@ import {
   eventExamine,
   eventHandling,
   initByCameras,
+  dutysystemRemove_direct,
+  dutysystemList_direct,
+  centereventtdepteventList_direct,
+  dutysystemAdd_direct,
+  listYuAn_direct,
+  updateYjYuAn_direct,
+  listSJfl_direct,
+  selectByeventCode_direct,
+  getEventDetail_direct, eventHandling_direct, sendTask_direct
 } from "@/api/forest";
 import { joinConferences } from "@/api/meeting";
 import { treeselectAll as deptTreeselect } from "@/api/system/dept";
@@ -2480,7 +2489,7 @@ export default {
         let param = {
           ids: row.id,
         };
-        dutysystemRemove(param).then((res) => {
+        dutysystemRemove_direct(param.ids).then((res) => {
           this.$message.success(`删除成功!`);
           this.dutysystemSelect(
             this.iconCurrentIndex,
@@ -2496,7 +2505,7 @@ export default {
       //保存负责人行数
       rowData.dept = this.dutysystemDeptName;
       rowData.depteventId = this.depteventId;
-      dutysystemAdd(rowData).then((res) => {
+      dutysystemAdd_direct(rowData).then((res) => {
         this.$message.success(`保存成功!`);
         this.dutysystemSelect(
           this.iconCurrentIndex,
@@ -2513,7 +2522,7 @@ export default {
       let param = {
         depteventId: depteventId,
       };
-      dutysystemList(param).then((res) => {
+      dutysystemList_direct(param).then((res) => {
         if (res.data != null && res.data.length > 0) {
           this.dutysystemTableData = res.data;
         } else {
@@ -2529,7 +2538,7 @@ export default {
       let param = {
         eventCode: this.eventCode,
       };
-      centereventtdepteventList(param).then((res) => {
+      centereventtdepteventList_direct(param).then((res) => {
         this.depteventList = res.data;
         this.showResponsibilityDialog = true;
       });
@@ -2579,7 +2588,7 @@ export default {
         eventCode: this.eventCode,
         eventName: this.eventName,
       };
-      dutysystemAdd(param).then((res) => {
+      dutysystemAdd_direct(param).then((res) => {
         this.$message.success(`保存成功!`);
         this.dutysystemSelect(
           this.iconCurrentIndex,
@@ -2705,7 +2714,7 @@ export default {
       this.$refs.bottomMenu.showChangChild = false
     },
     showUpdateYjYuAn() {
-      listYuAn().then((res) => {
+      listYuAn_direct({}).then((res) => {
         //关联预案列表
         if (res.code == 200) {
           this.guanLianYuAnList = res.data;
@@ -2732,7 +2741,7 @@ export default {
           this.$message.error(`请选择预案信息！`);
           return;
         }
-        updateYjYuAn(param).then((res) => {
+        updateYjYuAn_direct(param).then((res) => {
           //事件调整关联预案
           if (res.code == 200) {
             this.$message.success(`预案调整成功!`);
@@ -2744,6 +2753,7 @@ export default {
       }
     },
     fireControlViewPoint(type) {
+      // alert(type)
       if (this.resourcesListCheck.indexOf(type) > -1) {
         this.resourcesListCheck.splice(
           this.resourcesListCheck.indexOf(type),
@@ -2865,19 +2875,7 @@ export default {
         }
       }
     },
-    //设置联动部门不可选择本部门
-    recursiveChildren(arrayList,deptId) {
-      arrayList.forEach((item, index) => {
-        if(item.id==deptId){
-          item.disabled="true";
-          return
-        }
-        if(item.children){
-          this.recursiveChildren(item.children,deptId)
-        }
-      });
-    },
-    listResourceByWz(type) {
+    listResourceBybroadcast(type) {
       if (this.resourcesListCheck.indexOf(type) > -1) {
         this.resourcesListCheck.splice(
           this.resourcesListCheck.indexOf(type),
@@ -2891,14 +2889,10 @@ export default {
         let param = {
           longitude: this.longitude,
           latitude: this.latitude,
-          type: type,
-          radius: this.radius,
+          type: 5,
+          distance: this.radius,
         };
-        // listResourceByWz(param).then((res) => {
-        request({
-          url: `/center-monitor/camera/findNearbyCameras/${param.longitude}/${param.latitude}/${param.radius}`,
-          method: 'get'
-        }).then(res => {
+        getBroadcast(param).then(res => {
           if(res.data!=null&&res.data.length==0){
             this.$message.warning("设定范围内无该资源信息！")
           }
@@ -2909,9 +2903,9 @@ export default {
               let markersMap = {
                 lng: 124.59,
                 lat: 43.02,
-                icon: "marker",
+                icon: "big-horn",
+                click: "jump",
                 bindPopupHtml: "",
-                click: "",
                 parameter: "",
                 keepBindPopup: false,
                 isAggregation: true,
@@ -2930,7 +2924,10 @@ export default {
                 markersMap.icon = "sj-icon-fireteam";
               } else if (type == "zdqy") {
                 markersMap.icon = "sj-icon-keyAreas";
-              } else if (type == "sxt") {
+              } else if (type == "broadcast") {
+                markersMap.icon = "big-horn";
+              }
+              else if (type == "sxt") {
                 if (res.data[i].cameraUse == 1) {
                   if (res.data[i].workingStatus == '0') {
                     markersMap.icon = 'sj-icon-map-centerdata-slmonitor'
@@ -2996,7 +2993,7 @@ export default {
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
                 "                  <h4>资源名称：" +
-                res.data[i].cameraName +
+                res.data[i].name +
                 "</h4>" +
                 "                </div>" +
                 "                </div>" +
@@ -3011,7 +3008,19 @@ export default {
         });
       }
     },
-    listResourceBybroadcast(type) {
+    //设置联动部门不可选择本部门
+    recursiveChildren(arrayList,deptId) {
+      arrayList.forEach((item, index) => {
+        if(item.id==deptId){
+          item.disabled="true";
+          return
+        }
+        if(item.children){
+          this.recursiveChildren(item.children,deptId)
+        }
+      });
+    },
+    listResourceByWz(type) {
       if (this.resourcesListCheck.indexOf(type) > -1) {
         this.resourcesListCheck.splice(
           this.resourcesListCheck.indexOf(type),
@@ -3025,10 +3034,14 @@ export default {
         let param = {
           longitude: this.longitude,
           latitude: this.latitude,
-          type: 5,
-          distance: this.radius,
+          type: type,
+          radius: this.radius,
         };
-        getBroadcast(param).then(res => {
+        // listResourceByWz(param).then((res) => {
+        request({
+          url: `/center-monitor/camera/findNearbyCameras/${param.longitude}/${param.latitude}/${param.radius}`,
+          method: 'get'
+        }).then(res => {
           if(res.data!=null&&res.data.length==0){
             this.$message.warning("设定范围内无该资源信息！")
           }
@@ -3039,12 +3052,84 @@ export default {
               let markersMap = {
                 lng: 124.59,
                 lat: 43.02,
+                icon: "marker",
                 bindPopupHtml: "",
-                icon: "big-horn",
-                click: "jump",
+                click: "",
                 parameter: "",
                 keepBindPopup: false,
                 isAggregation: true,
+              };
+              if (type == "qsk") {
+                markersMap.icon = "sj-icon-centerdata-t-forest-waterintake";
+              } else if (type == "sh") {
+                markersMap.icon = "sj-icon-centerdata-t-forest-watercrane";
+              } else if (type == "xfs") {
+                markersMap.icon = "sj-icon-centerdata-t-forest-firehydrant";
+              } else if (type == "qjd") {
+                markersMap.icon = "sj-icon-landing";
+              } else if (type == "jcz") {
+                markersMap.icon = "sj-icon-checkpoint";
+              } else if (type == "fhd") {
+                markersMap.icon = "sj-icon-fireteam";
+              } else if (type == "zdqy") {
+                markersMap.icon = "sj-icon-keyAreas";
+              } else if (type == "sxt") {
+                if (res.data[i].cameraUse == 1) {
+                  if (res.data[i].workingStatus == '0') {
+                    markersMap.icon = 'sj-icon-map-centerdata-slmonitor'
+                    markersMap.click='preview'
+                  } else {
+                    markersMap.icon = 'sj-icon-map-not-centerdata-slmonitor'
+                    markersMap.click=''
+                  }
+                }
+                else if (res.data[i].cameraUse == 2) {
+                  if (res.data[i].workingStatus == '0') {
+                    markersMap.icon = 'camera'
+                    markersMap.click='preview'
+                  } else {
+                    markersMap.icon = 'camera-not'
+                    markersMap.click=''
+                  }
+                }
+                else if (res.data[i].cameraUse == 3) {
+                  if (res.data[i].workingStatus == '0') {
+                    markersMap.icon = 'sj-icon-map-centerdata-slmonitor-traffic'
+                    markersMap.click='preview'
+                  } else {
+                    markersMap.icon = 'sj-icon-map-not-centerdata-slmonitor-traffic'
+                    markersMap.click=''
+                  }
+                }
+                else if (res.data[i].cameraUse == 5) {
+                  if (res.data[i].workingStatus == '0') {
+                    markersMap.icon = 'sj-icon-map-centerdata-river_camera'
+                    markersMap.click='preview'
+                  } else {
+                    markersMap.icon = 'sj-icon-map-not-centerdata-river_camera'
+                    markersMap.click=''
+                  }
+                }
+                else if (res.data[i].cameraUse == 4) {
+                  if (res.data[i].workingStatus == '0') {
+                    markersMap.icon = 'sj-icon-map-centerdata-sand-quarry-camera'
+                    markersMap.click='preview'
+                  } else {
+                    markersMap.icon = 'sj-icon-map-not-centerdata-sand-quarry-camera'
+                    markersMap.click=''
+                  }
+                }
+                if (res.data[i].cameraCode != null) {
+                  // markersMap.click = "preview";
+                  // markersMap.parameter = res.data[i].cameraCode
+                  markersMap.parameter = {
+                    code: res.data[i].cameraCode,
+                    type: res.data[i].cameraFactory
+                      ? res.data[i].cameraFactory
+                      : 1,
+                    name: res.data[i].cameraName,
+                  };
+                }
               }
               markersMap.lng = res.data[i].longitude;
               markersMap.lat = res.data[i].latitude;
@@ -3054,7 +3139,7 @@ export default {
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
                 "                  <h4>资源名称：" +
-                res.data[i].name +
+                res.data[i].cameraName +
                 "</h4>" +
                 "                </div>" +
                 "                </div>" +
@@ -3274,20 +3359,20 @@ export default {
           if (that.eventTypeXl != null) {
             that.sendEventType = that.eventTypeXl;
           } else {
-            await listSJfl(param).then((res) => {
+            await listSJfl_direct(param).then((res) => {
               //事件类型
               if (res.code == 200) {
                 that.eventTypeList = res.data;
               }
             });
           }
-          await listYuAn().then((res) => {
+          await listYuAn_direct({}).then((res) => {
             //关联预案
             if (res.code == 200) {
               that.guanLianYuAnList = res.data;
             }
           });
-          await selectByeventCode(that.eventCode).then((res) => {
+          await selectByeventCode_direct(that.eventCode).then((res) => {
             //签收部门
             if (res.code == 200) {
               that.deptOptions = res.data;
@@ -3301,7 +3386,7 @@ export default {
         } else if (eventStatus == "wb") {
           //误报
           that.eventConfirmTitle = "事件误报";
-          await selectByeventCode(that.eventCode).then((res) => {
+          await selectByeventCode_direct(that.eventCode).then((res) => {
             //签收部门
             if (res.code == 200) {
               that.deptOptions = res.data;
@@ -3312,7 +3397,7 @@ export default {
         } else if (eventStatus == "cf") {
           //重复
           that.eventConfirmTitle = "事件重复";
-          await selectByeventCode(that.eventCode).then((res) => {
+          await selectByeventCode_direct(that.eventCode).then((res) => {
             //签收部门
             if (res.code == 200) {
               that.deptOptions = res.data;
@@ -3322,7 +3407,7 @@ export default {
           that.showEventConfirm = true;
         } else if (eventStatus == "ld") {
           //联动
-          await selectByeventCode(that.eventCode).then((res) => {
+          await selectByeventCode_direct(that.eventCode).then((res) => {
             //签收部门
             if (res.code == 200) {
               that.deptOptions = res.data;
@@ -3384,7 +3469,7 @@ export default {
           //   return;
           // }
           let eventState = "";
-          listSJfl({
+          listSJfl_direct({
             parentId: that.eventType,
           }).then((res) => {
             if (res.code == 200) {
@@ -3407,7 +3492,7 @@ export default {
                 eventState: eventState,
                 eventName: that.eventName,
               };
-              sendTask(param).then((res) => {
+              sendTask_direct(param).then((res) => {
                 if (res.code == 200) {
                   that.$message.success(`联动发起成功!`);
                   that.refreshEventDialog(that.eventCode);
@@ -3560,7 +3645,7 @@ export default {
             that.eventDescription = "";
           });
         } else if (eventStatus == "cz") {
-          eventHandling(that.eventId, that.eventCode).then((res) => {
+          eventHandling_direct(that.eventId, that.eventCode).then((res) => {
             if (res.code == 200) {
               that.$message.success(`处理成功!`);
               that.refreshEvent(that.eventCode);
@@ -3673,7 +3758,7 @@ export default {
       this.eventCode = eventCode;
       let that = this;
       //获取事件详情
-      getEventDetail({
+      getEventDetail_direct({
         eventCode: eventCode,
       }).then((res) => {
         let markersMapList = [];
@@ -3840,7 +3925,7 @@ export default {
       this.eventCode = eventCode;
       let that = this;
       //刷新--事件详情
-      getEventDetail({
+      getEventDetail_direct({
         eventCode: eventCode,
       }).then((res) => {
         let markersMapList = [];
@@ -4006,7 +4091,7 @@ export default {
     },
     refreshEventDialog(eventCode) {
       //刷新--事件日志12
-      getEventDetail({
+      getEventDetail_direct({
         eventCode: eventCode,
       }).then((res) => {
         this.eventLogList = res.data.eventlog;

src/views/firespread.vue

@@ -353,12 +353,14 @@
         <div style="clear: both;"></div>
       </el-form>
     </el-dialog>
+    <!-- 添加区域标记 -->
     <el-dialog title="火灾区域" :visible.sync="regionalFlagOpen" width="1000px">
       <areaSupermap ref="fireAreaSupermap" v-if="regionalFlagOpen" style="width: 100%;height:74vh"
                     :mapDiv="'fireAreaSuperMap1'" :mapSite="{doubleClickZoom:false}" :codes="['9fa5']"
                     :isSideBySide="false"
                     :showAreaLatLng="showAreaLatLng"></areaSupermap>
     </el-dialog>
+    <!-- 图片，视频预览 -->
     <el-dialog title="视频预览" :visible.sync="showTcPlayer" width="28%" customClass="customWidthMp4">
       <TcPlayer ref="TcPlayer" :playVideo="playVideo" :widthHeigt="[100,100]"></TcPlayer>
     </el-dialog>
@@ -439,6 +441,7 @@
         <div style="clear: both;"></div>
       </el-form>
     </el-dialog>
+    <!--    会议弹窗  start -->
     <el-dialog title="视频会议" :visible.sync="showMeetingMsgDialog" v-if="showMeetingMsgDialog" width="65%"
                @close="closeMeetingMsgDialog()">
       <el-form label-width="1500px">
@@ -503,6 +506,7 @@
         <div style="clear: both;"></div>
       </el-form>
     </el-dialog>
+    <!--    会议弹窗  end   -->
     <el-dialog title="火险报告" :visible.sync="showEventConfirm_gd" v-if="showEventConfirm_gd" width="100%"
                class="top-dialog" @close="cancelEventConfirm_gd()">
       <div class="table-container">
@@ -1005,13 +1009,9 @@
         </form>
       </div>
     </el-dialog>
-    <el-dialog title="火灾区域" :visible.sync="regionalFlagOpen" width="1000px">
-      <areaSupermap ref="fireAreaSupermap" v-if="regionalFlagOpen" style="width: 100%;height:74vh"
-                    :mapDiv="'fireAreaSuperMap1'" :mapSite="{doubleClickZoom:false}" :codes="['9fa5']"
-                    :isSideBySide="false"
-                    :showAreaLatLng="showAreaLatLng"></areaSupermap>
-      <!-- <areaSupermap ref="fireAreaSupermap" v-if="regionalFlagOpen" :showAreaLatLng="showAreaLatLng"></areaSupermap> -->
-    </el-dialog>
+    <!-- 添加区域标记 -->
+
+    <!-- 图片，视频预览 -->
     <el-dialog title="人员选择" :visible.sync="showFindUserByDept" width="40%">
       <findUserByDept v-if="showFindUserByDept" ref="findUserByDept" :deptId="iconCurrentIndex"
                       @addSelection="addSelection"></findUserByDept>
@@ -1124,7 +1124,6 @@ import {
   getIconBg
 } from '@/api/components/sookaMapIcon'; //资源底色控制文件
 import TVWall from '@/components/TVWall.vue' //电视墙弹窗
-import {getBroadcast} from "@/api/datacenter";
 import {
   getEventDetail,
   sendEventLog,
@@ -1146,7 +1145,16 @@ import {
   eventExamine,
   fireControlViewList,
   sendMessage,
-  fireControlViewPoint
+  fireControlViewPoint,
+  dutysystemRemove_direct,
+  dutysystemList_direct,
+  centereventtdepteventList_direct,
+  dutysystemAdd_direct,
+  listYuAn_direct,
+  updateYjYuAn_direct,
+  listSJfl_direct,
+  selectByeventCode_direct,
+  getEventDetail_direct, eventHandling_direct, sendTask_direct
 } from '@/api/forest'
 import {
   treeselectAll as deptTreeselect
@@ -1169,7 +1177,8 @@ import {
 import findUserByDept from '@/views/findUserByDept'
 import Cookies from "js-cookie"; //责任人选择弹框
 import request from "@/utils/request";
-import { selectConfigKey } from "@/api/system/config";
+import {selectConfigKey} from "@/api/system/config";
+import {getBroadcast} from "@/api/datacenter";
 
 export default {
   dicts: ['task_source'],
@@ -1583,7 +1592,6 @@ export default {
     },
     getNewDataByDate(eventCode) {
       const that = this
-      console.log(eventCode)
       getNewDataByDate(eventCode).then(function (res) {
         that.windDirection = res.data.windDirection
         that.windSpeed = res.data.windSpeed
@@ -1638,7 +1646,6 @@ export default {
       window.open("https://sts.sty1818.com");
     },
     fireControlViewPoint(type) {
-      // alert(type)
       if (this.resourcesListCheck.indexOf(type) > -1) {
         this.resourcesListCheck.splice(this.resourcesListCheck.indexOf(type), 1)
         setTimeout(() => {
@@ -1746,7 +1753,8 @@ export default {
               }, 1000)
             }
           })
-        } else if(type=="sxt"){
+        }
+        else if(type=="sxt"){
           this.listResourceByWz(type);
         }
         else if(type=="broadcast"){
@@ -1943,7 +1951,7 @@ export default {
         let param = {
           ids: row.id
         }
-        dutysystemRemove(param).then(res => {
+        dutysystemRemove_direct(param.ids).then(res => {
           this.$message.success(`删除成功!`)
           this.dutysystemSelect(this.iconCurrentIndex, this.dutysystemDeptName, this.depteventId)
         })
@@ -1954,7 +1962,7 @@ export default {
     handleSave: function (index, rowData) { //保存负责人行数
       rowData.dept = this.dutysystemDeptName
       rowData.depteventId = this.depteventId
-      dutysystemAdd(rowData).then(res => {
+      dutysystemAdd_direct(rowData).then(res => {
         this.$message.success(`保存成功!`)
         this.dutysystemSelect(this.iconCurrentIndex, this.dutysystemDeptName, this.depteventId)
       })
@@ -1969,7 +1977,7 @@ export default {
       let param = {
         depteventId: depteventId
       }
-      dutysystemList(param).then(res => {
+      dutysystemList_direct(param).then(res => {
         if (res.data != null && res.data.length > 0) {
           this.dutysystemTableData = res.data
         } else {
@@ -1982,7 +1990,7 @@ export default {
       let param = {
         eventCode: this.eventCode
       }
-      centereventtdepteventList(param).then(res => {
+      centereventtdepteventList_direct(param).then(res => {
         this.depteventList = res.data
         this.showResponsibilityDialog = true
       })
@@ -2017,7 +2025,7 @@ export default {
         eventCode: this.eventCode,
         eventName: this.eventName
       }
-      dutysystemAdd(param).then(res => {
+      dutysystemAdd_direct(param).then(res => {
         this.$message.success(`保存成功!`)
         this.dutysystemSelect(this.iconCurrentIndex, this.dutysystemDeptName, this.depteventId);
         this.closeResponsibilityDialog();
@@ -2033,7 +2041,7 @@ export default {
       this.$refs.supermapDialog1.showheatPlotting(this.latitude, this.longitude, this.windSpeed, this.windDirection)
     },
     showUpdateYjYuAn() {
-      listYuAn().then(res => {
+      listYuAn_direct({}).then(res => {
         //关联预案列表
         if (res.code == 200) {
           this.guanLianYuAnList = res.data
@@ -2050,7 +2058,7 @@ export default {
           eventCode: this.eventCode,
           reserve: this.sendGuanLianYuAn
         }
-        updateYjYuAn(param).then(res => {
+        updateYjYuAn_direct(param).then(res => {
           //事件调整关联预案
           if (res.code == 200) {
             this.$message.success(`预案调整成功!`)
@@ -2394,19 +2402,19 @@ export default {
           let param = {
             parentId: that.eventType
           }
-          await listSJfl(param).then(res => {
+          await listSJfl_direct(param).then(res => {
             //事件类型
             if (res.code == 200) {
               that.eventTypeList = res.data
             }
           })
-          await listYuAn().then(res => {
+          await listYuAn_direct({}).then(res => {
             //关联预案
             if (res.code == 200) {
               that.guanLianYuAnList = res.data
             }
           })
-          await selectByeventCode(that.eventCode).then(res => {
+          await selectByeventCode_direct(that.eventCode).then(res => {
             //签收部门
             if (res.code == 200) {
               that.deptOptions = res.data
@@ -2418,7 +2426,7 @@ export default {
           that.eventConfirmTitle = '事件确认'
         } else if (eventStatus == 'wb') { //误报
           that.eventConfirmTitle = '事件误报'
-          await selectByeventCode(that.eventCode).then(res => {
+          await selectByeventCode_direct(that.eventCode).then(res => {
             //签收部门
             if (res.code == 200) {
               that.deptOptions = res.data
@@ -2428,7 +2436,7 @@ export default {
           that.showEventConfirm = true
         } else if (eventStatus == 'cf') { //重复
           that.eventConfirmTitle = '事件重复'
-          await selectByeventCode(that.eventCode).then(res => {
+          await selectByeventCode_direct(that.eventCode).then(res => {
             //签收部门
             if (res.code == 200) {
               that.deptOptions = res.data
@@ -2437,7 +2445,7 @@ export default {
           })
           that.showEventConfirm = true
         } else if (eventStatus == 'ld') { //联动
-          await selectByeventCode(that.eventCode).then(res => {
+          await selectByeventCode_direct(that.eventCode).then(res => {
             //签收部门
             if (res.code == 200) {
               that.deptOptions = res.data
@@ -2492,7 +2500,7 @@ export default {
           //   return
           // }
           let eventState = "";
-          listSJfl({
+          listSJfl_direct({
             parentId: that.eventType
           }).then(res => {
             if (res.code == 200) {
@@ -2515,8 +2523,7 @@ export default {
                 eventState: eventState,
                 eventName: that.eventName
               }
-              debugger
-              sendTask(param).then(res => {
+              sendTask_direct(param).then(res => {
                 if (res.code == 200) {
                   that.$message.success(`联动发起成功!`)
                   that.refreshEventDialog(that.eventCode)
@@ -2660,7 +2667,7 @@ export default {
             that.eventDescription = ""
           })
         } else if (eventStatus == 'cz') {
-          eventHandling(that.eventId, that.eventCode).then(res => {
+          eventHandling_direct(that.eventId, that.eventCode).then(res => {
             if (res.code == 200) {
               that.$message.success(`处理成功!`)
               that.refreshEvent(that.eventCode)
@@ -2771,12 +2778,12 @@ export default {
       this.mapToolShow = false
       this.mapToolCheckItem = [];
       this.mapToolCheckAll = false
-      this.mapToolShowBH = false,
-        this.getNewDataByDate(this.calendarDay)
+      this.mapToolShowBH = false
+      this.getNewDataByDate(this.calendarDay)
       this.eventCode = eventCode
       let that = this
       //获取事件详情
-      getEventDetail({
+      getEventDetail_direct({
         eventCode: eventCode
       }).then(res => {
         let markersMapList = [];
@@ -2921,7 +2928,7 @@ export default {
       this.eventCode = eventCode
       let that = this
       //刷新--事件详情
-      getEventDetail({
+      getEventDetail_direct({
         eventCode: eventCode
       }).then(res => {
         let markersMapList = [];
@@ -3066,7 +3073,7 @@ export default {
     },
     refreshEventDialog(eventCode) {
       //刷新--事件日志12
-      getEventDetail({
+      getEventDetail_direct({
         eventCode: eventCode
       }).then(res => {
         this.eventLogList = res.data.eventlog

src/views/monitor.vue

@@ -120,6 +120,7 @@
 <script>
   import {
     selectDeviceType,
+    selectDeviceType_direct,
     notCoverPlaces,
     selectCameraByDeptId,
     getSensorListByDeptId,
@@ -193,7 +194,7 @@
         // this.chuanSet()
         this.getMonitorDeviceAndDataLists()
         this.getDlblistBydeptIds()
-        this.selectDeviceType(-1);
+        this.selectDeviceType('',-1);
         // this.getNotCoverPlaces(this.deptId);
       }, 2000)
     },
@@ -206,7 +207,7 @@
         visuForestCloudCameraBOListSearch: [],
         // 部门名称
         deptName: undefined,
-        deptId: '',
+        deptId: null,
         // 部门树选项
         deptOptions: undefined,
         defaultProps: {
@@ -437,7 +438,7 @@
         this.placeholderMsg = "请输入摄像头名称";
         this.deptId = Cookies.get("deptId");
         clearInterval(this.cgqTimer);
-        this.selectDeviceType();
+        this.selectDeviceType('',-1);
         // this.getNotCoverPlaces(this.deptId);
         this.jkListIcon = 'sj-icon-jkzx'
       },
@@ -1150,7 +1151,7 @@
       selectDeviceType() {
         //获取左侧动态感知设备
         let that = this
-        selectDeviceType(that.deptId).then(res => {
+        selectDeviceType_direct({deptId:that.deptId,type:5}).then((res) => {
           that.cameraMarkersList = []
           that.tempList = []
           that.visuForestCloudMapDeviceBOList = res.data.visuForestCloudMapDeviceBOList