From 79eadc06f341ad2e1d46ba8ae2d9e839edb25193 Mon Sep 17 00:00:00 2001
From: QI_YUJIE <2878090898@qq.com>
Date: Thu, 23 Nov 2023 16:24:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E4=BA=A7=E8=B5=84=E6=BA=90=E5=9C=B0?=
 =?UTF-8?q?=E5=9B=BE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/sunVillage_info/fixedAssets.js        |  16 ++
 src/components/Map/MapGisLine.vue             | 120 +++++++-
 src/components/Map/MapGisTagDTGCopy.vue       | 258 ++++++++++++++----
 src/views/sunVillage_info/assetMapOpen.vue    |  39 ++-
 src/views/sunVillage_info/fixedAssets.vue     |  58 ++--
 src/views/sunVillage_info/list_chronicles.vue |   2 -
 src/views/sunVillage_info/list_contractor.vue |   2 -
 src/views/sunVillage_info/resource.vue        |  60 +++-
 8 files changed, 450 insertions(+), 105 deletions(-)

diff --git a/src/api/sunVillage_info/fixedAssets.js b/src/api/sunVillage_info/fixedAssets.js
index c38449eb..c4b75313 100644
--- a/src/api/sunVillage_info/fixedAssets.js
+++ b/src/api/sunVillage_info/fixedAssets.js
@@ -126,6 +126,15 @@ export function getPermanent(id) {
     method: 'get'
   })
 }
