Browse Source

Merge branch 'master' of http://172.16.90.201:3000/castgroup_forest/castgroup_bigscreen

gcz 2 years ago
parent
commit
f4a1c6c8c0

+ 1 - 5
src/components/alarm.vue

@@ -1,5 +1,5 @@
 <!--
- * @LastEditors: gcz
+ * @LastEditors: wangcc
 -->
 <template>
   <div class="alarm-wrap">
@@ -40,7 +40,6 @@ export default {
     };
   },
   created() {
-    console.log(this.data);
     this.ScrollUp();
   },
   computed: {
@@ -49,7 +48,6 @@ export default {
   watch: {
     '$store.state.addr.mapLevel': {
       handler(val) {
-        console.log(val);
         if (val === 'city') {
           // console.log('aowfk');
           let _this = this;
@@ -78,8 +76,6 @@ export default {
             label: item.cityName,
             areaId: element.areaId
           });
-          console.log(element.areaCode.substring(0, 6));
-          console.log(item.cityName);
           this.$store.dispatch('searchArea', {
             parentId: element.areaCode.substring(0, 6),
             name: item.cityName,

+ 39 - 12
src/components/amapnow.vue

@@ -83,6 +83,7 @@ export default {
       // 林木结构小班边界
       treesPolygonArr: [],
       townPolygonArr: [],
+      economicsArr: [],
       selectData: {},
       districtData: {},
       streetData: {}
@@ -91,6 +92,8 @@ export default {
   watch: {
     '$store.state.addr.parentId': {
       handler(val) {
+        // 加载小班边界
+        this.getSmallClass();
         this.parentId = val;
         if (this.$store.state.addr.mapLevel == 'street') {
           this.parentId = val.substring(0, 6);
@@ -139,14 +142,6 @@ export default {
       if (val.label && val.value && val.areaId) {
         this.map.remove(this.polygon);
         let labelTown = val.label;
-        // switch (val.label) {
-        //   case '定威水族乡':
-        //     labelTown = '定威乡'
-        //     break;
-
-        //   default:
-        //     break;
-        // }
         this.map.setCity(labelTown);
         if (this.leftPage === 'forest') {
           this.addForestPolygon(this.smallClassMapArr);
@@ -475,9 +470,6 @@ export default {
           version: '1.1',
           plugins: ['overlay/SimpleMarker']
         },
-        Loca: {
-          version: '2.0'
-        },
         features: ['road', 'bg', 'building']
       }).then((AMap) => {
         _this.AMap = AMap;
@@ -487,7 +479,8 @@ export default {
           center: _this.lngLat,
           pitch: 45,
           terrain: true,
-          features: ['road', 'bg', 'building']
+          features: ['road', 'bg', 'building'],
+          layers: [new AMap.TileLayer.Satellite()]
         });
         AMapUI.load(
           ['ui/geo/DistrictExplorer', 'ui/geo/DistrictCluster', 'lib/$'],
@@ -843,6 +836,10 @@ export default {
     },
     // 加载林场
     setMarker() {
+      this.forestFarmData = [];
+      if (this.treesMarkerArr.length > 0) {
+        this.map.remove(this.treesMarkerArr);
+      }
       farmInfo().then((res) => {
         this.forestFarmData = res.rows;
         let parentMarker = require('@/assets/img/pre-marker.png');
@@ -967,11 +964,21 @@ export default {
       });
     },
     getSmallClass() {
+      this.smallClassMapArr = [];
       let params = {
         cityId: this.$store.state.addr.selectCity.areaId,
         countyId: this.$store.state.addr.selectDistrict.areaId
         // townId: this.$store.state.addr.selectStreet.areaId
       };
+      if (this.smallClassPolygonArr.length > 0) {
+        this.map.remove(this.smallClassPolygonArr);
+      }
+      if (this.treesPolygonArr.length > 0) {
+        this.map.remove(this.treesPolygonArr);
+      }
+      if (this.economicsArr.length > 0) {
+        this.map.remove(this.economicsArr);
+      }
       smallClassMap(params).then((res) => {
         if (res.code == 200) {
           this.smallClassMapArr = res.rows;
@@ -1485,6 +1492,7 @@ export default {
             zIndex: 999,
             cursor: 'pointer'
           });
+          this.economicsArr.push(polygon);
           polygon.on('mouseover', (e) => {
             polygon.setOptions({
               fillOpacity: 0.7,
@@ -1723,6 +1731,8 @@ export default {
     .marker-imgs {
       display: block;
       line-height: 18px !important;
+      width: 376px;
+      overflow: auto;
       img {
         width: 40px;
         height: 40px;
@@ -1730,6 +1740,23 @@ export default {
         cursor: pointer;
       }
     }
+    .marker-imgs::-webkit-scrollbar{
+      background: transparent;
+      opacity: 0.6px;
+      width: 10px;
+      height: 8px;
+    }
+    .marker-imgs::-webkit-scrollbar-thumb{
+      background: rgba($color: #07a2eb8e, $alpha: 0.6);
+      border-radius: 20px;
+      -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
+      
+    }
+    .marker-imgs::-webkit-scrollbar-track {/*滚动条里面轨道*/
+        -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
+        border-radius: 10px;
+        background: transparent;
+    }
   }
 }
 

+ 0 - 1
src/components/header.vue

@@ -78,7 +78,6 @@ import timeFormat from '@/utils/timeFormat'
         },
         methods: {
             toggleFullScreen(){
-                console.log('document.documentElement.requestFullscreen',document.documentElement.requestFullscreen);
                 // alternative standard method
                 if (!document.fullscreenElement &&
                     !document.mozFullScreenElement && !document.webkitFullscreenElement && !document.msFullscreenElement) { // current working methods

+ 1 - 2
src/components/map.vue

@@ -3,7 +3,7 @@
  * @Author: wangcc
  * @Date: 2022-06-10 11:51:36
  * @LastEditors: wangcc
- * @LastEditTime: 2022-06-16 09:31:01
+ * @LastEditTime: 2022-08-03 09:25:06
  * @FilePath: \castgroup_bigscreen\src\components\map.vue
  * @Copyright: Copyright (c) 2016~2022 by wangcc, All Rights Reserved. 
 -->
@@ -143,7 +143,6 @@ export default {
           // })
         })
         .catch((e) => {
-          console.log(e);
         });
     },
     getMap(AMap) {

+ 0 - 2
src/components/pickerAddr.vue

@@ -75,7 +75,6 @@ export default {
   },
   watch: {
     '$store.state.addr.selectCity'(val) {
-      console.log(val);
       this.selectCity = val;
     },
     '$store.state.addr.selectDistrict'(val) {
@@ -167,7 +166,6 @@ export default {
     //   });
     // },
     cityChange(val, level) {
-      console.log(val);
       if (level == 'city') {
         this.changeSelectCity({
           value: val.value,