Merge branch 'master' of http://www.sysuimars.cn:3000/feiniao/feiniao-pc-vue

src/views/home/album/index.vue

@@ -133,7 +133,7 @@
                                                 <span class="desc-title">指导专家：</span>
                                                 <span class="expert-link" @click="toExpert(card.expertName)">
                                                     {{ card.expertName }}
-                                                    <el-icon color="#2199F8" class="icon" size="12"><Link /></el-icon>
+                                                    <el-icon color="#F0AC37" class="icon" size="12"><Link /></el-icon>
                                                 </span>
                                             </div>
                                         </div>

src/views/warningHome/map/alarmLayer.js

@@ -89,6 +89,12 @@ class AlarmLayer {
             // 23.310292140601142,113.10638639232688
             this.kmap.map.getView().setCenter([113.609050, 23.30707646])
         }
+        if (type === 2) {
+            // this.kmap.map.getView().setZoom(7.6)
+            this.plantLayer && this.kmap.map.removeLayer(this.plantLayer.layer)
+            this.areaId = 3186
+            this.changeDistrict(3186)
+        }
         // 23.407672480519803,113.07739330484166
         // this.kmap.map.getView().setZoom(18)
         // this.kmap.map.getView().setCenter([104.3017367175, 30.329292136])
@@ -133,6 +139,7 @@ class AlarmLayer {
 
     // 切换地图区域
     changeDistrict(id) {
+        console.log('id',id);
         VE_API.warning.fetchAreaDistrict({ id }).then(({ data }) => {
             if (data.geom) {
                 let f = new Feature({