+
+// 清除固定资产图层
+export function clearPermanentGeom(id) {
+  return request({
+    url: '/asset/permanent/clear/' + id,
+    method: 'get'
+  });
+}
+
 // 修改固定资产
 export function updatePermanent(data) {
   return request({
@@ -1036,6 +1045,13 @@ export function getResource(id) {
   })
 }
 
+export function clearResourceGeom(id) {
+  return request({
+    url: '/asset/resource/clear/' + id,
+    method: 'get'
+  });
+}
+
 // 资源新增
 export function addResource(data) {
   return request({
diff --git a/src/components/Map/MapGisLine.vue b/src/components/Map/MapGisLine.vue
index 5033dd4c..36339b17 100644
--- a/src/components/Map/MapGisLine.vue
+++ b/src/components/Map/MapGisLine.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
 <!--    <p class="fuTitle">地块位置绘制</p>-->
-    <div id="full-screen-acceptance" style="width: 100%;height:73vh;">
+    <div id="full-screen-acceptance" style="width: 100%;height:71vh;">
         <div :id=this.uuidMap style="width: 100%;height: 100%"></div>
         <div id='land-btn-wrap'>
             <!--<el-button :id=this.drawingPolygonMap style="background-color:#D0EEFF;color:#1E88C7" @click="" type="primary">画图</el-button>-->
@@ -11,6 +11,7 @@
             <input :id="this.drawingResetMap" type="button" class="ant-btn ant-btn-red" value="重置图层"/>
         </div>
       </div>
+    <div style="font-size: 13px; padding-top: 5px;">备注信息：绿色地块表示该地块，蓝色表示本账套已标记的其他地块</div>
     <div id="info" style="display: none"></div>
   </div>
 </template>
@@ -18,6 +19,7 @@
 <script>
   import {getQueryLand} from "@/api/homesteadSurvey/zjdzd";
 import $ from "jquery";
+  import { getConfigKey } from "@/api/system/config";
 
 export default {
   components: {
@@ -29,15 +31,30 @@ export default {
       uuidMap: this.guidProduct(),
       drawingPolygonMap: this.guidProduct(),
       drawingResetMap: this.guidProduct(),
+      mapGeoServerUrl: "",            // geoserver地址
+      villageBorderLayerName: "",     // 乡镇边界图层名称
     };
   },
-  props: ['theGeom','message'],
-  // created() {
-  //   // setTimeout(() => {
-  //   //   this.drawingPaceCountryLine();
-  //   // }, 100);
-  // },
+  props: ['theGeom','message', 'resourceId', 'resourceList'],
+  created() {
+    // 获取geoserver的地址
+    this.getGeoServerUrl();
+    // 获取村边界的图层名称
+    this.getVillageBorderLayerName();
+  },
   methods: {
+    // 获取geoserver的地址
+    getGeoServerUrl() {
+      getConfigKey("system.geoServer.url").then(response => {
+        this.mapGeoServerUrl = response.msg;
+      });
+    },
+    // 获取村边界的图层名称
+    getVillageBorderLayerName() {
+      getConfigKey("geoserver.layer.villageBorder").then(response => {
+        this.villageBorderLayerName = response.msg;
+      });
+    },
     //地图加载
     formSubmit(){
        //父组件监听的名字必须是formSubmit
@@ -107,6 +124,51 @@ export default {
             maxZoom: 18.3, //地图放大限制
           }),
         });
+
+        // 添加村边界
+        let mapBorder = new ol.layer.Image({
+          source: new ol.source.ImageWMS({
+            url: this.mapGeoServerUrl + '/wms',
+            params: {
+              LAYERS: this.villageBorderLayerName,
+              cql_filter: "dept_id = '" + this.$store.state.user.loginDeptId + "'",
+              SRID: 3857,
+            },
+          }),
+          name: 'villageBorderLayer'
+        });
+        map.addLayer(mapBorder);
+
+        // 添加已经存在的资源图层
+        let vectorSource = new ol.source.Vector();
+        for (let resource of this.resourceList) {
+          if (resource.theGeom && resource.id !== this.resourceId) {
+            let feature = new ol.Feature({
+              geometry: new ol.geom.MultiPolygon(JSON.parse(resource.theGeom).coordinates),
+              // permanentName: permanent.name
+            });
+            vectorSource.addFeature(feature);
+          }
+        }
+
+        let resourceLayer = new ol.layer.Vector({
+          source: vectorSource,
+          style:  (feature, resolution) => {
+            return new ol.style.Style({
+              fill: new ol.style.Fill({
+                //矢量图层填充颜色，以及透明度
+                color: "rgba(0, 218, 255, 0.3)",
+              }),
+              stroke: new ol.style.Stroke({
+                //边界样式
+                color: "#00DAFF",
+                width: 3,
+              }),
+            })
+          }
+        });
+        map.addLayer(resourceLayer);
+
         //图层查询定位开始 ---------start
         if(this.message.substring(0,1) =="{"){
           // var theGeomMap =this.message.replace("Point", "MultiPolygon");
@@ -290,6 +352,50 @@ export default {
                   maxZoom: 18, //地图放大限制
                 }),
               });
+
+              // 添加村边界
+              let mapBorder = new ol.layer.Image({
+                source: new ol.source.ImageWMS({
+                  url: this.mapGeoServerUrl + '/wms',
+                  params: {
+                    LAYERS: this.villageBorderLayerName,
+                    cql_filter: "dept_id = '" + this.$store.state.user.loginDeptId + "'",
+                    SRID: 3857,
+                  },
+                }),
+                name: 'villageBorderLayer'
+              });
+              map.addLayer(mapBorder);
+
+              // 添加已经存在的资源图层
+              let vectorSource = new ol.source.Vector();
+              for (let resource of this.resourceList) {
+                if (resource.theGeom && resource.id !== this.resourceId) {
+                  let feature = new ol.Feature({
+                    geometry: new ol.geom.MultiPolygon(JSON.parse(resource.theGeom).coordinates),
+                    // permanentName: permanent.name
+                  });
+                  vectorSource.addFeature(feature);
+                }
+              }
+
+              let resourceLayer = new ol.layer.Vector({
+                source: vectorSource,
+                style:  (feature, resolution) => {
+                  return new ol.style.Style({
+                    fill: new ol.style.Fill({
+                      //矢量图层填充颜色，以及透明度
+                      color: "rgba(0, 218, 255, 0.3)",
+                    }),
+                    stroke: new ol.style.Stroke({
+                      //边界样式
+                      color: "#00DAFF",
+                      width: 3,
+                    }),
+                  })
+                }
+              });
+              map.addLayer(resourceLayer);
             }
           }
         });
diff --git a/src/components/Map/MapGisTagDTGCopy.vue b/src/components/Map/MapGisTagDTGCopy.vue
index 8524086b..6f0340f9 100644
--- a/src/components/Map/MapGisTagDTGCopy.vue
+++ b/src/components/Map/MapGisTagDTGCopy.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div id="full-screen-acceptance" style="width: 100%;height:73vh;">
+    <div id="full-screen-acceptance" style="width: 100%;height:71vh;">
       <div :id=this.uuidMap style="width: 100%;height: 100%"></div>
       <div id='land-btn-wrap' v-show="showBtn">
         <input :id="this.drawPolygonMap" class="ant-btn ant-btn-red" type="button" value="标记"/>&nbsp;&nbsp;
