bug修复

src/components/amapPow.vue

@@ -3,7 +3,7 @@
  * @Author: wangcc
  * @Date: 2022-10-19 09:32:46
  * @LastEditors: wangcc
- * @LastEditTime: 2022-11-03 16:37:30
+ * @LastEditTime: 2022-11-04 14:28:08
  * @FilePath: \castgroup_bigscreen\src\components\amapPow.vue
  * @Copyright: Copyright (c) 2016~2022 by wangcc, All Rights Reserved. 
 -->
@@ -109,9 +109,9 @@ export default {
       smallClassProject: [],
       // 项目小班红点转边界图
       projectPolygonArr: [],
-      // projectIcon:
-      //   'http://miniores.hw.hongweisoft.com/mintou/1667460231789_a06fed1519c5e3d206e4ab9148d658e5.png'
-      projectIcon: ''
+      projectIcon:
+        'http://miniores.hw.hongweisoft.com/mintou/1667460231789_a06fed1519c5e3d206e4ab9148d658e5.png'
+      // projectIcon: ''
     };
   },
   watch: {
@@ -120,7 +120,9 @@ export default {
         // 加载小班边界
         // this.getSmallClass();
         this.parentId = val;
-
+        if (this.projectSmallClassArr) {
+          this.map.remove(this.projectSmallClassArr);
+        }
         if (this.$store.state.addr.mapLevel == 'street') {
           this.parentId = val.substring(0, 6);
           if (this.map) {
@@ -186,7 +188,6 @@ export default {
           this.parentId = '520000';
           this.$store.state.addr.parentName = '贵州省';
         }
-        console.log(val);
         if (this.parentId) {
           if (this.$store.state.addr.mapLevel == 'street') {
             // this.getSmallClass(val);
@@ -233,7 +234,6 @@ export default {
     },
     '$store.state.addr.mapLevel': {
       handler(val) {
-        console.log(val);
         if (val === 'street') {
           // this.getSmallClass();
         }
@@ -245,7 +245,6 @@ export default {
       handler: function (val, oldVal) {
         let _this = this;
         if (val) {
-          console.log(val);
           if (val.longitude && val.latitude && !val.name) {
             this.map.remove(this.polygon);
             if (_this.smallMarkers) {
@@ -323,7 +322,6 @@ export default {
       handler: function (val, oldVal) {
         let _this = this;
         if (val) {
-          console.log(val);
           if (val.longitude && val.latitude && !val.name) {
             let lanLatArr = [val.longitude, val.latitude];
             let baseIcon = '';
@@ -445,7 +443,6 @@ export default {
     },
     '$store.state.addr.smallClassMap': {
       handler(val) {
-        console.log(val);
         if (val) {
           let _this = this;
           if (this.projectSmallClassArr) {
@@ -483,7 +480,6 @@ export default {
             this.projectSmallClassArr.push(projectSmallClass);
 
             projectSmallClass.on('click', (e) => {
-              console.log(this.leftPage);
               if (_this.projectPolygonArr) {
                 _this.map.remove(_this.projectPolygonArr);
               }
@@ -496,12 +492,15 @@ export default {
               if (_this.treesPolygonArr) {
                 _this.map.remove(_this.treesPolygonArr);
               }
+              if (_this.smallClassProject) {
+                _this.map.remove(_this.smallClassProject);
+              }
               // _this.map.remove(projectSmallClass);
               smallClassDetail({ id: element.id }).then((res) => {
                 if (res.code == 200) {
                   let detail = res.data;
-                  if (detail.mapInfo) {
-                    if (this.leftPage == 'forest') {
+                  if (this.leftPage == 'forest') {
+                    if (detail.mapInfo) {
                       let polyData = JSON.parse(detail.mapInfo);
                       let projectPolygon = new AMap.Polygon({
                         map: _this.map,
@@ -515,18 +514,18 @@ export default {
                         fillColor: 'red'
                       });
                       this.projectPolygonArr.push(projectPolygon);
-                      this.map.on('rightclick', (e) => {
-                        if (_this.projectPolygonArr) {
-                          _this.map.remove(_this.projectPolygonArr);
-                        }
-                        if (_this.smallMarkers) {
-                          _this.map.remove(_this.smallMarkers);
-                        }
-                      });
-                      _this.setMapLabel(detail);
-                    } else if (this.leftPage == 'treeSpecies') {
-                      this.addTreeSpeciesPolygon(detail);
                     }
+                    this.map.on('rightclick', (e) => {
+                      if (_this.projectPolygonArr) {
+                        _this.map.remove(_this.projectPolygonArr);
+                      }
+                      if (_this.smallMarkers) {
+                        _this.map.remove(_this.smallMarkers);
+                      }
+                    });
+                    _this.setMapLabel(detail);
+                  } else if (this.leftPage == 'treeSpecies') {
+                    this.addTreeSpeciesPolygon(detail);
                   }
                 }
               });
@@ -542,7 +541,7 @@ export default {
   },
   created() {
     this.getTreePlant();
-    this.getIcon();
+    // this.getIcon();
   },
   mounted() {
     this.initAMap();
@@ -670,14 +669,29 @@ export default {
         offset: new AMap.Pixel(-230, -160), //设置文本标注偏移量
         content: smallLabel //设置文本标注内容
       });
+      if (
+        this.$store.state.addr.mapLevel == 'street' ||
+        this.$store.state.addr.mapLevel == 'district'
+      ) {
+        this.map.setFitView(this.smallMarker, false, false, 14);
+      }
+      this.smallMarkers.push(_this.smallMarker);
       this.smallMarker.on('click', (e) => {
-        this.smallMarker.setLabel({
-          direction: 'right',
-          offset: new AMap.Pixel(-230, -160), //设置文本标注偏移量
-          content: smallLabel //设置文本标注内容
-        });
+        if (_this.smallMarkers) {
+          _this.map.remove(_this.smallMarkers);
+        }
+        if (_this.projectPolygonArr) {
+          _this.map.remove(_this.projectPolygonArr);
+        }
+        if (_this.smallClassProject) {
+          _this.map.remove(_this.smallClassProject);
+        }
+        // _this.smallMarker.setLabel({
+        //   direction: 'right',
+        //   offset: new AMap.Pixel(-230, -160), //设置文本标注偏移量
+        //   content: smallLabel //设置文本标注内容
+        // });
       });
-      this.smallMarkers.push(_this.smallMarker);
     },
     initAMap() {
       window._AMapSecurityConfig = {
@@ -895,17 +909,18 @@ export default {
     //根据Hover状态设置相关样式
     toggleHoverFeature(feature, isHover, position) {
       if (feature.properties.subFeatureIndex != null) {
-        this.tipMarker.setMap(isHover ? this.map : null);
+        // this.tipMarker.setMap(isHover ? this.map : null);
+        // this.tipMarker.setMap(isHover ? this.map : null);
         if (!feature) {
           return;
         }
         const props = feature.properties;
-        if (isHover) {
-          //更新提示内容
-          this.$tipMarkerContent.html(props.name);
-          //更新位置
-          this.tipMarker.setPosition(position || props.center);
-        }
+        // if (isHover) {
+        //   //更新提示内容
+        //   this.$tipMarkerContent.html(props.name);
+        //   //更新位置
+        //   this.tipMarker.setPosition(position || props.center);
+        // }
         //更新相关多边形的样式
         const polys = this.districtExplorer.findFeaturePolygonsByAdcode(
           props.adcode
@@ -1168,10 +1183,12 @@ export default {
         countyId: this.$store.state.addr.selectDistrict.areaId,
         townId: this.$store.state.addr.selectStreet.areaId
       };
+      // image: '//a.amap.com/jsapi_demos/static/demo-center/icons/poi-marker-default.png',
       projectList(params).then((res) => {
         if (res.code == 200) {
           let infoIcon = new AMap.Icon({
             size: new AMap.Size(20, 25), // 图标尺寸
+
             image: this.projectIcon,
             imageSize: new AMap.Size(20, 25) // 根据所设置的大小拉伸或压缩图片
           });
@@ -1289,7 +1306,6 @@ export default {
       //   pageNum: 0,
       //   pageSize: 25
       // };
-      console.log(that.leftPage);
       let mapLevel = that.$store.state.addr.mapLevel;
       let res = await smallClassMap({ ...params });
       if (res.code == 200) {
@@ -1304,7 +1320,6 @@ export default {
           }
         });
       }
-      console.log(res.rows);
       // if (res.code == 200 && res.total > 25) {
       //   const total = res.total;
       //   const totalPage = Math.ceil(total / pageData.pageSize);
@@ -1342,7 +1357,6 @@ export default {
     },
     mapPolygon() {
       // if (this.smallClassMapArr) {
-      console.log(this.leftPage);
       // if (this.leftPage === 'forest') {
       //   // this.addForestPolygon(this.smallClassMapArr);
       //   if (
@@ -1997,9 +2011,8 @@ export default {
   display: block !important;
   visibility: inherit !important;
 }
-/deep/ .amap-icon img {
-  max-width: 3rem !important;
-  max-height: 3rem !important;
+/deep/ .amap-icon {
+  overflow: unset !important;
 }
 /deep/ .info-small {
   background-image: url('../assets/img/small-label.png');