接口转直连

src/api/event.js

@@ -10,28 +10,28 @@ export function getTodayEvent() {
 // 点击今日事件前三个按钮列表
 export function getEventStatusList(eventStatus) {
   return request({
-    url: '/center-agriculture/VisuForestEventCenterController/getEventList?eventStatus='+eventStatus,
+    url: '/center-agriculture/VisuForestEventCenterController/getEventList?eventStatus=' + eventStatus,
     method: 'post',
   })
 }
 // 点击今日事件后三个按钮列表
 export function getEventSourceList(eventSource) {
   return request({
-    url: '/center-agriculture/VisuForestEventCenterController/getEventList?eventSource='+eventSource,
+    url: '/center-agriculture/VisuForestEventCenterController/getEventList?eventSource=' + eventSource,
     method: 'post',
   })
 }
 // 点击部门
 export function getEventListByDeptIdList(deptId) {
   return request({
-    url: '/center-agriculture/VisuForestEventCenterController/getEventList?deptId='+deptId,
+    url: '/center-agriculture/VisuForestEventCenterController/getEventList?deptId=' + deptId,
     method: 'post',
   })
 }
 // 点击类型
 export function getEventListByTypeList(eventType) {
   return request({
-    url: '/center-agriculture/VisuForestEventCenterController/getEventList?eventType='+eventType,
+    url: '/center-agriculture/VisuForestEventCenterController/getEventList?eventType=' + eventType,
     method: 'post',
   })
 }
@@ -46,9 +46,9 @@ export function getForest(id) {
 
 
 //修改森林防火事件状态
-export function updateCentereventTForestfireStatus(id,zt) {
+export function updateCentereventTForestfireStatus(id, zt) {
   return request({
-    url: '/center-event/event/forest/forestfire/updateCentereventTForestfireStatus/'+ id+'/'+zt,
+    url: '/center-event/event/forest/forestfire/updateCentereventTForestfireStatus/' + id + '/' + zt,
     method: 'get'
   })
 }
@@ -57,15 +57,22 @@ export function getImgUrl(data) {
   return request({
     url: '/monitor/DahuaController/getImgUrl',
     method: 'get',
-    data:data
+    data: data
   })
 }
 
 //根据类型获取事件
 export function getNearEvent(longitude, latitude, day, loading, eventTypeIdDl, eventTypeId) {
   return request({
-    url: '/center-traffic/traffic/getNearEvent?longitude=' + longitude + "&latitude=" + latitude + "&day=" + day + "&eventTypeIdDl=" + eventTypeIdDl + "&eventTypeId=" + eventTypeId,
-    method: 'get',
+    url: '/center-event/eventview/getNearEvent',
+    method: 'post',
+    data: {
+      longitude: longitude,
+      latitude: latitude,
+      day: day,
+      eventTypeIdDl: eventTypeIdDl,
+      eventTypeId: eventTypeId,
+    },
     headers: {
       loading: loading
     },
@@ -73,7 +80,7 @@ export function getNearEvent(longitude, latitude, day, loading, eventTypeIdDl, e
 }
 
 //获取附近事件
-export function getNearEvent1(longitude, latitude ) {
+export function getNearEvent1(longitude, latitude) {
   return request({
     url: '/center-traffic/traffic/getNearEvent?longitude=' + longitude + "&latitude=" + latitude,
     method: 'get',
@@ -81,10 +88,9 @@ export function getNearEvent1(longitude, latitude ) {
 }
 
 //获取附近摄像头
-export function getNearCamera(longitude,latitude) {
+export function getNearCamera(longitude, latitude) {
   return request({
-    url: '/center-traffic/traffic/getNearCamera?longitude='+longitude+"&latitude="+latitude+"&type=6",
+    url: '/center-traffic/traffic/getNearCamera?longitude=' + longitude + "&latitude=" + latitude + "&type=6",
     method: 'get',
   })
 }
-

src/api/forest.js

@@ -55,12 +55,6 @@ export function initByCameras(param) {
 
 }
 // 获取绑定的事件类型
-export function getMenuEventType() {
-  return request({
-    url: '/center-traffic/traffic/getMenuEventType',
-    method: 'get',
-  })
-}
 // 获取事件详情
 export function getEventPush(param) {
   return request({

src/api/monitor.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 获取左侧动态感知设备
 export function selectDeviceType(deptId) {
   return request({
-    url: '/center-agriculture/monitor/selectDeviceType',
+    url: '/center-monitor/camera/selectDeviceTypeGong',
     method: 'post',
     data: {
       "deptId": deptId,
@@ -15,7 +15,7 @@ export function selectDeviceType(deptId) {
 // 根据设备类型查看列表
 export function selectCameraByDeptId(deptId) {
   return request({
-    url: '/center-agriculture/monitor/selectCameraByDeptId',
+    url: '/center-monitor/camera/selectCameraByDeptId',
     method: 'post',
     data: {
       "deptId": deptId,
@@ -47,7 +47,7 @@ export function findCameraByEventCoordinate(longitude, latitude) {
 //根据部门ID获取具有查看权限的摄像头
 export function getCamerasByDeptId(deptId) {
   return request({
-    url: '/center-traffic/traffic/getCamerasByDeptId?deptId=' + deptId,
+    url: '/center-monitor/TVWallController/getCamerasByDeptId?deptId=' + deptId+'&deptProtype=2',
     method: 'get',
   })
 }
@@ -83,9 +83,9 @@ export function getSensorListByDeptId(deptId) {
 export function getDlblistBydeptId(deptId) {
   let url = "";
   if (deptId != null) {
-    url = '/center-fire/VisuForestMonitorCenterController/getDlblistBydeptId?deptId=' + deptId + "&type=6";
+    url = '/center-monitor/broadcast/getDlblistBydeptId?deptId=' + deptId + "&type=6";
   } else {
-    url = '/center-fire/VisuForestMonitorCenterController/getDlblistBydeptId?type=6';
+    url = '/center-monitor/broadcast/getDlblistBydeptId?type=6';
   }
   return request({
     url: url,
@@ -102,4 +102,4 @@ export function getMonitorDeviceAndDataList(deptId) {
     url: url,
     method: 'get',
   })
-}
+}

src/api/resources.js

@@ -3,8 +3,8 @@ import request from '@/utils/request'
 // 获取左侧资源数量
 export function getResourcesCount() {
   return request({
-    url: '/center-traffic/traffic/getResourcesCount',
-    method: 'post',
+    url: '/center-data/trafficView/trafficViewList',
+    method: 'get',
   })
 }
 

src/views/forest.vue

@@ -425,7 +425,6 @@
   /** ----------------------------------weosocket结束------------------------------------- */
 
   import {
-    getMenuEventType,
     getEventPush,
     getLatestNotice,
     getTodayEvents,
@@ -754,9 +753,6 @@
               }
             }
           }
-          // if (this.showSearch == true) {
-          //   this.dataChat();
-          // }
           that.$refs.supermap.clearM(false);
           that.$refs.supermap.setMarkers(that.markersList);
         });
@@ -819,14 +815,6 @@
           "                </div>" +
           "                </span></div>";
         let that = this
-        getResourcesCount().then(res => {
-          this.resourcesCountList = res.data;
-          this.resourcesCountList.forEach(function(data, index) {
-            let icon = 'sj' + '-' + 'icon' + '-' + data.type.replaceAll("_", "-").replaceAll("@", "-");
-            that.$set(that.resourcesCountList[index], 'icon', icon);
-            that.$set(that.resourcesCountList[index], 'bg', getIconBg(icon));
-          })
-        })
         return markersMap;
       },
       sewageOutletClick(data) {
@@ -1093,13 +1081,11 @@
       },
       getMenuEventType() {
         let that = this
-        getMenuEventType().then(res => {
           that.websockSid.userId = Cookies.get('userId')
-          that.websockSid.eventTypeDl = res.data.eventTypeDl
-          that.websockSid.eventType = res.data.eventType
+          that.websockSid.eventTypeDl = Cookies.get("eventTypeDl").split(",").length == 0 ? ['-1'] : Cookies.get("eventTypeDl").split(",")
+          that.websockSid.eventType = Cookies.get("eventType").split(",").length == 0 ? ['-1'] : Cookies.get("eventType").split(",")
           that.initWebSocket(that.websockSid.userId, that.websockSid.eventTypeDl, that.websockSid.eventType)
           console.log(that.websockSid)
-        })
       },
       dropLocation(lat, lng, eventCode) {
         this.$refs.supermap.dropLocation(lat, lng, 18)
@@ -1378,7 +1364,9 @@
       },
       getSupermap(day, loading) {
         let that = this
-        getNearEvent('', '', day, loading, that.eventTypeIdDl, that.eventTypeId).then(res => {
+        let eventTypeIdDl = that.eventTypeIdDl.length == 0 ? Cookies.get("eventTypeDl").split(",") : that.eventTypeIdDl;
+        let eventTypeId = that.eventTypeIdDl.length == 0 ? Cookies.get("eventType").split(",") : that.eventTypeId;
+        getNearEvent('', '', day, loading, eventTypeIdDl, eventTypeId).then(res => {
           that.markersList = [];
           if (res.data != null && res.data.length > 0) {
             for (let i = 0; i < res.data.length; i++) {
@@ -1462,7 +1450,6 @@
           } else {
             setTimeout(() => {
               that.$refs.supermap.clearM()
-
               that.getResourcesCount();
             }, 2000)
           }

src/views/monitor.vue

@@ -213,12 +213,6 @@
       }, 2000)
       this.getMonitorDeviceAndDataLists();
       this.bottomMenuList(); //获取底部公共组件消息和任务
-      // this.getSensorListByDeptId(-1)
-      // this.getDlblistBydeptId(-1)
-      // this.getMonitorDeviceAndDataList()
-      // this.cgqTimer = setInterval(() => {
-      //   this.getMonitorDeviceAndDataList()
-      // }, 5 * 60 * 1000)
       this.getDlblistBydeptIds(-1);
       this.selectDeviceType();
     },