Ver código fonte

电视墙 资源详情 样式 土地也能点 视频预览宽度 气泡去除地址 电视墙未绑定 资源详情背景高度 监控中心传感器离线图标 误报、重复 摄像头离线图标 视频会议动态url 云广播资源

wangzhe 1 ano atrás
pai
commit
4b2124500f
3 arquivos alterados com 131 adições e 8 exclusões
  1. 8 0
      src/api/forest.js
  2. 61 3
      src/views/eventdetailsdialog.vue
  3. 62 5
      src/views/firespread.vue

+ 8 - 0
src/api/forest.js

@@ -15,6 +15,14 @@ export function fireControlViewPoint(param) {
 
   })
 }
+// 点击左侧菜单列表查询落点
+export function fireControlViewPoint_ygb(param) {
+  return request({
+    url: `/center-monitor/broadcast/selectNearHorn/${param.longitude}/${param.latitude}/${param.distance}/7`,
+    method: 'get'
+
+  })
+}
 export function getNewDataByDate(data) {
   return request({
     url: '/center-event/spread/getNewDataByDate?Date='+data,

+ 61 - 3
src/views/eventdetailsdialog.vue

@@ -240,6 +240,7 @@
                   :isSideBySide="false"
                   :isdynamicPlotting="true"
                   @preview="preview"
+                  @jump="jump"
                   :mapToolShowBH="mapToolShowBH"
                 />
                 <!-- <supermapDialog ref="supermapDialog" -->
@@ -2027,6 +2028,7 @@ import { getIconBg } from "@/api/components/sookaMapIcon"; //资源底色控制
 import request from "@/utils/request";
 
 import {
+  fireControlViewPoint_ygb,
   fireControlViewPoint,
   fireControlViewList,
   getEventDetail,
@@ -2313,6 +2315,10 @@ export default {
     /** ----------------------------------摄像头预览结束------------------------------------- */
   },
   methods: {
+    jump() {
+      // 跳转云广播页面
+      window.open("https://sts.sty1818.com");
+    },
     closedEventDiaTool() {
       document.addEventListener("click", (e) => {
         let b = document.getElementById("eventMapToolOnly");
@@ -2375,6 +2381,13 @@ export default {
           icon: "sj-icon-jkzx",
           bg: "#f5ad1b",
         });
+        _this.resourcesList.push({
+          resourceName: "云广播",
+          type: "ygb",
+          count: "1",
+          icon: "sj-icon-labaguangbo",
+          bg: "#841bf5",
+        });
       });
     },
     /************************************责任制-开始****************************************/
@@ -2697,7 +2710,54 @@ export default {
           type: type,
           radius: this.radius,
         };
-        if (type != "sxt") {
+        if (type == "sxt"){
+          this.listResourceByWz(type);
+        }else if(type == "ygb"){
+          let params = {
+            longitude: this.longitude,
+            latitude: this.latitude,
+            type:7,
+            // distance: 500000000000000000
+            distance: this.radius
+          }
+          fireControlViewPoint_ygb(params).then(res => {
+            console.log('云广播=',res)
+            let markersList = []
+            for (let i = 0; i < res.data.length; i++) {
+              let markersMap = {
+                lng: 124.59,
+                lat: 43.02,
+                icon: 'big-horn',
+                bindPopupHtml: '',
+                click: 'jump',
+                parameter: '',
+                keepBindPopup: false,
+                isAggregation: false
+              }
+              if(res.data[i].broadcastUse == '1'){
+                markersMap.icon = 'big-horn-emergency'
+              }else if (res.data[i].broadcastUse == '2') {
+                markersMap.icon = 'big-horn'
+              }
+              markersMap.lng = res.data[i].longitude
+              markersMap.lat = res.data[i].latitude
+              markersMap.bindPopupHtml = '<div class="map-tip">' +
+                '<span>' +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                '                  <h4>资源名称:' + res.data[i].name + '</h4>' +
+                '                </div>' +
+                '                </div>' +
+                '                </span>' +
+                '</div>'
+              markersList.push(markersMap)
+              console.log("markersMap=", markersMap)
+            }
+            setTimeout(() => {
+              this.$refs.supermapDialog1.setMarkersByType(markersList, type)
+            }, 1000)
+          })
+        } else {
           fireControlViewPoint(param).then((res) => {
             if (res.data != null && res.data.pointList.length > 0) {
               this.resourcesListCheck.push(type);
@@ -2793,8 +2853,6 @@ export default {
               this.$message.warning("当前点位附近无资源数据");
             }
           });
-        } else {
-          this.listResourceByWz(type);
         }
       }
     },

+ 62 - 5
src/views/firespread.vue

@@ -138,7 +138,7 @@
                 <supermapDialog1 ref="supermapDialog1" style="position: absolute; top:0;left: 0;"
                                  :mapDiv="'forestWarmSuperMap'"
                                  :mapSite="{doubleClickZoom:true,dragging:true,scrollWheelZoom:true}" :codes="['9fa5']"
-                                 :isSideBySide="false" @preview="preview" :mapToolShowBH="mapToolShowBH"/>
+                                 :isSideBySide="false" @preview="preview" @jump="jump" :mapToolShowBH="mapToolShowBH"/>
                 <!-- 地图end -->
               </div>
             </el-col>
@@ -1119,7 +1119,8 @@ import {
   eventExamine,
   fireControlViewList,
   sendMessage,
-  fireControlViewPoint
+  fireControlViewPoint,
+  fireControlViewPoint_ygb
 } from '@/api/forest'
 import {
   treeselectAll as deptTreeselect
@@ -1447,6 +1448,10 @@ export default {
     this.fireControlViewList();
   },
   methods: {
+    jump() {
+      // 跳转云广播页面
+      window.open("https://sts.sty1818.com");
+    },
     showTVWallDiaLog() {
       this.initByCameras();
       // this.$refs.TVWall.showTVWall();
@@ -1589,6 +1594,13 @@ export default {
           icon: "sj-icon-jkzx",
           bg: "#f5ad1b",
         });
+        _this.resourcesList1.push({
+          resourceName: "云广播",
+          type: "ygb",
+          count: "1",
+          icon: "sj-icon-labaguangbo",
+          bg: "#841bf5",
+        });
       });
     },
     fireControlViewPoint(type) {
@@ -1606,7 +1618,54 @@ export default {
           type: type,
           radius: this.radius
         }
-        if (type != 'sxt') {
+        if(type == 'sxt'){
+          this.listResourceByWz(type);
+        } else if(type == 'ygb'){
+          let params = {
+            longitude: this.longitude,
+            latitude: this.latitude,
+            type:7,
+            // distance: 500000000000000000
+            distance: this.radius
+          }
+          fireControlViewPoint_ygb(params).then(res => {
+            console.log('云广播=',res)
+            let markersList = []
+            for (let i = 0; i < res.data.length; i++) {
+              let markersMap = {
+                lng: 124.59,
+                lat: 43.02,
+                icon: 'big-horn',
+                bindPopupHtml: '',
+                click: 'jump',
+                parameter: '',
+                keepBindPopup: false,
+                isAggregation: false
+              }
+              if(res.data[i].broadcastUse == '1'){
+                markersMap.icon = 'big-horn-emergency'
+              }else if (res.data[i].broadcastUse == '2') {
+                markersMap.icon = 'big-horn'
+              }
+              markersMap.lng = res.data[i].longitude
+              markersMap.lat = res.data[i].latitude
+              markersMap.bindPopupHtml = '<div class="map-tip">' +
+                '<span>' +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                '                  <h4>资源名称:' + res.data[i].name + '</h4>' +
+                '                </div>' +
+                '                </div>' +
+                '                </span>' +
+                '</div>'
+              markersList.push(markersMap)
+              console.log("markersMap=", markersMap)
+            }
+            setTimeout(() => {
+              this.$refs.supermapDialog1.setMarkersByType(markersList, type)
+            }, 1000)
+          })
+        } else {
           fireControlViewPoint(param).then(res => {
             if (res.data != null && res.data.pointList.length > 0) {
               this.resourcesListCheck.push(type)
@@ -1700,8 +1759,6 @@ export default {
               }, 1000)
             }
           })
-        } else {
-          this.listResourceByWz(type);
         }
       }
     },