浏览代码

页面调整

shuhao 7 月之前
父节点
当前提交
88ff599a9e
共有 3 个文件被更改,包括 14 次插入3 次删除
  1. 1 1
      src/api/modules/farm.js
  2. 1 1
      src/views/home/components/homeFile.vue
  3. 12 1
      src/views/home/index.vue

+ 1 - 1
src/api/modules/farm.js

@@ -238,7 +238,7 @@ module.exports = {
                                 "production_info": {
                                     "production": 1244,
                                     "cihua_ratio": 75,
-                                    "zuoguo_ratio": 75,
+                                    "zuoguo_ratio": 10,
                                     "quality": 96.47
                                 },
                                 "type_id": 0,

+ 1 - 1
src/views/home/components/homeFile.vue

@@ -97,7 +97,7 @@ import { onMounted, ref, onBeforeUnmount, reactive } from "vue";
 const outputBox = ref([
     { id: 1, name: "产量估计", field: "cl", value: "--", unit: "斤/亩" },
     { id: 2, name: "高质果率", field: "spgl", value: "--", unit: "%" },
-    { id: 3, name: "坐果率", field: "zuoguo_ratio",value: "--", unit: "%" },
+    { id: 3, name: "挂果数", field: "zuoguo_ratio",value: "--", unit: "颗/枝条" },
 ]);
 
 const qualityBox = ref([

+ 12 - 1
src/views/home/index.vue

@@ -169,6 +169,7 @@ import AlbumCarousel from "./album_compoents/albumCarousel.vue";
 import compareDialog from "./album_compoents/compareDialog.vue";
 import album from "./album/index.vue";
 import PdfDialog from "../../components/PdfDialog";
+import StaticMapLayers from "@/components/static_map_change/Layers.js"
 let store = useStore();
 const components = {
     homePage,
@@ -186,6 +187,7 @@ const currentRegion = {
     name: null,
 };
 let homeMap = new HomeMap();
+let staticMapLayers = null;
 let samplePointLayer = null;
 let regionLayer = null;
 let blueRegionLayer = null;
@@ -196,7 +198,16 @@ onMounted(() => {
     // homeMap.initMap(store.getters.userinfo.location, mapRef.value);
     // regionLayer = new RegionLayer(homeMap.kmap.map, currentFarm, currentRegion)
     samplePointLayer = new SamplePointLayer(homeMap.kmap);
+    VE_API.warning.fetchWarningLayer({
+      k: "feiniao_static_map",
+      resultType: "json",
+    }).then(({data}) => {
+      staticMapLayers = new StaticMapLayers(homeMap.kmap, data)
+    })
     blueRegionLayer = new BlueRegionLayer(homeMap.kmap);
+    function changeStaticMapLayers(e){
+      // staticMapLayers.
+    }
 
     getYellow();
     // getFarmLog()
@@ -1061,4 +1072,4 @@ const photoList = ref([
         }
     }
 }
-</style>
+</style>