@@ -8,14 +8,16 @@
         <input :id="this.drawResetMap" type="button" class="ant-btn ant-btn-red" value="重置标记"/>
       </div>
     </div>
+    <div style="font-size: 13px; padding-top: 5px;">备注信息：黄色标记表示该资产，蓝色标记是本账套已标记的其他资产</div>
     <div id="info" style="display: none"></div>
   </div>
 </template>
 
 <script>
   import $ from "jquery";
-  import {entityGet, treeselect} from "@/api/agriculturalTrusteeship";
   import Cookies from "js-cookie";
+  import {getQueryLand} from "@/api/homesteadSurvey/zjdzd";
+  import { getConfigKey } from "@/api/system/config";
 
   export default {
     data() {
@@ -25,10 +27,30 @@
         uuidMap: this.guidProduct(),
         drawPolygonMap: this.guidProduct(),
         drawResetMap: this.guidProduct(),
+        mapGeoServerUrl: "",            // geoserver地址
+        villageBorderLayerName: "",     // 乡镇边界图层名称
       };
     },
-    props: ['theGeom','message','showBtn'],
+    props: ['theGeom','message','showBtn', 'permanentId', 'permanents'],
+    created() {
+      // 获取geoserver的地址
+      this.getGeoServerUrl();
+      // 获取村边界的图层名称
+      this.getVillageBorderLayerName();
+    },
     methods: {
+      // 获取geoserver的地址
+      getGeoServerUrl() {
+        getConfigKey("system.geoServer.url").then(response => {
+          this.mapGeoServerUrl = response.msg;
+        });
+      },
+      // 获取村边界的图层名称
+      getVillageBorderLayerName() {
+        getConfigKey("geoserver.layer.villageBorder").then(response => {
+          this.villageBorderLayerName = response.msg;
+        });
+      },
       //地图加载
       formSubmit(){
         //父组件监听的名字必须是formSubmit
@@ -130,58 +152,104 @@
               maxZoom: 18.3, //地图放大限制
             }),
           });
