地图修改

src/components/alarm.vue

@@ -48,7 +48,7 @@ export default {
   watch: {
     '$store.state.addr.mapLevel': {
       handler(val) {
-        if (val === 'city') {
+        if (val === 'city'&& this.$store.state.addr.selectCity.prop == '2') {
           // console.log('aowfk');
           let _this = this;
           this.jumpDistrict();
@@ -74,12 +74,14 @@ export default {
           this.changeSelectCity({
             value: element.areaCode,
             label: item.cityName,
-            areaId: element.areaId
+            areaId: element.areaId,
+             prop:'2'
           });
           this.$store.dispatch('searchArea', {
             parentId: element.areaCode.substring(0, 6),
             name: item.cityName,
-            mapLevel: 'city'
+            mapLevel: 'city',
+           
           });
         }
       });

src/components/amapTow.vue

@@ -3,7 +3,7 @@
  * @Author: wangcc
  * @Date: 2022-10-19 09:32:46
  * @LastEditors: wangcc
- * @LastEditTime: 2022-11-01 17:56:32
+ * @LastEditTime: 2022-11-02 09:52:35
  * @FilePath: \castgroup_bigscreen\src\components\amapTow.vue
  * @Copyright: Copyright (c) 2016~2022 by wangcc, All Rights Reserved. 
 -->
@@ -103,7 +103,9 @@ export default {
       districtData: {},
       streetData: {},
       // 项目小班数
-      projectSmallClassArr: []
+      projectSmallClassArr: [],
+      // 项目小班边界
+      smallClassProject: []
     };
   },
   watch: {
@@ -187,12 +189,15 @@ export default {
         this.mapPolygon();
         if (val == 'forest' || val == 'treeSpecies') {
           this.getProjectList();
+        }else{
+          this.map.remove(this.projectSmallClassArr)
         }
         if (val != 'forest') {
           this.map.remove(this.forestMarkerArr);
           this.map.remove(this.smallClassNArr);
           this.map.remove(this.smallClassPolygonArr);
           this.map.remove(this.projectMarkerArr);
+          
         }
         if (val != 'treeSpecies') {
           this.map.remove(this.forestMarkerArr);
@@ -211,9 +216,6 @@ export default {
     '$store.state.addr.mapLevel': {
       handler(val) {
         console.log(val);
-        if (val == 'province') {
-          this.changeSelectDistrict({});
-        }
         if (val === 'street') {
           this.getSmallClass();
         }
@@ -231,6 +233,9 @@ export default {
             if (_this.smallMarkers) {
               _this.map.remove(_this.smallMarkers);
             }
+            if (this.smallClassProject) {
+              this.map.remove(this.smallClassProject);
+            }
             let lanLatArr = [val.longitude, val.latitude];
             let imgList = [];
             if (val.imageList.length > 0) {
@@ -344,7 +349,6 @@ export default {
               });
             });
             this.smallMarkers.push(_this.smallMarker);
-            console.log(this.$store.state.addr.mapLevel);
             if (
               this.$store.state.addr.mapLevel == 'city' ||
               this.$store.state.addr.mapLevel == 'province'
@@ -388,10 +392,21 @@ export default {
             } else {
               this.switch2AreaNode(val.countyCode.substring(0, 6));
             }
-          } else if (val.name == false && this.smallMarker) {
-            this.map.on('rightclick', function (e) {
-              _this.map.remove(_this.smallMarkers);
+          }
+          if (val.mapInfo) {
+            let polyData = JSON.parse(val.mapInfo);
+            let smallClassPolygon = new AMap.Polygon({
+              map: _this.map,
+              path: polyData.features[0].geometry.coordinates,
+              strokeOpacity: 1,
+              fillOpacity: 0.5,
+              strokeColor: 'red',
+              strokeWeight: 2,
+              zIndex: 999,
+              cursor: 'pointer',
+              fillColor: 'red'
             });
+            this.smallClassProject.push(smallClassPolygon);
           }
         }
       }
@@ -626,6 +641,9 @@ export default {
           if (_this.smallMarkers.length > 0) {
             _this.map.remove(_this.smallMarkers);
           }
+          if (this.smallClassProject) {
+            this.map.remove(this.smallClassProject);
+          }
           // if (_this.treeCompMarkers.length > 0) {
           //   _this.map.remove(_this.treeCompMarkers);
           // }
@@ -852,33 +870,32 @@ export default {
         fillOpacity: 0 //填充透明度
       });
       let areaPolygon = areaNode.getParentFeature();
-        // 绘制父级蒙版
+      // 绘制父级蒙版
       // if (this.$store.state.addr.mapLevel == 'province' || this.$store.state.addr.mapLevel == 'city') {
-        let outer = [
-          new AMap.LngLat(-360, 90, true),
-          new AMap.LngLat(-360, -90, true),
-          new AMap.LngLat(360, -90, true),
-          new AMap.LngLat(360, 90, true)
-        ];
-        let areaPolygonArr = [];
-        areaPolygon.geometry.coordinates.forEach((element) => {
-          areaPolygonArr.push(element[0]);
-        });
-        let holes = areaPolygonArr;
-        let pathArray = [outer];
-        pathArray.push.apply(pathArray, holes);
-        this.polygon = new AMap.Polygon({
-          pathL: pathArray,
-          map: this.map,
-          strokeColor: '#00eeff',
-          strokeWeight: 1,
-          fillColor: '#0c1b05', // 遮罩背景色
-          fillOpacity: 0.8,
-          height: 10000
-        });
-        this.polygon.setPath(pathArray);
+      let outer = [
+        new AMap.LngLat(-360, 90, true),
+        new AMap.LngLat(-360, -90, true),
+        new AMap.LngLat(360, -90, true),
+        new AMap.LngLat(360, 90, true)
+      ];
+      let areaPolygonArr = [];
+      areaPolygon.geometry.coordinates.forEach((element) => {
+        areaPolygonArr.push(element[0]);
+      });
+      let holes = areaPolygonArr;
+      let pathArray = [outer];
+      pathArray.push.apply(pathArray, holes);
+      this.polygon = new AMap.Polygon({
+        pathL: pathArray,
+        map: this.map,
+        strokeColor: '#00eeff',
+        strokeWeight: 1,
+        fillColor: '#0c1b05', // 遮罩背景色
+        fillOpacity: 0.8,
+        height: 10000
+      });
+      this.polygon.setPath(pathArray);
       // }
-        
 
       if (this.leftPage == 'forest' || this.leftPage == 'treeSpecies') {
         this.getProjectList();

src/components/amapnow.vue

@@ -94,7 +94,9 @@ export default {
       streetData: {},
       projectMarkerArr: [],
       projectSmallClassArr: [],
-      sampleData: {}
+      sampleData: {},
+      // 项目小班边界
+      smallClassProject:[],
     };
   },
   watch: {
@@ -186,8 +188,8 @@ export default {
             if (_this.smallMarkers) {
               _this.map.remove(_this.smallMarkers);
             }
-            if (this.smallClassPolygonArr) {
-              this.map.remove(this.smallClassPolygonArr);
+            if (this.smallClassProject) {
+              this.map.remove(this.smallClassProject);
             }
 
             let lanLatArr = [val.longitude, val.latitude];
@@ -354,7 +356,7 @@ export default {
                 cursor: 'pointer',
                 fillColor: 'red'
               });
-              this.smallClassPolygonArr.push(smallClassPolygon);
+              this.smallClassProject.push(smallClassPolygon);
             }
           }
         }

src/views/index.vue

@@ -2,9 +2,9 @@
  * @Description: 
  * @Author: wangcc
  * @Date: 2022-07-06 15:56:45
- * @LastEditors: gcz
- * @LastEditTime: 2022-11-02 11:30:32
- * @FilePath: \ntbigscreen\src\views\index.vue
+ * @LastEditors: wangcc
+ * @LastEditTime: 2022-11-02 14:07:43
+ * @FilePath: \castgroup_bigscreen\src\views\index.vue
  * @Copyright: Copyright (c) 2016~2022 by wangcc, All Rights Reserved. 
 -->
 <template>
@@ -210,7 +210,7 @@
 </template>
 
 <script>
-import Map from '../components/amapTow.vue';
+import Map from '../components/amapPow.vue';
 import Header from '../components/header';
 import MyEcharts from '../components/echarts';
 import Numerical from '../components/numerical';