Merge branch 'master' of http://123.132.248.154:10000/xujingliang/Fei_Xian_Lin_Ye_Fang_Huo

src/components/PermissionBtn/index.vue

@@ -53,9 +53,7 @@ export default {
   mounted() {
     var route = this.$route
     var elements = route.meta.elements
-    this.buttons = elements.sort((a, b) => {
-      return a.sort - b.sort
-    })
+    this.buttons = elements
   },
   methods: {
     fetchData() {

src/components/PermissionMenu/index.vue

@@ -45,10 +45,7 @@ export default {
   mounted() {
     var route = this.$route
     var elements = route.meta.elements
-    console.log(elements)
-    this.buttons = elements.sort((a, b) => {
-      return a.sort - b.sort
-    })
+    this.buttons = elements
 
     for (var btn of this.buttons) {
       var item= { text: btn.name, icon:btn.icon,id:btn.domId, click:(event) =>{var evt = event || window.event;var src = evt.target || evt.srcElement;if(src.tagName!='DIV')src=src.parentNode;this.$emit('btn-event',src.id)}}

src/views/gridman/forestranger/widget/AddForm.vue

@@ -113,11 +113,13 @@
         getMethodCommon("/FireCodeApp/GetForestryUserById?id=" + this.detailInfo[0].Id, {}).then(res => {
           if (res.code == 200) {
             this.addForm = res.data[0]
-            var areaId = this.addForm.areaId.split(',')
+            if(this.addForm.areaId){
+              var areaId = this.addForm.areaId.split(',')
+              this.addForm.areaId = turnNum(areaId)
+            }
             var turnNum = function (nums) {
               return nums.map(Number);
             }
-            this.addForm.areaId = turnNum(areaId)
             if (this.addForm.Sex == 0) {
               this.addForm.Sex = '男'
             } else {

src/views/gridman/forestranger/widget/ditu.vue

@@ -3,36 +3,35 @@
 </template>
 
 <script>
-import { postMethodCommon, getMethodCommon } from '../../../../api/common';
+import { postMethodCommon, getMethodCommon } from "../../../../api/common";
 import mapboxgl from "mapbox-gl";
+import { waiData } from "../xianjiewai";
 mapboxgl.accessToken =
   "pk.eyJ1Ijoic2hpY2hhbzEyMyIsImEiOiJja3FobnI1aDEwNGF6Mm9vOXVhNnBzZmFhIn0.2fZKiMqCQHxVY74QShMEGQ";
 export default {
-  props: ['rowkey','lnglat','flyCenter'],
+  props: ["rowkey", "lnglat", "flyCenter"],
   data() {
     return {
       map: null,
-      clockInList: []
+      clockInList: [],
     };
   },
-  watch:{
-    rowkey:function(e){
-      const el = document.createElement('img'); //这里可以是任意标签
-					el.className = 'marker';
-					el.src = "/img/dakadian.png"; //图片路径赋值
-          el.style.width = "40px"
-					// 添加自定义标记点
-					new mapboxgl.Marker(el)
-						.setLngLat([this.lnglat.lngLat.lng,this.lnglat.lngLat.lat])
-						.addTo(this.map);
+  watch: {
+    rowkey: function (e) {
+      const el = document.createElement("img"); //这里可以是任意标签
+      el.className = "marker";
+      el.src = "/img/dakadian.png"; //图片路径赋值
+      el.style.width = "40px";
+      // 添加自定义标记点
+      new mapboxgl.Marker(el)
+        .setLngLat([this.lnglat.lngLat.lng, this.lnglat.lngLat.lat])
+        .addTo(this.map);
     },
-    lnglat:function(e){
-      
+    lnglat: function (e) {},
+    flyCenter: function (e) {
+      console.log("eee123", e);
+      this.flyTo(e);
     },
-    flyCenter:function(e){
-      console.log('eee123',e)
-      this.flyTo(e)
-    }
   },
   mounted() {
     this.$nextTick(function () {
@@ -40,32 +39,30 @@ export default {
     });
   },
   methods: {
-    flyTo(e){
+    flyTo(e) {
       this.map.flyTo({
-          center: e,//中心点
-          zoom: 14,//缩放比例
-          curve: 1
-        });
-    },  
-    getClockInList(){
-      getMethodCommon("/FireGrid/GetTotalCheckPoint").then(res =>{
-        this.clockInList = res.result
-        console.log('this.clockInList',this.clockInList)
-        this.addPointLayer()
-      })
+        center: e, //中心点
+        zoom: 14, //缩放比例
+        curve: 1,
+      });
     },
-    addPointLayer(){
-      this.clockInList.forEach(item =>{
-        console.log('iii',item)
-        let el = document.createElement('img'); //这里可以是任意标签
-					el.className = 'marker';
-					el.src = "/img/dakadian.png"; //图片路径赋值
-          el.style.width = "40px"
-					// 添加自定义标记点
-					new mapboxgl.Marker(el)
-						.setLngLat([item.lng,item.lat])
-						.addTo(this.map);
-      })
+    getClockInList() {
+      getMethodCommon("/FireGrid/GetTotalCheckPoint").then((res) => {
+        this.clockInList = res.result;
+        console.log("this.clockInList", this.clockInList);
+        this.addPointLayer();
+      });
+    },
+    addPointLayer() {
+      this.clockInList.forEach((item) => {
+        console.log("iii", item);
+        let el = document.createElement("img"); //这里可以是任意标签
+        el.className = "marker";
+        el.src = "/img/dakadian.png"; //图片路径赋值
+        el.style.width = "40px";
+        // 添加自定义标记点
+        new mapboxgl.Marker(el).setLngLat([item.lng, item.lat]).addTo(this.map);
+      });
     },
     initMap(url, jwd) {
       let _this = this;
@@ -73,18 +70,124 @@ export default {
         container: this.$refs.datamap,
         style: "mapbox://styles/shichao123/clf3b1bxk007801moo0nnl87k",
         center: [117.977325, 35.265961],
-        zoom: 14,
+        zoom: 10,
         language: "zh-cmn",
         projection: "globe",
       });
       this.map.on("load", () => {
-        this.getClockInList()
+        this.loadGaoQingLayer();
+        this.loadMengban();
+        this.loadZhenJieLayer();
+        this.loadXianJieLayer();
+        
+        this.getClockInList();
+      });
+      this.map.on("click", (e) => {
+        this.$emit("getLocation", e);
       });
-      this.map.on('click', (e) => {
-        this.$emit("getLocation",e)
-      })
     },
     
+    loadMengban() {
+      this.map.addLayer({
+        //蒙版图层   //通过边界数据反选 达到挖洞效果
+        id: "mb-tag",
+        type: "fill",
+        source: {
+          type: "geojson",
+          data: {
+            type: "Feature",
+            geometry: {
+              type: "Polygon",
+              coordinates: [
+                [
+                  // 多边形外围 需要进行遮罩的点 这里是给世界地图加遮罩 所以是世界的四个端点
+                  [-180, 90],
+                  [180, 90],
+                  [180, -90],
+                  [-180, -90],
+                ],
+                waiData.DATA,
+              ],
+            },
+          },
+        },
+        paint: {
+          "fill-color": "rgba(0,10,36,1)",
+          // 'fill-opacity': 1 /* 透明度 */,
+        },
+        layout: {
+          visibility: "visible",
+        },
+      });
+    },
+    loadGaoQingLayer() {
+      this.map.addLayer({
+        id: "gaoqingyingxiang",
+        type: "raster",
+        source: {
+          type: "raster",
+          tiles: [
+            "http://60.213.14.14:8060/geoserver/feixian/wms?service=WMS&version=1.1.0&request=GetMap&layers=feixian:yingxiang&styles=&bbox={bbox-epsg-3857}&width=256&height=256&srs=EPSG:3857&format=image/png&TRANSPARENT=TRUE",
+          ],
+          tileSize: 256,
+        },
+        layout: {
+          visibility: "visible",
+        },
+        paint: {},
+      });
+    },
+    loadXianJieLayer() {
+      this.map.addLayer({
+        id: "xianjie",
+        type: "line",
+        layout: {
+          visibility: "visible",
+        },
+        source: {
+          type: "geojson",
+          data: "http://175.27.168.120:8080/geoserver/feixian/ows?service=WFS&version=1.0.0&request=GetFeature&typeName=feixian%3Axianjie&maxFeatures=50&outputFormat=application%2Fjson",
+        },
+        paint: {
+          "line-width": 2,
+          "line-color": "orange",
+        },
+      });
+    },
+    loadZhenJieLayer() {
+      this.map.addSource("shp_1691822212", {
+        type: "vector",
+        scheme: "tms", //new
+        tiles: [
+          "http://223.99.16.253:9007/geoserver/gwc/service/tms/1.0.0/ksp:shp_1691822212@EPSG:900913@pbf/{z}/{x}/{y}.pbf",
+        ],
+      });
+      this.map.addLayer({
+        id: "zhenjieline",
+        type: "line",
+        source: "shp_1691822212",
+        "source-layer": "shp_1691822212",
+        paint: {
+          "line-color": "#0000ff",
+          "line-width": 2,
+        },
+      });
+      this.map.addLayer({
+        id: "zhenjiepoint",
+        type: "symbol",
+        source: "shp_1691822212",
+        "source-layer": "shp_1691822212",
+        layout: {
+          "text-field": "{xzqmc}",
+          "text-size": 18,
+        },
+        paint: {
+          "text-color": "#000000", // 文本的颜色（可选，默认值为 #000000）
+          "text-halo-color": "#FFFFFF",
+          "text-halo-width": 1,
+        },
+      });
+    },
   },
 };
 </script>
@@ -104,4 +207,4 @@ export default {
 ::v-deep.data-map .mapboxgl-ctrl-bottom-right {
   display: none !important;
 }
-</style>
+</style>