-          //图层查询定位开始 ---------start
-          if(this.message.substring(0,1) =="{"){
-            var theGeomMap =this.message.replace("Point", "MultiPolygon");
-            var pointLeft = theGeomMap.replace("[", "[[[[");
-            var pointRight = pointLeft.replace("]", "]]]]");
-            hc_land = new ol.layer.Vector({
-              title: "add Layer",
-              source: new ol.source.Vector({
-                projection: projection,
-                features: new ol.format.GeoJSON().readFeatures("{\n" +
-                  "    \"type\": \"Feature\",\n" +
-                  "    \"geometry\":" + pointRight + "}"),
-              }),
-              style: new ol.style.Style({
-                fill: new ol.style.Fill({
-                  //矢量图层填充颜色，以及透明度
-                  color: "rgba(204, 255, 204,0.3)",
-                }),
-                stroke: new ol.style.Stroke({
-                  //边界样式
-                  color: "#47c68f",
-                  width: 3,
-                }),
-              }),
-            });
+          // 添加村边界
+          let mapBorder = new ol.layer.Image({
+            source: new ol.source.ImageWMS({
+              url: this.mapGeoServerUrl + '/wms',
+              params: {
+                LAYERS: this.villageBorderLayerName,
+                cql_filter: "dept_id = '" + this.$store.state.user.loginDeptId + "'",
+                SRID: 3857,
+              },
+            }),
+            name: 'villageBorderLayer'
+          });
+          map.addLayer(mapBorder);
+
+          // 添加已经存在的坐标点图层
+          let permanentSource = new ol.source.Vector();
+          for (let permanent of this.permanents) {
+            if (permanent.theGeom && permanent.id !== this.permanentId) {
+              let feature = new ol.Feature({
+                geometry: new ol.geom.Point(JSON.parse(permanent.theGeom).coordinates),
+                // permanentName: permanent.name
+              });
+              permanentSource.addFeature(feature);
+            }
           }
-          if(this.message.substring(0,1) =="["){
-            var zbNew = JSON.stringify({"type": "MultiPolygon", "coordinates": [[[this.message.replaceAll("\"","")]]]});
-            var leftJoin = zbNew.replace("\"[","[");
-            var rightJoin = leftJoin.replace("\"]","]");
-            hc_land = new ol.layer.Vector({
-              title: "add Layer",
-              source: new ol.source.Vector({
-                projection: projection,
-                features: new ol.format.GeoJSON().readFeatures("{\n" +
-                  "    \"type\": \"Feature\",\n" +
-                  "    \"geometry\":" + rightJoin + "}"),
-              }),
-              style: new ol.style.Style({
-                fill: new ol.style.Fill({
-                  //矢量图层填充颜色，以及透明度
-                  color: "rgba(204, 255, 204,0.3)",
-                }),
-                stroke: new ol.style.Stroke({
-                  //边界样式
-                  color: "#47c68f",
-                  width: 3,
+          /* let permanentLayer = new ol.layer.Vector({
+            source: clusterSource,
+            style:  (feature, resolution) => {
+              let count = feature.get("features").length;
+              if (count > 1) {
+                // 聚合点样式
+                return this.clusterStyle(count.toString());
+              } else if (count === 1) {
+                return this.iconStyle();
+              }
+            }
+          }); */
+          let permanentLayer = new ol.layer.Vector({
+            source: permanentSource,
+            style:  (feature, resolution) => {
+              return new ol.style.Style({
+                image: new ol.style.Icon({
+                  //设置图标偏移
+                  anchor: [0.5, 1],
+                  //标注样式的起点位置
+                  anchorOrigin: "top-right",
+                  //X方向单位：分数
+                  anchorXUnits: "fraction",
+                  //Y方向单位：像素
+                  anchorYUnits: "pixels",
+                  //偏移起点位置的方向
+                  offsetOrigin: "top-right",
+                  //透明度
+                  opacity: 0.9,
+                  //图片路径
+                  src: require("../../assets/images/location/blue.png"),
                 }),
+                text: new ol.style.Text({
+                  textAlign: "center", //位置
+                  textBaseline: "middle", //基准线
+                  font: "normal 12px 微软雅黑", //文字样式
+                  // text: feature.get("permanentName"), //文本内容
+                  fill: new ol.style.Fill({
+                    //文本填充样式（即文字颜色)
+                    color: "#ff0000",
+                  }),
+                })
+              })
+            }
+          });
+          map.addLayer(permanentLayer);
+
+          //图层查询定位开始 ---------start
+          var theGeomMap =this.message.replace("Point", "MultiPolygon");
+          var pointLeft = theGeomMap.replace("[", "[[[[");
+          var pointRight = pointLeft.replace("]", "]]]]");
+          hc_land = new ol.layer.Vector({
+            title: "add Layer",
+            source: new ol.source.Vector({
+              projection: projection,
+              features: new ol.format.GeoJSON().readFeatures("{\n" +
+                "    \"type\": \"Feature\",\n" +
+                "    \"geometry\":" + pointRight + "}"),
+            }),
+            style: new ol.style.Style({
+              fill: new ol.style.Fill({
+                //矢量图层填充颜色，以及透明度
+                color: "rgba(204, 255, 204,0.3)",
               }),
-            });
-          }
+              stroke: new ol.style.Stroke({
+                //边界样式
+                color: "#47c68f",
+                width: 3,
+              }),
+            }),
+          });
           map.addLayer(hc_land);
+
           var maxXMap = hc_land.values_.source.featuresRtree_.rbush_.data.maxX;
           var maxYMap = hc_land.values_.source.featuresRtree_.rbush_.data.maxY;
           var minXMap = hc_land.values_.source.featuresRtree_.rbush_.data.minX;
@@ -299,16 +367,16 @@
           });
           //获取坐标是否存在
           var Zb;
-          var latitude;
-          var longitude;
           //开始定位当前位置
-          navigator.geolocation.getCurrentPosition(function(position) {
-            latitude = position.coords.latitude;// 获取纬度
-            longitude = position.coords.longitude;// 获取经度
-          });
-          treeselect().then(res=>{
+          getQueryLand().then(res => {
             if (res.code == 200) {
-              Zb = [res.data[0].lng,res.data[0].lat]
+              let lat = res.data.lat;
+              let lng = res.data.lng;
+              if(lat && lng){
+                Zb = [lng,lat];
+              }else {
+                Zb =[115.452752, 31.789033];
+              }
               //加载地图
               map = new ol.Map({
                 controls: ol.control.defaults({attribution: false, zoom: false, rotate: false}).extend([]), //隐藏放大缩小按钮
@@ -324,6 +392,78 @@
                   maxZoom: 18, //地图放大限制
                 }),
               });
+
+              // 添加村边界
+              let mapBorder = new ol.layer.Image({
+                source: new ol.source.ImageWMS({
+                  url: this.mapGeoServerUrl + '/wms',
+                  params: {
+                    LAYERS: this.villageBorderLayerName,
+                    cql_filter: "dept_id = '" + this.$store.state.user.loginDeptId + "'",
+                    SRID: 3857,
+                  },
+                }),
+                name: 'villageBorderLayer'
+              });
+              map.addLayer(mapBorder);
+
+              // 添加已经存在的坐标点图层
+              let permanentSource = new ol.source.Vector();
+              for (let permanent of this.permanents) {
+                if (permanent.theGeom && permanent.id !== this.permanentId) {
+                  let feature = new ol.Feature({
+                    geometry: new ol.geom.Point(JSON.parse(permanent.theGeom).coordinates),
+                    // permanentName: permanent.name
+                  });
+                  permanentSource.addFeature(feature);
+                }
+              }
+              /* let permanentLayer = new ol.layer.Vector({
+                source: clusterSource,
+                style:  (feature, resolution) => {
+                  let count = feature.get("features").length;
+                  if (count > 1) {
+                    // 聚合点样式
+                    return this.clusterStyle(count.toString());
+                  } else if (count === 1) {
+                    return this.iconStyle();
+                  }
+                }
+              }); */
+              let permanentLayer = new ol.layer.Vector({
+                source: permanentSource,
+                style:  (feature, resolution) => {
+                  return new ol.style.Style({
+                    image: new ol.style.Icon({
+                      //设置图标偏移
+                      anchor: [0.5, 1],
+                      //标注样式的起点位置
+                      anchorOrigin: "top-right",
+                      //X方向单位：分数
+                      anchorXUnits: "fraction",
+                      //Y方向单位：像素
+                      anchorYUnits: "pixels",
+                      //偏移起点位置的方向
+                      offsetOrigin: "top-right",
+                      //透明度
+                      opacity: 0.9,
+                      //图片路径
+                      src: require("../../assets/images/location/blue.png"),
+                    }),
+                    text: new ol.style.Text({
+                      textAlign: "center", //位置
+                      textBaseline: "middle", //基准线
+                      font: "normal 12px 微软雅黑", //文字样式
+                      // text: feature.get("permanentName"), //文本内容
+                      fill: new ol.style.Fill({
+                        //文本填充样式（即文字颜色)
+                        color: "#ff0000",
+                      }),
+                    })
+                  })
+                }
+              });
+              map.addLayer(permanentLayer);
             }
           })
 
diff --git a/src/views/sunVillage_info/assetMapOpen.vue b/src/views/sunVillage_info/assetMapOpen.vue
index f6231682..76a326e1 100644
--- a/src/views/sunVillage_info/assetMapOpen.vue
+++ b/src/views/sunVillage_info/assetMapOpen.vue
@@ -482,6 +482,7 @@
     openAttachmentList
   } from "@/api/sunVillage_info/fixedAssets";
   import {getQueryLand} from "@/api/sunVillage_info/homestead/application";
+  import { getConfigKey } from "@/api/system/config";
   export default {
     components: {
       getPermanentList,
@@ -504,10 +505,17 @@
         mapHaDataValue:false,
         mapHasDateStatus: 0, //0资源资产  1固定资产
         dialogVisible:false,
-        dialogImageUrl:''
+        dialogImageUrl:'',
+        mapGeoServerUrl: "",            // geoserver地址
+        villageBorderLayerName: "",     // 乡镇边界图层名称
       };
     },
-
+    created() {
+      // 获取geoserver的地址
+      this.getGeoServerUrl();
+      // 获取村边界的图层名称
+      this.getVillageBorderLayerName();
+    },
     mounted() {
       let mapTheGeomAll =this.$cookies.get("bookId");
       console.info(mapTheGeomAll);
@@ -526,6 +534,18 @@
       });
     },
     methods: {
+      // 获取geoserver的地址
+      getGeoServerUrl() {
+        getConfigKey("system.geoServer.url").then(response => {
+          this.mapGeoServerUrl = response.msg;
+        });
+      },
+      // 获取村边界的图层名称
+      getVillageBorderLayerName() {
+        getConfigKey("geoserver.layer.villageBorder").then(response => {
+          this.villageBorderLayerName = response.msg;
+        });
+      },
       openImage(url){
         this.dialogImageUrl = url;
         this.dialogVisible = true;
@@ -613,6 +633,21 @@
             maxZoom: 18.3, //地图放大限制
           }),
         });
