Merge branch 'manage' of http://www.sysuimars.cn:3000/lxf/foster-pc-vue into manage

src/views/home/album_compoents/albumCarousel.vue

@@ -65,7 +65,7 @@
                 <div class="overview-file">
                     <div class="box-title">质量详情</div>
                     <div class="box-wrap">
-                      <div
+                        <div
                             class="box-item"
                             v-for="(item, index) in qualityBox"
                             :key="index"
@@ -93,7 +93,7 @@ const lock = ref(false);
 const farmId = ref(766);
 const nameRef = ref("");
 
-const isLoadingImg = ref(true)
+const isLoadingImg = ref(true);
 const images = ref(null);
 const dialogVisible = ref(false);
 // 获取当前日期
@@ -106,9 +106,9 @@ startDate.setMonth(currentDate.getMonth() - 1);
 const formattedStartDate = dateFormat(startDate, "YY-mm-dd");
 const formattedEndDate = dateFormat(currentDate, "YY-mm-dd");
 
-eventBus.on("change:watermark",function(name){
-  nameRef.value = name
-})
+eventBus.on("change:watermark", function (name) {
+    nameRef.value = name;
+});
 
 const outputBox = ref([
     { id: 1, name: "产量估计", value: "" },
@@ -121,35 +121,30 @@ const qualityBox = ref([
     { id: 6, name: "透光率", value: "" },
     { id: 7, name: "病虫比例", value: "" },
 ]);
-const showTag = ref(false)
-eventBus.on("click:point",function({farmId,sampleId, data}){
-  sampleId = data.id;
-  getSampleFiles(data.geoHashSample);
-  photoBaseData.value[0].value = data.pz;
-    isLoadingImg.value = true
-  let startDate = new Date(currentDate);
-  startDate.setMonth(currentDate.getMonth() - 2);
+const showTag = ref(false);
+eventBus.off("click:point", handleClickPoint);
+eventBus.on("click:point", handleClickPoint);
 
-// 格式化日期
-  let params = {sampleId,farmId,startDate:dateFormat(startDate, "YY-mm-dd")}
-  VE_API.miniimage.list(params).then(res => {
-      if(res.code === 0){
-        dialogVisible.value = true
-      images.value = res.data
-      isLoadingImg.value = false
-    }
-  })
-  showTag.value = data.nonghu == 1 ? true : false
-//   photoBaseData.value[0].value = data.pz;
-//   photoBaseData.value[1].value = data?.sgbmj ? data?.sgbmj + "平方米" : "--";
-//   photoBaseData.value[2].value = data?.zzts ? data.zzts + "" : "--";
-//   photoBaseData.value[3].value = data?.sl ? data?.sl + "年" : "--";
-//   outputBox.value[0].value = data?.cl ? (data.cl + "斤") : "--";
-//   outputBox.value[1].value = data?.spgl? (data.spgl + "%") : "--";
-//   qualityBox.value[0].value = data?.tfl? (data.tfl + "%") : "--";
-//   qualityBox.value[1].value = data?.tgl? (data.tgl + "%") : "--";
-//   qualityBox.value[2].value = data?.dxtj? (data.dxtj + "%") : "--";
-})
+function handleClickPoint({ farmId, sampleId, data }) {
+    console.log("click:point");
+    sampleId = data.id;
+    getSampleFiles(data.geoHashSample);
+    photoBaseData.value[0].value = data.pz;
+    isLoadingImg.value = true;
+    let startDate = new Date(currentDate);
+    startDate.setMonth(currentDate.getMonth() - 2);
+
+    // 格式化日期
+    let params = { sampleId, farmId, startDate: dateFormat(startDate, "YY-mm-dd") };
+    VE_API.miniimage.list(params).then((res) => {
+        if (res.code === 0) {
+            dialogVisible.value = true;
+            images.value = res.data;
+            isLoadingImg.value = false;
+        }
+    });
+    showTag.value = data.nonghu == 1 ? true : false;
+}
 
 eventBus.off("albumCarousel", toggleActiveImg);
 eventBus.on("albumCarousel", toggleActiveImg);
@@ -161,33 +156,33 @@ function toggleActiveImg(index) {
 
 const getSampleFiles = (geoHash) => {
     // photoList.value = [];
-    VE_API.mini_farm.getSampleFiles({ geoHashSample: geoHash }).then(({data}) => {
+    VE_API.mini_farm.getSampleFiles({ geoHashSample: geoHash }).then(({ data }) => {
         photoBaseData.value[0].value = data.meta_info.type_id;
-        let pj = "--"
-        if(data.meta_info.crown){
-          pj = Math.sqrt(data.meta_info.crown * 1.2).toFixed(1);
+        let pj = "--";
+        if (data.meta_info.crown) {
+            pj = Math.sqrt(data.meta_info.crown * 1.2).toFixed(1);
         }
-        photoBaseData.value[1].value = data.meta_info.crown + "平方米(蓬径"+pj+"米)";
-        photoBaseData.value[2].value = data.meta_info.branch_num ;
+        photoBaseData.value[1].value = data.meta_info.crown + "平方米(蓬径" + pj + "米)";
+        photoBaseData.value[2].value = data.meta_info.branch_num;
 
-    photoBaseData.value[3].value = data.meta_info.age + "年"
-    photoList.value[0].key = data.meta_info.dp_alert_info.key
-    photoList.value[0].statement = data.meta_info.dp_alert_info.statement
-    photoList.value[1].key = data.meta_info.grow_alert_info.key
-    photoList.value[1].statement = data.meta_info.grow_alert_info.statement
-    photoList.value[2].key = data.meta_info.nutrition_info.key
-    photoList.value[2].statement = data.meta_info.nutrition_info.statement
-    photoList.value[3].key = data.meta_info.prescription_info.key
-    photoList.value[3].statement = data.meta_info.prescription_info.statement
-      // if(data.production_info.production){
-      //   data.production_info.production = (data.production_info.production * 1.3).toFixed(1)
-      // }
-    outputBox.value[0].value = data.production_info.production + "斤"
-    outputBox.value[1].value = data.production_info.quality.toFixed(0) + "%"
-    outputBox.value[2].value = data.production_info.cihua_ratio.toFixed(0) + "%"
-    qualityBox.value[0].value = data.ecology_info.ventilation + "%"
-    qualityBox.value[1].value = data.ecology_info.transmittance + "%"
-    qualityBox.value[2].value = data.ecology_info.dp_situation+"%"
+        photoBaseData.value[3].value = data.meta_info.age + "年";
+        photoList.value[0].key = data.meta_info.dp_alert_info.key;
+        photoList.value[0].statement = data.meta_info.dp_alert_info.statement;
+        photoList.value[1].key = data.meta_info.grow_alert_info.key;
+        photoList.value[1].statement = data.meta_info.grow_alert_info.statement;
+        photoList.value[2].key = data.meta_info.nutrition_info.key;
+        photoList.value[2].statement = data.meta_info.nutrition_info.statement;
+        photoList.value[3].key = data.meta_info.prescription_info.key;
+        photoList.value[3].statement = data.meta_info.prescription_info.statement;
+        // if(data.production_info.production){
+        //   data.production_info.production = (data.production_info.production * 1.3).toFixed(1)
+        // }
+        outputBox.value[0].value = data.production_info.production + "斤";
+        outputBox.value[1].value = data.production_info.quality.toFixed(0) + "%";
+        outputBox.value[2].value = data.production_info.cihua_ratio?.toFixed(0) + "%";
+        qualityBox.value[0].value = data.ecology_info.ventilation + "%";
+        qualityBox.value[1].value = data.ecology_info.transmittance + "%";
+        qualityBox.value[2].value = data.ecology_info.dp_situation + "%";
     });
 };
 
@@ -211,10 +206,10 @@ const photoBaseData = ref([
 ]);
 
 const photoList = ref([
-    {key: "病虫", statement: "--"},
-    {key: "异常", statement: "--"},
-    {key: "营养", statement: "--"},
-    {key: "农事", statement: "--"},
+    { key: "病虫", statement: "--" },
+    { key: "异常", statement: "--" },
+    { key: "营养", statement: "--" },
+    { key: "农事", statement: "--" },
 ]);
 
 const activeOuput = ref(null);
@@ -223,28 +218,26 @@ const activeOuput = ref(null);
 function toggleAcitve(name) {
     activeOuput.value = name;
     if (name.indexOf("开花") > -1) {
-        eventBus.emit("change:watermark", "开花目标框")
+        eventBus.emit("change:watermark", "开花目标框");
     } else if (name.indexOf("花穗") > -1) {
-        eventBus.emit("change:watermark", "花穗目标框")
+        eventBus.emit("change:watermark", "花穗目标框");
     } else if (name.indexOf("雄花") > -1) {
-        eventBus.emit("change:watermark", "雄花目标框")
+        eventBus.emit("change:watermark", "雄花目标框");
     } else if (name.indexOf("枝条数") > -1) {
-        eventBus.emit("change:watermark", "")
+        eventBus.emit("change:watermark", "");
     } else {
-        eventBus.emit("change:watermark", "")
+        eventBus.emit("change:watermark", "");
     }
 }
 
 function closeDialog() {
-    activeOuput.value = null
-    eventBus.emit("change:watermark", "")
-    eventBus.emit("resetImgIndex")
+    activeOuput.value = null;
+    eventBus.emit("change:watermark", "");
+    eventBus.emit("resetImgIndex");
 }
 
 // 质量详情
-function toggleQualityAcitve() {
-
-}
+function toggleQualityAcitve() {}
 </script>
 
 <style lang="scss" scoped>
@@ -266,7 +259,7 @@ function toggleQualityAcitve() {
             align-items: center;
 
             .tag {
-                border: 1px solid #FFD489;
+                border: 1px solid #ffd489;
                 border-radius: 4px;
                 font-size: 12px;
                 display: inline-block;

src/views/home/album_compoents/albumDrawBox.vue

@@ -1,9 +1,9 @@
 <template>
   <photo-consumer
       class="carousel-item"
-      :src="watermark || base_img_url3 + (photo.resFilename && !name ? photo.resFilename : photo.filename) + resize"
+      :src="watermark || base_img_url2 + (photo.resFilename && !name ? photo.resFilename : photo.filename) + resize"
   >
-    <img v-if="Math.abs(current - index) < 3" crossorigin="anonymous" @load="drawWatermark($event, name)" loading="lazy" :src="watermark || (base_img_url3 + (photo.resFilename && !name ? photo.resFilename : photo.filename) + resize)" style="width: 100%;" />
+    <img v-if="Math.abs(current - index) < 3" crossorigin="anonymous" @load="drawWatermark($event, name)" loading="lazy" :src="watermark || (base_img_url2 + (photo.resFilename && !name ? photo.resFilename : photo.filename) + resize)" style="width: 100%;" />
     <canvas  ref="canvasRef" style="position: absolute;"></canvas>
     <!-- <div class="tag-text" v-if="showTagBox" >
       <span v-html="photo.growText"></span>
@@ -17,7 +17,7 @@
 
 <script setup>
 import { ref, onMounted, onBeforeUnmount, defineProps } from "vue";
-import { base_img_url3 } from "@/api/config";
+import { base_img_url2 } from "@/api/config";
 import {imageCache,loadImage} from "./cacheImg.js"
 import {dateFormat} from "@/utils/date_util.js"
 import {pointToFormat} from "@/utils/util.js"

src/views/home/components/adoptList.vue

@@ -150,7 +150,7 @@
         </div>
 
         <!-- 渐变主色按钮 -->
-        <div class="center-btn" v-show="!isManySetting" @click="manySetPrice">批量定价</div>
+        <div class="center-btn" v-show="!isManySetting" @click="manySetPrice">批量编辑果树</div>
         <!-- 渐变主色按钮 -->
         <div class="btn-group list-btn" v-show="isManySetting">
             <div class="btn cancel-btn" @click="saveManySetting(0)">取消</div>

src/views/home/homeMap.vue

@@ -1,6 +1,7 @@
 <template>
     <div>
         <div id="map" ref="areaRef" class="area-map"></div>
+        <album-carousel></album-carousel>
     </div>
 </template>
 
@@ -16,7 +17,8 @@ import { Cluster, Vector as VectorSource } from "ol/source.js";
 import { boundingExtent, getCenter } from "ol/extent.js";
 import RegionLayer from "./map/regionLayer";
 import eventBus from "@/api/eventBus";
-import MockFarmLayer from "./map/mockFarmLayer";
+import albumCarousel from "./album_compoents/albumCarousel.vue";
+// import MockFarmLayer from "./map/mockFarmLayer";
 
 import { onMounted, ref } from "vue";
 import { useStore } from "vuex";
@@ -35,7 +37,7 @@ const ROLE = store.state.home.userRole;
 
 let kmap = null;
 const areaRef = ref(null);
-let mockFarmLayer = null;
+// let mockFarmLayer = null;
 let dragBox;
 
 const currentTree = ref(null)
@@ -91,16 +93,16 @@ const stopBoxSelect = () => {
 
 let treeClusterLayer;
 onMounted(() => {
-    let level = 14;
+    let level = 16;
     let coordinate = util.wktCastGeom(store.getters.userinfo.location).getFirstCoordinate();
     kmap = new KMap.Map(areaRef.value, level, coordinate[0], coordinate[1], null, 1, 22, "img", true, true);
     regionLayer = new RegionLayer(kmap);
-    mockFarmLayer = new MockFarmLayer(kmap)
-    VE_API.info.contactsList().then(res => {
-      if(res.code ===0){
-        mockFarmLayer.setData(res.data)
-      }
-    })
+    // mockFarmLayer = new MockFarmLayer(kmap)
+    // VE_API.info.contactsList().then(res => {
+    //   if(res.code ===0){
+    //     mockFarmLayer.setData(res.data)
+    //   }
+    // })
 
 });
 let styleCache = {};
@@ -138,7 +140,6 @@ function addCluster(treeListData, distanceVal) {
             // 只有一个数据，不需要聚合，直接使用第一项数据的图标
             if (size == 1) {
                let featureOne = feature.get("features")[0];
-               console.log('featureOne.get', featureOne.get('fosterStatus'));
                 const key = featureOne.get('fosterStatus')+"status"
                 let style = styleCache[key];
                 // let style = false;
@@ -298,10 +299,13 @@ function addCluster(treeListData, distanceVal) {
                         features[0].set("highlight", true);
                         // features[0].setStyle(selectedStyle)
                     } else if (!hasFeatures) {
+                        console.log('hasFeatures');
                         resetCurrentTree()
                         features[0].set("currentTree", true)
+                        const fs = features[0]
                         currentTree.value = features[0]
-                        eventBus.emit("clickMapPoint", features[0])
+                        eventBus.emit("click:point", { farmId: fs.get("farmId"), sampleId: fs.get("sampleId"), data: fs.getProperties() })
+                        // eventBus.emit("clickMapPoint", features[0])
                     }
                 }
             });
@@ -321,8 +325,10 @@ function clearCluster() {
 
 function zoomToFeatures(features) {
     const extent = boundingExtent(features.map((r) => r.getGeometry().getCoordinates()));
-    const center = getCenter(extent);
-    kmap.setCenter2(center);
+    kmap.getView().fit(extent, { duration: 500, padding: [200, 250, 120, 250] });
+
+    // const center = getCenter(extent);
+    // kmap.setCenter2(center);
 }
 
 function resetCurrentTree() {

src/views/home/index.vue

@@ -3,7 +3,7 @@
         <div class="content">
             <!-- <navigation @handleTab="handleTab"></navigation> -->
             <div class="left yes-events">
-                <component :is="components[currentComponent]" @backHome="backHome"/>
+                <component :is="components[currentComponent]" @backHome="backHome" />
             </div>
 
             <div class="right yes-events">
@@ -30,14 +30,14 @@
             <!-- 图例 -->
             <div v-if="legendArr && legendArr.length" class="map-bg map-legend yes-events">
                 <div class="item" v-for="(legend, legendI) in legendArr" :key="legendI">
-                    <span class="legend-block" :style="{background: legend.color}"></span>
+                    <span class="legend-block" :style="{ background: legend.color }"></span>
                     {{ legend.name }}
                 </div>
             </div>
             <div v-else class="map-bg map-legend yes-events">
                 <div class="item" v-if="ROLE == 1">
                     <img src="@/assets/images/map/status/wry.png" alt="" />
-                    未开放认养
+                    未开放
                 </div>
                 <div class="item" v-if="ROLE == 2">
                     <img src="@/assets/images/map/status/other.png" alt="" />
@@ -45,11 +45,11 @@
                 </div>
                 <div class="item" v-show="!checkShow">
                     <img src="@/assets/images/map/status/dry.png" alt="" />
-                    {{ ROLE == 1 ? "待认养" : "可团购" }}
+                    待守护
                 </div>
                 <div class="item" v-show="!checkShow">
                     <img src="@/assets/images/map/status/yry.png" alt="" />
-                    已认养
+                    已守护
                 </div>
                 <div class="item selected-item" v-show="checkShow">
                     <img src="@/assets/images/map/status/selected.png" alt="" />
@@ -59,14 +59,16 @@
 
             <div class="tips" v-show="checkShow">
                 <div class="text">
-                    <span>提示：</span>请在底图上点选 <span>认养的果树</span>，或按住 Ctrl 框选 <span>认养的区域</span>
+                    <span>提示：</span>请在底图上点选 <span>可守护的果树</span>，或按住 Ctrl 框选 <span>守护的区域</span>
                 </div>
             </div>
 
-            <div v-show="!checkShow && ROLE == 1" class="right-button yes-events" @click="hanldeCheck">勾选认养区域</div>
+            <div v-show="!checkShow && ROLE == 1" class="right-button yes-events" @click="hanldeCheck">
+                新增守护区域
+            </div>
             <div v-show="checkShow" class="center-button">
                 <div class="cancel yes-events" @click="handleCancel">取消</div>
-                <div class="yes-events" @click="handleCancel">确认开放认养权限</div>
+                <div class="yes-events" @click="handleCancel">确认开放守护权限</div>
             </div>
         </div>
     </div>
@@ -107,7 +109,7 @@ const components = {
 const router = useRouter();
 const mapRef = ref(null);
 
-const activeName = ref('果树列表')
+const activeName = ref("果树列表");
 // 用户角色
 store.commit("home/SET_USER_ROLE", 1);
 
@@ -116,18 +118,25 @@ onMounted(() => {
     //区域切换监听事件
     eventBus.on("area:id", areaId);
     ROLE.value = store.state.home.userRole;
+    // 柏桥村
+    areaId({ areaId: 0, farmId: 80865 });
 });
 
 onUnmounted(() => {
+    if (mapRef.value) {
+        mapRef.value.destroy(); // 确保在自定义地图组件中实现了destroy方法
+    }
     eventBus.off("area:id", areaId);
+    eventBus.off("changePointLegend", toggleLegend);
+    eventBus.off("clickMapPoint", toggleLeftComponet);
 });
 
-const getPointList = () =>{
-    let selectAll = undefined
+const getPointList = () => {
+    let selectAll = undefined;
     if (regionId.value === 0) {
-      selectAll = 1
+        selectAll = 1;
     }
-    const areaId = selectAll ? undefined : regionId.value
+    const areaId = selectAll ? undefined : regionId.value;
     VE_API.variety.pointList({ farmId: organId.value, regionId: areaId, selectAll }).then(({ data }) => {
         // const arr = data.map(item =>{
         //     return{
@@ -136,60 +145,64 @@ const getPointList = () =>{
         //         lnglat:convertPointToArray(item.point)
         //     }
         // })
-        if(mapRef.value){
+        if (mapRef.value) {
             nextTick(() => {
-                data[0].icon = "1"
-                data[1].icon = "1"
-                data[10].icon = "2"
-                data[20].icon = "2"
-                data[30].icon = "2"
-                data[35].icon = "1"
-                data[40].icon = "1"
-                data[50].icon = "2"
-                mapRef.value.addCluster(data)
+                data[0].icon = "1";
+                data[1].icon = "1";
+                data[10].icon = "2";
+                data[20].icon = "2";
+                data[30].icon = "2";
+                data[35].icon = "1";
+                data[40].icon = "1";
+                data[50].icon = "2";
+                // 设置前50个对象的fosterStatus为1
+                for (let i = 0; i < 50 && i < data.length; i++) {
+                    data[i].fosterStatus = 1;
+                }
+                mapRef.value.addCluster(data);
                 // mapRef.value.initData(arr)
                 // mapRef.value.initMap(arr, () =>  mapRef.value.getRegionList(organId.value))
-            })
+            });
         }
-    })
-}
+    });
+};
 
-const regionData = ref([])
+const regionData = ref([]);
 function getBlueRegionList() {
-    VE_API.region.list({farmId: organId.value}).then(({data}) =>{
-        regionData.value = data
+    VE_API.region.list({ farmId: organId.value }).then(({ data }) => {
+        regionData.value = data;
         mapRef.value.initAreaMap(data);
-    })
+    });
 }
 
-const checkShow = ref(false)
-const hanldeCheck = () =>{
-    checkShow.value = true
-    mapRef.value.enableBoxSelect()
-}
+const checkShow = ref(false);
+const hanldeCheck = () => {
+    checkShow.value = true;
+    mapRef.value.enableBoxSelect();
+};
 
-const handleCancel = () =>{
-    checkShow.value = false
+const handleCancel = () => {
+    checkShow.value = false;
     // mapRef.value.clearSelection()
-    mapRef.value.stopBoxSelect()
-}
+    mapRef.value.stopBoxSelect();
+};
 
 // 图例
-const legendArr = ref([])
+const legendArr = ref([]);
 
 const organId = ref("");
 const regionId = ref(null);
 const tabName = ref("");
 const tabId = ref(0);
-eventBus.off("changePointLegend", toggleLegend)
-eventBus.on("changePointLegend", toggleLegend)
-function toggleLegend({colorObj}) {
-    legendArr.value = colorObj?.list
+eventBus.off("changePointLegend", toggleLegend);
+eventBus.on("changePointLegend", toggleLegend);
+function toggleLegend({ colorObj }) {
+    legendArr.value = colorObj?.list;
 }
 //选项卡事件监听
 const handleTab = async ({ name, id, isUpdate, params, legend, colorObj }) => {
-    eventBus.emit("changePointType", {legend, colorObj})
-    legendArr.value = colorObj?.list
+    eventBus.emit("changePointType", { legend, colorObj });
+    legendArr.value = colorObj?.list;
     tabName.value = name;
     tabId.value = id;
     // if (id === 0) {
@@ -202,7 +215,7 @@ function areaId({ areaId, farmId }) {
     regionId.value = areaId;
 
     // 树点位
-    getPointList()
+    getPointList();
     // 分区
     if (!regionData.value.length) {
         // 全部区域
@@ -215,14 +228,14 @@ const urlsIndex = ref(0);
 
 const currentComponent = ref("leftTabs");
 
-eventBus.on("clickMapPoint", toggleLeftComponet)
+eventBus.on("clickMapPoint", toggleLeftComponet);
 function toggleLeftComponet() {
-    currentComponent.value = "treeDetail"
+    currentComponent.value = "treeDetail";
 }
 
 function backHome() {
-    currentComponent.value = "leftTabs"
-    mapRef.value.resetCurrentTree()
+    currentComponent.value = "leftTabs";
+    mapRef.value.resetCurrentTree();
 }
 </script>
 
@@ -233,6 +246,7 @@ function backHome() {
     position: absolute;
     box-sizing: border-box;
     z-index: 1;
+    color: #FFFFFF;
 
     .content {
         width: 100%;
@@ -289,11 +303,11 @@ function backHome() {
                         width: 100px;
                     }
                     .el-tabs__active-bar {
-                        background-color: #2199F8;
+                        background-color: #2199f8;
                         height: 1px;
                     }
                     .el-tabs__item.is-active {
-                        color: #2199F8;
+                        color: #2199f8;
                     }
                     .el-tabs__nav-wrap:after {
                         height: 1px;
@@ -381,25 +395,25 @@ function backHome() {
             padding: 7px 16px;
             left: 460px;
         }
-        .tips{
+        .tips {
             position: fixed;
             z-index: 2;
             top: 105px;
             width: 100%;
             display: flex;
             justify-content: center;
-            .text{
+            .text {
                 font-size: 20px;
                 padding: 6px 16px;
                 font-family: "PangMenZhengDao";
                 background: rgba(4, 3, 0, 0.6);
                 border-radius: 20px;
-                span{
-                    color: #FFD489;
+                span {
+                    color: #ffd489;
                 }
             }
         }
-        .right-button{
+        .right-button {
             position: fixed;
             z-index: 2;
             right: 460px;
@@ -408,9 +422,9 @@ function backHome() {
             font-family: "PangMenZhengDao";
             padding: 16px 32px 20px 32px;
             cursor: pointer;
-            background: url('@/assets/images/foster-home/btn-bg.png') no-repeat center center /100% 100%;
+            background: url("@/assets/images/foster-home/btn-bg.png") no-repeat center center / 100% 100%;
         }
-        .center-button{
+        .center-button {
             position: fixed;
             z-index: 2;
             width: 100%;
@@ -418,7 +432,7 @@ function backHome() {
             align-items: center;
             justify-content: center;
             bottom: 116px;
-            div{
+            div {
                 cursor: pointer;
                 width: 248px;
                 text-align: center;
@@ -426,13 +440,13 @@ function backHome() {
                 font-family: "PangMenZhengDao";
                 color: #000;
                 font-size: 20px;
-                background: linear-gradient(0deg,#FFD887,#ED9E1E);
+                background: linear-gradient(0deg, #ffd887, #ed9e1e);
                 border: 2px solid rgba(255, 255, 255, 0.61);
                 border-radius: 12px;
             }
-            .cancel{
+            .cancel {
                 margin-right: 20px;
-                background: #EEEEEE;
+                background: #eeeeee;
             }
         }
         .map-btn {
@@ -507,7 +521,7 @@ function backHome() {
             font-size: 20px;
             color: #ffd489;
             .tag {
-                border: 1px solid #FFD489;
+                border: 1px solid #ffd489;
                 border-radius: 4px;
                 font-size: 12px;
                 display: inline-block;

src/views/home/map/samplePointLayer.js

@@ -142,7 +142,7 @@ class SamplePointLayer {
           if (that.isUpdatePoint) {
             fs.set("iconName", "active");
           }
-          eventBus.emit("click:point", { farmId: fs.get("farmId"), sampleId: fs.get("sampleId"), data: fs.getProperties() })
+          // eventBus.emit("click:point", { farmId: fs.get("farmId"), sampleId: fs.get("sampleId"), data: fs.getProperties() })
         }
       })
     })