merge

src/views/sys/exception/VideoSupervision/caselist/index.vue

@@ -9,7 +9,7 @@
     <div class="case-list">
       <div class="case-item" v-for="item in list" :key="item.id" @click="toPosition(item)">
         <img src="/statistical/prove-icon.png" alt="" />
-        <span>{{ item.countyname }}{{ item.streetname }}*********拆除复耕</span>
+        <span>{{ item.countyname }}{{ item.streetname }}{{item.communityname}}&nbsp;&nbsp;&nbsp;拆除复耕</span>
       </div>
     </div>
   </div>
@@ -45,6 +45,7 @@ function handlerLayerButtonClick(item){
 
 
   function toPosition(item){
+    console.log("item123",item);
     emits("toPosition",[item.lng,item.lat])
   }
 

src/views/sys/exception/VideoSupervision/layercontrol/index.vue

@@ -17,11 +17,11 @@ import { ref,defineEmits } from 'vue';
 const layerButtons = ref([
     {
         lable:"航飞区域",
-        value:"",
+        value:"hangfeiarea",
         checked:false,
     },{
         lable:"航飞规划",
-        value:"",
+        value:"hangfeiplan",
         checked:false,
     },{
         lable:"视频监控",
@@ -30,7 +30,7 @@ const layerButtons = ref([
     },{
         lable:"影像图",
         value:"yingxiang",
-        checked:false,
+        checked:true,
     },{
         lable:"导航图",
         value:"dianzi",

src/views/sys/exception/VideoSupervision/map/map.vue

@@ -90,7 +90,7 @@
             minzoom: 0,
             maxzoom: 18,
             layout: {
-              visibility: 'none',
+              visibility: 'visible',
             },
           },
           {
@@ -655,6 +655,7 @@
       handlerLoadMaskLayer();
       loadMonitorLayer();
       loadFuFeiLayer();
+      getHangFeiAreaData();
       emits('onload');
       map.on('click', (e) => {
         var center = map.getCenter(); // 获取当前视图中心点
@@ -889,6 +890,32 @@
 
   }
 
+  // 航飞区域
+  function getHangFeiAreaData(){
+    axios({
+      method: 'get',
+      url: `http://120.222.154.7:8090/geoserver/linyishi/ows?service=WFS&version=1.0.0&request=GetFeature&typeName=linyishi%3Azhongdianquyu&maxFeatures=99999&outputFormat=application%2Fjson`,
+    }).then((res) => {
+      loadHangFeiAreaLayer(res.data);
+    });
+  }
+
+  function loadHangFeiAreaLayer(geojson){
+      map.addSource('hangfeiAreaSource', {
+        type: 'geojson',
+        data: geojson,
+      });
+      map.addLayer({
+        id: 'hangfeiarea',
+        type: 'line',
+        source: 'hangfeiAreaSource',
+        paint: {
+          'line-color': '#6F7FF4', // 设置线的颜色
+          'line-width': 3, // 设置线的宽度
+        },
+      });
+  }
+
   // 抛出函数
   defineExpose({
     handlerChangeCounty, // 切换县区
@@ -897,6 +924,7 @@
     handlerLocation, // 定位
     handlerUpdateUavLayer, // 无人机图层
   });
+
 </script>
 <style type="less" scoped>
   .map-container {

src/views/sys/exception/VideoSupervision/uav/uav.vue

@@ -248,7 +248,6 @@ function handlerPlayVideo(item){
         currentUav = phone;
         window.websocket.send(phone);
         setTimeout(function(){
-            alert("http://live.hopetrytech.com/live/" + phone + ".flv")
             if (player) {
                 alert("http://live.hopetrytech.com/live/" + phone + ".flv")
                 player.src("http://live.hopetrytech.com/live/" + phone + ".flv");