qinhouyu vor 1 Jahr
Ursprung
Commit
feb233cd86
2 geänderte Dateien mit 33 neuen und 4 gelöschten Zeilen
  1. 14 0
      src/api/event.js
  2. 19 4
      src/components/eventLocation.vue

+ 14 - 0
src/api/event.js

@@ -43,3 +43,17 @@ export function getNearCamera(longitude,latitude) {
   })
 }
 
+export function getNearEvent1_direct(longitude, latitude ,vo) {
+  return request({
+    url: '/center-event/eventview/getNearEvent',
+    method: 'post',
+    data:{longitude:longitude,latitude:latitude,eventTypeId:vo.eventTypeId,eventTypeIdDl:vo.eventTypeIdDl,day:vo.day}
+  })
+}
+
+export function getNearCamera_monitor(longitude,latitude,type) {
+  return request({
+    url: `/center-monitor/camera/selectFjsxt/${longitude}/${latitude}/${type}`,
+    method: 'get',
+  })
+}

+ 19 - 4
src/components/eventLocation.vue

@@ -138,8 +138,9 @@
 <script>
 import {
   getNearEvent1,
-  getNearCamera
+  getNearCamera, getNearEvent1_direct,getNearCamera_monitor
 } from '@/api/event'
+
 import {
   getHaiKangVideoServer
 } from '@/api/haikang/haikang'
@@ -152,6 +153,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'],
@@ -315,12 +317,14 @@ export default {
           function() {  // 断开与插件服务连接失败
           })
       }
+      this.cameraList=[]
+      this.eventList=[]
     },
     showEventDialog(eventCode) {
       //事件信息弹出
       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 +345,18 @@ export default {
         isAggregation: false
       }]
       let that = this
-      getNearEvent1(that.longitude, that.latitude).then(res => {
+      let res = await selectByMenuId({ menuId: 5 });
+      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) {
@@ -454,7 +469,7 @@ export default {
         }
         that.cameraMarkersList = []
         that.cameraList = []
-        getNearCamera(that.longitude, that.latitude).then(res => {
+        getNearCamera_monitor(that.longitude, that.latitude,4).then(res => {
           //根据设备类型查看列表
           that.cameraList = res.data