From dcdc2a5054b847e1e9bd246393d6277f152ae1c5 Mon Sep 17 00:00:00 2001
From: hbao <ao@dubbo,vip>
Date: Tue, 1 Mar 2022 18:23:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AD=A6=E5=91=8A=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/homesteadSurvey/list.vue | 44 ++++++++++++++++++++++++++----
 1 file changed, 38 insertions(+), 6 deletions(-)

diff --git a/src/views/homesteadSurvey/list.vue b/src/views/homesteadSurvey/list.vue
index ae7fee88..0313db29 100644
--- a/src/views/homesteadSurvey/list.vue
+++ b/src/views/homesteadSurvey/list.vue
@@ -468,7 +468,7 @@
           </template>
         </van-search>
         <div class="searchBox" style="display: none;">
-          <van-cell center v-for="(item,index) in mapDataAll">
+          <van-cell center v-for="(item,index) in mapDataAll" :key="index">
             <template #title>
               <p><van-icon name="manager" /><span>{{item.syqr}}</span><span style="background: rgba(122, 201, 67, 0.4);color:#7ac943">{{item.paceType}}</span>
                 <span style="background: rgba(122, 201, 67, 0.4);color:#7ac943">{{item.typeTc}}</span></p>
@@ -1168,7 +1168,7 @@
     import {listShyqr} from "@/api/homesteadSurvey/shyqr";
     import {listSuyqr,updateSuyqr,addSuyqr} from "@/api/homesteadSurvey/suyqr";
     import {listZrz,getZrzZjdDmList,getZrz} from "@/api/homesteadSurvey/zrz";
-    import {listFsss,getFsssZjdDmList,getfsss} from "@/api/homesteadSurvey/fsss";
+    import {listFsss,getFsssZjdDmList,getFsss} from "@/api/homesteadSurvey/fsss";
     import { listTown, getTown } from "@/api/homesteadSurvey/town";
     import { listVillage} from "@/api/homesteadSurvey/village";
     import $ from "jquery";
@@ -3784,9 +3784,13 @@
                         //   }
                         // });
                         console.log(obj.id);
-                        getZjdzd(obj.id).then((response) => {
+                        let params = {
+                          "deptId" : that.$cookies.get("item").deptId,
+                          "zjddm" : obj.zjddm,
+                        }
+                        listZjdzd(params).then((response) => {
                           console.log(response);
-                          that.mapZjdData = response.data;
+                          that.mapZjdData = response.rows[0];
                           that.mapZjdData.active = 1;
                           that.mapZjdTeAll.mapZjdAData =that.mapZjdData;
                           that.mapZjdDataTure = 1;
@@ -3806,8 +3810,36 @@
                                 "    \"type\": \"Feature\",\n" +
                                 "    \"geometry\":" + that.mapZjdData.theGeom + ",    \"properties\":" + JSON.stringify(that.mapZjdData) + "}"),
                             }),
+
                             style: styleZjd
                           });
+                          // function createLabelStyle() {
+                          //   return new ol.style.Style({
+                          //     text: new ol.style.Text({
+                          //       text: that.textMjAll+"㎡",
+                          //       textAlign: "center", //位置
+                          //       textBaseline: "middle", //基准线
+                          //       font: "normal 12px 微软雅黑", //文字样式
+                          //       //text: "标注点", //文本内容
+                          //       fill: new ol.style.Fill({
+                          //         //文本填充样式（即文字颜色)
+                          //         color: "#FFFFFF",
+                          //         width: 10,
+                          //       }),
+                          //       overflow: false //超出面的部分不显示
+                          //     }),
+                          //     zIndex: 9999,
+                          //   });
+                          // }
+                          // var newcenterFeatureMap = new ol.Feature({
+                          //   geometry: new ol.geom.Point(that.clickBbox), //几何信息
+                          //   //name: "标注点",
+                          // });
+                          // var sourceMapLook = new ol.source.Vector({wrapX: false});
+                          // vector_drawing_delete = new ol.layer.Vector({
+                          //   source: sourceMapLook,
+                          // });
+                          // map.addLayer(vector_drawing_delete);
                           map.addLayer(hc_land_on);
                           var maxXMap = hc_land_on.values_.source.featuresRtree_.rbush_.data.maxX;
                           var maxYMap = hc_land_on.values_.source.featuresRtree_.rbush_.data.maxY;
@@ -4097,7 +4129,7 @@
                           that.mapZjdData = response.rows[0];
                           that.mapZjdData.active = 1;
                           that.mapZjdTeAll.mapZjdAData = that.mapZjdData;
-                          getfsss(obj.id).then((response) => {
+                          getFsss(obj.id).then((response) => {
                             //that.mapfsssData.active = 4;
                             that.mapfsssData = response.data;
                             that.mapZjdTeAll.mapFsssAData = that.mapfsssData;
@@ -4646,7 +4678,7 @@
               }, 500);
             });
           }else if(item.typeTc =="附属设施"){
-            getfsss(item.id).then((response) => {
+            getFsss(item.id).then((response) => {
               this.mapFsssData = response.data;
               console.log(this.mapZjdData);
               this.mapZjdTeAll.active = 4;