+
+        // 添加村边界
+        let mapBorder = new ol.layer.Image({
+          source: new ol.source.ImageWMS({
+            url: this.mapGeoServerUrl + '/wms',
+            params: {
+              LAYERS: this.villageBorderLayerName,
+              cql_filter: "dept_id = '" + this.$cookies.get("deptId") + "'",
+              SRID: 3857,
+            },
+          }),
+          name: 'villageBorderLayer'
+        });
+        map.addLayer(mapBorder);
+
         //判断当前账套是否有数据
         var mapTalkAbout = true;
         //图层查询资源性资产定位开始 ---------start
diff --git a/src/views/sunVillage_info/fixedAssets.vue b/src/views/sunVillage_info/fixedAssets.vue
index e3db7c50..bcfd602c 100644
--- a/src/views/sunVillage_info/fixedAssets.vue
+++ b/src/views/sunVillage_info/fixedAssets.vue
@@ -45,7 +45,7 @@
                <div @click="handleDelete(item,index)" style="background-color: #ee0a24;height: 100%">删除</div>
                <router-link :to="{name:'sunVillageInfoFixedAssetsEdit',query:{id:item.id}}" style="background-color: #07c160">修改</router-link>
                <div @click="openLoader(item.id,0)" style="background-color: rgba(98,173,102,0.2);color: #62AD66;">附件</div>
