事件定位直连

src/api/event.js

@@ -1,29 +1,35 @@
 import request from '@/utils/request'
 
-//根据类型获取事件
-export function getNearEvent(longitude, latitude, day, loading, eventTypeIdDl, eventTypeId) {
+
+export function getNearEvent1_direct(longitude, latitude ,vo) {
   return request({
-    url: '/center-resources/VisuForestEventCenterController/getNearEvent?longitude=' + longitude + "&latitude=" + latitude + "&day=" + day + "&eventTypeIdDl=" + eventTypeIdDl + "&eventTypeId=" + eventTypeId,
-    method: 'get',
-    headers: {
-      loading: loading
-    },
+    url: '/center-event/eventview/getNearEvent',
+    method: 'post',
+    data:{longitude:longitude,latitude:latitude,eventTypeId:vo.eventTypeId,eventTypeIdDl:vo.eventTypeIdDl,day:vo.day}
   })
 }
 
-//获取附近事件
-export function getNearEvent1(longitude, latitude ) {
+export function getNearCamera_monitor(longitude,latitude,type) {
   return request({
-    url: '/center-resources/VisuForestEventCenterController/getNearEvent?longitude=' + longitude + "&latitude=" + latitude,
+    url: `/center-monitor/camera/selectFjsxt/${longitude}/${latitude}/${type}`,
     method: 'get',
   })
 }
 
-//获取附近摄像头
-export function getNearCamera(longitude, latitude) {
+
+export function getNearEvent(longitude, latitude, day, loading, eventTypeIdDl, eventTypeId) {
   return request({
-    url: '/center-resources/VisuForestEventCenterController/getNearCamera?longitude=' + longitude + "&latitude=" + latitude + "&type=1",
-    method: 'get',
+    url: '/center-event/eventview/getNearEvent',
+    method: 'post',
+    data: {
+      longitude: longitude,
+      latitude: latitude,
+      day: day,
+      eventTypeIdDl: eventTypeIdDl,
+      eventTypeId: eventTypeId,
+    },
+    headers: {
+      loading: loading
+    },
   })
 }
-

src/api/forest.js

@@ -393,6 +393,13 @@ export function sendMessage(param) {
     data:param
   })
 }
+export function selectByMenuId(data) {
+  return request({
+    url: '/system/menuEventType/selectByMenuId',
+    method: 'post',
+    data: data
+  })
+}
 // 左侧获取通知公共
 export function getLatestNotice() {
   return request({

src/components/eventLocation.vue

@@ -149,14 +149,14 @@
 <script>
 import {
   getNearEvent1,
-  getNearCamera
+  getNearCamera, getNearEvent1_direct, getNearCamera_monitor
 } from '@/api/event'
 import {
   getHaiKangVideoServer
 } from '@/api/haikang/haikang'
 import eventLocationSupermap from '@/components/supermap' //超图
 import eventdetailsdialog from '@/views/eventdetailsdialog.vue' //事件详情弹窗
-
+import {selectByMenuId} from "@/api/forest";
 /** ----------------------------------摄像头预览开始------------------------------------- */
 import {
   getDahuaVideoServer, getTVWallList
@@ -320,7 +320,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 +341,18 @@ export default {
         isAggregation: false
       }]
       let that = this
-      getNearEvent1(that.longitude, that.latitude).then(res => {
+      let res = await selectByMenuId({ menuId: 8 });
+      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 +471,7 @@ export default {
         }
         that.cameraMarkersList = []
         that.cameraList = []
-        getNearCamera(that.longitude, that.latitude).then(res => {
+        getNearCamera_monitor(that.longitude, that.latitude,7).then(res => {
           //根据设备类型查看列表
           that.cameraList = res.data
 
@@ -663,6 +674,8 @@ export default {
           function() {  // 断开与插件服务连接失败
           })
       }
+      this.cameraList=[]
+      this.eventList=[]
     },
     /** 预览按钮操作 */
     preview(cameraParam) {