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

src/components/charts/options/oneLineOption.js

@@ -111,7 +111,7 @@ export const oneLine = {
                         yAxis: '',
                         symbolOffset: [0, "-50%"],
                         label: {
-                            offset: [0, -15],
+                            offset: [0, -12],
                             backgroundColor: "#FF7219",
                             padding: [0, 8, 0, 8],
                             color: "#fff",

src/views/home/index.vue

@@ -101,7 +101,12 @@
                 <div class="item">
                     <img src="@/assets/images/map/status/status-ch.png" alt="" />
                     虫害异常
-                </div> -->
+                </div>
+                <div class="item">
+                    <img src="@/assets/images/map/status/wns.png" alt="" />
+                    万年树
+                </div>
+                 -->
             </div>
         </div>
     </div>
@@ -195,7 +200,8 @@ const getBlueRegionList = (callback) => {
     if(regionId.value===0){
         selectAll = 1
     }
-    VE_API.farm.blueRegionList({ farmId: organId.value, regionId: regionId.value,selectAll }).then(({ data }) => {
+    const areaId = selectAll?undefined:regionId.value
+    VE_API.farm.blueRegionList({ farmId: organId.value, regionId: areaId,selectAll }).then(({ data }) => {
         blueList.value = data.map((item) => {
             let color = "rgba(255, 255, 255, 0.5)"; //失效区域
             if (item.status === 2) {

src/views/home/map/samplePointLayer.js

@@ -109,7 +109,8 @@ class SamplePointLayer {
     if(regionId===0){
         selectAll = 1
     }
-    VE_API.variety.pointList({farmId,regionId,selectAll}).then(({data})=>{
+    const areaId = selectAll?undefined:regionId
+    VE_API.variety.pointList({farmId,regionId:areaId,selectAll}).then(({data})=>{
       let features = []
       for(let item of data){
         item.iconName='defalut'
@@ -205,16 +206,15 @@ class SamplePointLayer {
     if(item.status == 3){
       imgSrc = require('@/assets/images/map/status/status-ch.png')
     }
-    if(item.status == 101){
-      imgSrc = require('@/assets/images/map/status/status-ch.png')
+    if(item.wys === '1'){
+      scale = 0.3
+      imgSrc = require('@/assets/images/map/status/wns.png')
     }
-    console.log('item', item.iconName);
     item["icon"] = imgSrc
     item["scale"] = scale
   }
 
   reset(farm, region){
-    console.log('farm',farm);
     this.clearCluster()
     this.initData(farm.id, region.id)
   }

src/views/warningHome/map/mockFarmLayer.js

@@ -46,6 +46,28 @@ class MockFarmLayer {
             that.initLayer(kmap)
             VE_API.mini_farm.weatherRiskVirtualFarmList().then(res => {
                 if(res.code ===0){
+                    const lby = {}
+                    const jgjd = {
+                        disease:'',
+                        grow:'花苞',
+                        img:'https://birdseye-img.sysuimars.com/birdseye-look-mini/img_crop/bch/ch/cropped_DJI_20240707184352_0041_V_9.jpg',
+                        name:'井冈基地',
+                        mapId:2,
+                        nodeType:"mock_farm_data",
+                        mockFarmId:88866,
+                        cloudFilename:'',
+                        dic:{
+                            "病虫异常": 0,
+                            "物候期": "果期",
+                            "比例": 91,
+                            "生育期": "膨果期",
+                            "生长异常": 1
+                        },
+                        targetSampleId:96774,
+                        wkt:'POINT(113.5081595 23.5320866)'
+                    }
+                    res.data.push(jgjd)
+                    console.log('res.data',res.data);
                     that.setData(res.data)
                 }
             })
@@ -96,6 +118,9 @@ class MockFarmLayer {
                 that.setProperties(feature,f)
                 let text = "";
                 let fontColor = "#ffffff"
+                if(name==='井冈基地'){
+                    console.log('井冈基地',grow);
+                }
                 if (disease) {
                     text = disease;
                     styles.push(that.textBgStyle("#EFEEEE","#EFEEEE"));
@@ -106,9 +131,9 @@ class MockFarmLayer {
                         text = grow;
                         fontColor = "#B6B6B6"
                     }else{
-                        styles.push(that.textBgStyle("#FFFF00","#FFA500"));
+                        styles.push(that.textBgStyle("#fff","#fff"));
                         text = grow;
-                        fontColor = "#c1c1c1"
+                        fontColor = "#BBBBBB"
                     }
 
                 } else if (phenology) {