刘秀芳 hai 2 semanas
pai
achega
49126752b3

BIN=BIN
src/assets/images/map/garden.png


BIN=BIN
src/assets/images/map/garden2.png


+ 1 - 1
src/views/home/album_compoents/albumCarousel.vue

@@ -8,7 +8,7 @@
         append-to-body
     >
         <div class="picture-file">
-            <div class="left-img" v-loading="isLoadingImg">
+            <div class="left-img" v-loading="isLoadingImg"  element-loading-background="rgba(0, 0, 0, 0.3)">
                 <album-carousel-item
                     lbum-carousel-item
                     v-if="images"

+ 3 - 3
src/views/home/map/blueRegionLayer.js

@@ -26,9 +26,9 @@ class BlueRegionLayer {
             for (let item of arr) {
                 let feature = newAreaFeature(item);
                 let strokeColor = "#FFFFFF";
-                console.log('item',item);
-                // feature.setStyle(this.vectorStyle.getPolygonStyle(item.nonghu ? item.color+opacity, strokeColor, 1));
-                feature.setStyle(this.vectorStyle.getPolygonStyle(item.color+opacity, strokeColor, 1));
+                console.log('item',item.color);
+                feature.setStyle(this.vectorStyle.getPolygonStyle(item.nonghu == 1 ? "rgba(255, 255, 255, 0.5)" : "rgba(255, 252, 61, 0.5)", strokeColor, 1));
+                // feature.setStyle(this.vectorStyle.getPolygonStyle(item.color+opacity, strokeColor, 1));
                 this.blueRegionLayer.addFeature(feature);
             }
             // setTimeout(()=>{

+ 12 - 15
src/views/warningHome/map/gardenPointLayer.js

@@ -27,7 +27,7 @@ class gardenPointLayer {
         // });
         // this.kmap.addLayer(this.regionLayer.layer)
 
-        this.gardenPointLayer = new KMap.VectorLayer("gardenUserLayer", 1000, {
+        this.gardenPointLayer = new KMap.VectorLayer("gardenUserLayer", 9999, {
             minZoom: 0,
             maxZoom: 22,
             source: new VectorSource({}),
@@ -35,18 +35,14 @@ class gardenPointLayer {
               const organId = feature.get('organId') === this.organId
               let style1 = new Style({
                 image: new Photo({
-                  src: "https://birdseye-img.sysuimars.com/ai_result/2023/11/20/tree_4414/img_27572.jpg"+ '?imageView2/1/w/300/interlace/1',
-                  radius: 26,
+                  src: require("@/assets/images/map/garden.png"),
+                  radius: 64,
                   shadow: 0,
-                  crop: true,
+                  // crop: true,
                   onload: function () {
                     that.gardenPointLayer.layer.changed();
                   },
                   displacement: [-1, -1],
-                  stroke: new Stroke({
-                    width: 2,
-                    color: "#fdfcfc00",
-                  }),
                 }),
               });
               let style5 = new Style({
@@ -60,14 +56,17 @@ class gardenPointLayer {
                   stroke:new Stroke({ color: "#fff" }), // 字体颜色
                 }),
               });
-              return [style1, style5];
+              return [style1];
             },
           });
           this.kmap.addLayer(this.gardenPointLayer.layer);
-
+          // this.initLayer()
     }
 
-    initLayer(gardenList){
+    initLayer(){
+      const gardenList = [
+        {wkt: "POINT(113.5081595 23.5320866)"}
+      ]
         this.gardenPointLayer.refresh()
         if (this.gardenPointLayer.source) {
           this.gardenPointLayer.source.clear()
@@ -75,10 +74,8 @@ class gardenPointLayer {
         }
         for(let garden of gardenList){
           // this.clearOverLay(garden.organId)
-          if (garden.example) {
-            garden.wktVal = garden.wkt
-            this.gardenPointLayer.source.addFeature(newPoint(garden, "wktVal", "myGarden"))
-          }
+          garden.wktVal = garden.wkt
+          this.gardenPointLayer.source.addFeature(newPoint(garden, "wktVal", "myGarden"))
           // this.gardenReportPointLayer.source.addFeature(newPoint(garden, "wkt", "myGardenReport"))
           // this.initGardenWaring(extractCoordinates(garden.wkt), garden)
         }