-               <div @click="openMap(item.theGeom,index)" style="background-color: #62AD66;color: #ffffff;">地图</div>
+               <div @click="openMap(item.id, item.theGeom,index)" style="background-color: #62AD66;color: #ffffff;">地图</div>
              </template>
            </van-swipe-cell>
 
@@ -61,9 +61,10 @@
 
        <van-popup v-model="showMap" lock-scroll position="top" :style="{ height: '80%' }" >
           <div style="padding: 0;text-align: center">
-            <MapGisTag ref="clickLoading" :showBtn="true" :message="theGeom" v-on:formSubmit="MapTag"></MapGisTag>
+            <MapGisTag ref="clickLoading" :showBtn="true" :message="theGeom" v-on:formSubmit="MapTag" :permanentId="permanentId" :permanents="permanents"></MapGisTag>
             <div style="margin-top: 1.5vh">
               <van-button type="info" size="small" @click="saveGeom">保存</van-button>
+              <van-button type="danger" size="small" @click="clearLayer">清除图层</van-button>
               <van-button plain type="info" size="small" @click="showMap = false">取消</van-button>
             </div>
           </div>
@@ -78,7 +79,9 @@
      attachmentList,
      systemAttachment,
      delPermanent,
-     updatePermanent
+     updatePermanent,
+     getPermanent,
+     clearPermanentGeom,
    } from "@/api/sunVillage_info/fixedAssets";
    import request from '@/utils/request'
    import MapGisTag from "@/components/Map/MapGisTagDTGCopy";
