视图更新

src/components/amapPow.vue

@@ -3,7 +3,7 @@
  * @Author: wangcc
  * @Date: 2022-10-19 09:32:46
  * @LastEditors: wangcc
- * @LastEditTime: 2022-11-11 09:35:29
+ * @LastEditTime: 2022-11-11 14:01:26
  * @FilePath: \castgroup_bigscreen\src\components\amapPow.vue
  * @Copyright: Copyright (c) 2016~2022 by wangcc, All Rights Reserved. 
 -->
@@ -159,7 +159,6 @@ export default {
             this.townPolygonArr ||
             this.smallClassPolygonArr
           ) {
-            
             this.map.remove(this.polygon);
             this.map.remove(this.streetMarkerArr);
             this.map.remove(this.townPolygons);
@@ -168,7 +167,7 @@ export default {
             this.map.remove(this.forestMarkerArr);
             this.map.remove(this.townPolygonArr);
             this.map.remove(this.smallClassPolygonArr);
-            this.townPolygons = []
+            this.townPolygons = [];
           }
         }
       }
@@ -257,7 +256,8 @@ export default {
             }
             this.setMapLabel(val);
             if (
-              this.$store.state.addr.mapLevel != 'street' 
+              this.$store.state.addr.mapLevel == 'province' ||
+              this.$store.state.addr.mapLevel == 'city' ||(this.$store.state.addr.mapLevel == 'district'&& this.$store.state.addr.selectCity.prop == '1')
             ) {
               if (val.countyCode) {
                 // this.switch2AreaNode(val.countyCode.substring(0, 6));
@@ -278,6 +278,7 @@ export default {
                   name: selectCity,
                   mapLevel: 'city'
                 });
+
                 if (val.cityCode) {
                   this.changeSelectCity({
                     value: val.cityCode,
@@ -677,22 +678,25 @@ export default {
         '</div>' +
         '</div>' +
         '</div>';
+      let infoIcon = new AMap.Icon({
+        size: new AMap.Size(40, 25), // 图标尺寸
+        image: require('@/assets/img/small-marker.png'),
+        imageSize: new AMap.Size(40, 25) // 根据所设置的大小拉伸或压缩图片
+      });
       this.smallMarker = new AMap.Marker({
         map: this.map,
         position: lanLatArr,
-        icon: require('@/assets/img/small-marker.png'),
+        icon: infoIcon,
         anchor: 'bottom-center',
-        offset: new AMap.Pixel(0, 0),
+        offset: new AMap.Pixel(0, -6),
         zIndex: 9999
       });
       this.smallMarker.setLabel({
         direction: 'right',
-        offset: new AMap.Pixel(-230, -160), //设置文本标注偏移量
+        offset: new AMap.Pixel(-230, -150), //设置文本标注偏移量
         content: smallLabel //设置文本标注内容
       });
-      if (
-        this.$store.state.addr.mapLevel == 'street' 
-      ) {
+      if (this.$store.state.addr.mapLevel == 'street') {
         this.map.setFitView(this.smallMarker, false, false, 12);
       }
       this.smallMarkers.push(_this.smallMarker);
@@ -959,13 +963,18 @@ export default {
       // this.getSmallClass();
       let _this = this;
       //更新地图视野
-      console.log(this.$store.state.addr.selectCity.prop);
-      console.log(this.$store.state.addr.mapLevel);
-      if ((this.$store.state.addr.selectCity.prop == '1' && this.$store.state.addr.mapLevel != 'street') || this.$store.state.addr.mapLevel == 'province') {
+      if (
+        (this.$store.state.addr.selectCity.prop == '1' &&
+          this.$store.state.addr.mapLevel != 'street') ||
+        this.$store.state.addr.mapLevel == 'province'
+      ) {
         this.map.setBounds(areaNode.getBounds(), null, null, false);
-      } else if (this.$store.state.addr.selectCity.prop == '2' && this.$store.state.addr.mapLevel != 'province') {
+      } else if (
+        this.$store.state.addr.selectCity.prop == '2' &&
+        this.$store.state.addr.mapLevel != 'province'
+      ) {
         this.map.setFitView(this.smallMarker, false, false, 14);
-      }
+      } 
       // 加载相关标识
       this.mapPolygon();
       //清除已有的绘制内容
@@ -1033,8 +1042,10 @@ export default {
       }
       //查询乡镇 标识
       if (areaPolygon.properties.level == 'district') {
-        console.log(this.townPolygons);
-        if (this.$store.state.addr.mapLevel != 'street' && this.townPolygons.length == 0) {
+        if (
+          this.$store.state.addr.mapLevel != 'street' &&
+          this.townPolygons.length == 0
+        ) {
           this.getrjx(areaPolygon.properties.name);
         }
         AMap.plugin(['AMap.DistrictSearch'], function () {
@@ -1121,7 +1132,6 @@ export default {
         this.currentAreaNode = areaNode;
         //设置当前使用的定位用节点
         this.districtExplorer.setAreaNodesForLocating([this.currentAreaNode]);
-
         this.refreshAreaNode(areaNode);
         if (callback) {
           callback(null, areaNode);
@@ -2184,17 +2194,20 @@ export default {
 
   34% {
     // opacity: 1;
-    transform: rotateX(0deg) rotateY(0deg) rotateZ(0deg) scaleX(1) scaleY(1) translate3d(34vw, 0px, 0px);
+    transform: rotateX(0deg) rotateY(0deg) rotateZ(0deg) scaleX(1) scaleY(1)
+      translate3d(34vw, 0px, 0px);
   }
 
   67% {
     // opacity: 1;
-    transform: rotateX(0deg) rotateY(0deg) rotateZ(0deg) scaleX(1) scaleY(1) translate3d(67vw, 0px, 0px);
+    transform: rotateX(0deg) rotateY(0deg) rotateZ(0deg) scaleX(1) scaleY(1)
+      translate3d(67vw, 0px, 0px);
   }
 
   100% {
     // opacity: 0;
-    transform: rotateX(0deg) rotateY(0deg) rotateZ(0deg) scaleX(1) scaleY(1) translate3d(160vw, 0px, 0px);
+    transform: rotateX(0deg) rotateY(0deg) rotateZ(0deg) scaleX(1) scaleY(1)
+      translate3d(160vw, 0px, 0px);
   }
 }
 

src/components/pickerAddr.vue

@@ -174,19 +174,22 @@ export default {
         this.changeSelectCity({
           value: val.value,
           label: val.label,
-          areaId: val.areaId
+          areaId: val.areaId,
+          prop: '1'
         });
       } else if (level == 'district') {
         this.changeSelectDistrict({
           value: val.value,
           label: val.label,
-          areaId: val.areaId
+          areaId: val.areaId,
+          prop: '1'
         });
       } else if (level == 'street') {
         this.changeSelectStreet({
           value: val.value,
           label: val.label,
-          areaId: val.areaId
+          areaId: val.areaId,
+          prop: '1'
         });
       }
       this.parentId = val.value.substring(0, 6);

src/views/index.vue

@@ -2,9 +2,9 @@
  * @Description: 
  * @Author: wangcc
  * @Date: 2022-07-06 15:56:45
- * @LastEditors: gcz
- * @LastEditTime: 2022-11-09 15:12:58
- * @FilePath: \ntbigscreen\src\views\index.vue
+ * @LastEditors: wangcc
+ * @LastEditTime: 2022-11-11 14:01:54
+ * @FilePath: \castgroup_bigscreen\src\views\index.vue
  * @Copyright: Copyright (c) 2016~2022 by wangcc, All Rights Reserved. 
 -->
 <template>
@@ -442,9 +442,7 @@ export default {
         return;
       }
       this.$store.commit('changePage', this.navList[index - 1].en);
-      console.log('this.navList[index-1].en', this.navList[index - 1].en);
       this.page = index;
-      console.log('index', index);
       if (this.navList[index - 1].en == 'economics') {
         this.showbase = true;
         this.showxiaoban = false;
@@ -1177,7 +1175,6 @@ export default {
 
       page6echarts02(param)
         .then((res) => {
-          console.log('page6echarts02 res', res);
           const rows = res.data;
           // console.log(rows)
           // x坐标
@@ -1196,8 +1193,6 @@ export default {
             this.page6Char2.series[2].data.push(element.eventList[2].value);
           });
 
-          console.log('this.page6Char2.series', this.page6Char2.series);
-
           let charUuid = this.$refs.page6Char2.mid;
           this.$refs.page6Char2.intChar(charUuid);
         })
@@ -1227,7 +1222,6 @@ export default {
       };
       smallClassDetail(param).then((res) => {
         this.changeSearchSmallClass(res.data);
-        console.log(res.data);
         this.alarData = res.data;
         // if (this.$store.state.addr.mapLevel == 'city') {
         //   this.jumpDistrict();
@@ -1261,7 +1255,6 @@ export default {
       });
     },
     scrollProjectClick(e) {
-      console.log('scrollProjectClick',e);
       // 点击添加class
       // let removeAllClass = (className)=>{
       //       //找到所有包含className的结点
@@ -1300,7 +1293,8 @@ export default {
             this.changeSelectDistrict({
               value: element.areaCode,
               label: this.alarData.cityName,
-              areaId: element.areaId
+              areaId: element.areaId,
+              prop: '2'
             });
             this.$store.dispatch('searchArea', {
               parentId: element.areaCode.substring(0, 6),
@@ -1320,7 +1314,6 @@ export default {
       // proClass[e.rowIndex].style.background = '';
     },
     scrollBaseListClick(e) {
-      console.log('scrollBaseListClick', e);
       let param = {
         baseId: e.row[3]
       };