@@ -90,7 +93,6 @@
      data() {
        return {
          applicationList:[],
-         applicationListSecond:[],
          assetStatusOptions:[],
          auditStatus:[],
          loading: false,
@@ -112,7 +114,9 @@
          showBtn:true,
          showMap:false,
          theGeom:'',
-         listMap:0
+         listMap:0,
+         permanentId: null,   // 固定资产ID
+         permanents: [],      // 固定资产列表，存储本账套下所有的固定资产信息
        };
      },
      created() {
@@ -127,16 +131,20 @@
        });
      },
      methods: {
-       openMap(theGeom,index){
-         this.showMap = true;
-         this.theGeom = theGeom;
-         this.listMap = index;
-         this.mapClickLoading();
+       openMap(id, theGeom,index){
+         permanentList().then(response => {
+           this.showMap = true;
+           this.permanentId = id;
+           this.theGeom = theGeom;
+           this.listMap = index;
+           this.permanents = response.rows;
+           this.mapClickLoading();
+         });
        },
        //获取自己返回值
        /** 查找地图中定位点 */
        MapTag: function (data) {
-         this.applicationList[this.listMap].theGeom = data;
+         // this.applicationList[this.listMap].theGeom = data;
          this.theGeom = data;
        },
        //每个查看修改，新增  方法下引用下面方法
@@ -146,21 +154,35 @@
          }, 500);
        },
        saveGeom(){
-         console.log(this.theGeom)
          var that = this;
-         this.applicationList[this.listMap].theGeom = this.theGeom;
-         updatePermanent(this.applicationList[this.listMap]).then((response) => {
+         updatePermanent({id: this.permanentId, theGeom: this.theGeom}).then((response) => {
            if (response.code == 200){
              this.$notify({ type: 'success', message: '修改成功' });
              setTimeout(function(){
                that.showMap = false;
-               that.queryParams.pageNum += 1 ;
-               that.applicationList = [];
-               that.getList();
+               getPermanent(that.permanentId).then(response => {
+                 that.applicationList[that.listMap].theGeom = response.data.theGeom;
+               });
              },500)
            }
          });
        },
+       clearLayer() {
+         this.$dialog.confirm({
+           message: '是否清除图层？',
+         }).then(() => {
+           // on confirm
+           clearPermanentGeom(this.permanentId).then(res => {
+             if (res.code === 200) {
+               this.$notify({ type: 'success', message: '清除成功' });
+               this.showMap = false;
+               this.applicationList[this.listMap].theGeom = null;
+             }
+           });
+         }).catch(() => {
+           // on cancel
+         });
+       },
        getList(){
          setTimeout(() => {
            permanentList(this.queryParams).then(response => {
@@ -171,7 +193,6 @@
                response.rows[i].useType = this.selectDictLabel(this.useTypeOptions, response.rows[i].useType);
                // response.rows[i].originalValue = Number(response.rows[i].originalValue ).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => { return $1 + ","; }).replace(/\.$/, "")
                this.applicationList.push(response.rows[i]);
-               this.applicationListSecond.push(response.rows[i]);
              }
              if(this.applicationList.length >= response.total){
                this.finished = true;
@@ -255,6 +276,7 @@
        getSearchList(){
          this.applicationList = [];
          this.queryParams.pageNum = 1;
+         this.finished = false;
          this.getList();
        },
        deleteFile1(file){
diff --git a/src/views/sunVillage_info/list_chronicles.vue b/src/views/sunVillage_info/list_chronicles.vue
index 11432f0a..a4ad163e 100644
--- a/src/views/sunVillage_info/list_chronicles.vue
+++ b/src/views/sunVillage_info/list_chronicles.vue
@@ -51,10 +51,8 @@
  <script>
    import { getList} from "@/api/sunVillage_info/sysCbf";
    import request from '@/utils/request'
-   import MapGisLine from "@/components/Map/MapGisLine";
    export default {
      name: "certificateList",
-     components: { MapGisLine,},
      data() {
        return {
          loading: false,
diff --git a/src/views/sunVillage_info/list_contractor.vue b/src/views/sunVillage_info/list_contractor.vue
index 164d724a..9c283411 100644
--- a/src/views/sunVillage_info/list_contractor.vue
+++ b/src/views/sunVillage_info/list_contractor.vue
@@ -52,10 +52,8 @@
  <script>
    import { getList} from "@/api/sunVillage_info/sysCbf";
    import request from '@/utils/request'
-   import MapGisLine from "@/components/Map/MapGisLine";
    export default {
      name: "certificateList",
-     components: { MapGisLine,},
      data() {
        return {
          loading: false,
diff --git a/src/views/sunVillage_info/resource.vue b/src/views/sunVillage_info/resource.vue
index af8dcaf8..ca286dda 100644
--- a/src/views/sunVillage_info/resource.vue
+++ b/src/views/sunVillage_info/resource.vue
@@ -37,7 +37,7 @@
                <div @click="handleDelete(item,index)" style="background-color: #ee0a24;height: 100%">删除</div>
                <router-link :to="{name:'sunVillageInfoListResourceEdit',query:{id:item.id}}" style="background-color: #07c160">修改</router-link>
                <div @click="openLoader(item.id,0)" style="background-color: rgb(98,173,102,0.2);color: #62AD66;">附件</div>
-               <div @click="openMap(item.theGeom,index)" style="background-color: #62AD66;color: #ffffff;">地图</div>
+               <div @click="openMap(item.id, item.theGeom,index)" style="background-color: #62AD66;color: #ffffff;">地图</div>
              </template>
            </van-swipe-cell>
 
@@ -49,9 +49,11 @@
 
        <van-popup v-model="showMap" lock-scroll position="top" :style="{ height: '80%' }" >
          <div style="padding: 0;text-align: center">
-           <MapGisLine ref="clickLoading" :message="theGeom" v-on:formSubmit="MapTag"></MapGisLine>
+           <MapGisLine ref="clickLoading" :message="theGeom" v-on:formSubmit="MapTag" :resourceId="resourceId" :resourceList="resourceList"></MapGisLine>
+<!--           <div>地图信息：绿色地块表示该地块，蓝色表示本账套已标记的其他地块</div>-->
            <div style="margin-top: 1.5vh">
              <van-button type="info" size="small" @click="saveGeom">保存</van-button>
+             <van-button type="danger" size="small" @click="clearLayer">清除图层</van-button>
              <van-button plain type="info" size="small" @click="showMap = false">取消</van-button>
            </div>
          </div>
@@ -72,7 +74,9 @@
      attachmentList,
      systemAttachment,
      delResource,
-     updateResource
+     updateResource,
+     getResource,
+     clearResourceGeom
    } from "@/api/sunVillage_info/fixedAssets";
    import request from '@/utils/request'
    import MapGisLine from "@/components/Map/MapGisLine";
@@ -105,6 +109,9 @@
          projectId:'',
          projectIndex:'',
          showBtn:true,
+         listMap: 0,
+         resourceId: null,    // 资源ID，记录当前资源的ID
+         resourceList: []     // 资源列表，存储本账套下所有的资源信息
        };
      },
      created() {
@@ -121,30 +128,49 @@
      methods: {
        saveGeom(){
          var that = this;
-         this.applicationList[this.listMap].theGeom = this.theGeom;
-         updateResource(this.applicationList[this.listMap]).then((response) => {
+         updateResource({id: this.resourceId, theGeom: this.theGeom}).then((response) => {
            if (response.code == 200){
              this.$notify({ type: 'success', message: '修改成功' });
              setTimeout(function(){
                that.showMap = false;
-               that.queryParams.pageNum += 1 ;
-               that.applicationList = [];
-               that.getList();
+               getResource(that.resourceId).then(response => {
+                 that.applicationList[that.listMap].theGeom = response.data.theGeom;
+               });
              },500)
            }
          });
        },
-       openMap(theGeom,index){
-         this.showMap = true;
-         this.theGeom = theGeom;
-         this.listMap = index;
-         this.mapClickLoading();
+       clearLayer() {
+         this.$dialog.confirm({
+           message: '是否清除图层？',
+         }).then(() => {
+           // on confirm
+           clearResourceGeom(this.resourceId).then(res => {
+             if (res.code === 200) {
+               this.$notify({ type: 'success', message: '清除成功' });
+               this.showMap = false;
+               this.applicationList[this.listMap].theGeom = null;
+             }
+           });
+         }).catch(() => {
+           // on cancel
+         });
+       },
+       openMap(id, theGeom,index){
+         listResource().then(response => {
+           this.showMap = true;
+           this.resourceId = id;
+           this.theGeom = theGeom;
+           this.listMap = index;
+           this.resourceList = response.rows;
+           this.mapClickLoading();
+         });
        },
        //每个查看修改，新增  方法下引用下面方法
        mapClickLoading(){
          setTimeout(() => {
            this.$refs.clickLoading.drawingPaceCountryLine();
-         }, 500);
+         }, 1000);
        },
        /** 查找地图中定位点 */
        MapTag: function (data) {
@@ -159,9 +185,12 @@
          });
        },
        getList(){
+         this.loading = true;
          listResource(this.queryParams).then(response => {
            this.listLength = response.total;
-           this.applicationList = response.rows;
+           response.rows.forEach(item => {
+             this.applicationList.push(item);
+           });
            if(this.applicationList.length >= response.total){
              this.finished = true;
              return;
@@ -235,6 +264,7 @@
        getSearchList(){
          this.applicationList = [];
          this.queryParams.pageNum = 1;
+         this.finished = false;
          this.getList();
        },
        deleteFile1(file){