From bf20cc0261d9756b9cae5d6daff08d9c2a525c92 Mon Sep 17 00:00:00 2001
From: zzl <961867786@qq.com>
Date: Fri, 12 Sep 2025 09:22:57 +0800
Subject: [PATCH 01/11] =?UTF-8?q?=E5=9C=B0=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/gis/MapField.vue   | 409 ++++++++++++++++++++++++++++++
 src/components/house/MapField.vue | 286 ---------------------
 src/views/resource/land/index.vue | 118 ++++-----
 3 files changed, 459 insertions(+), 354 deletions(-)
 create mode 100644 src/components/gis/MapField.vue
 delete mode 100644 src/components/house/MapField.vue

diff --git a/src/components/gis/MapField.vue b/src/components/gis/MapField.vue
new file mode 100644
index 0000000..d187e5f
--- /dev/null
+++ b/src/components/gis/MapField.vue
@@ -0,0 +1,409 @@
+<template>
+  <div class="land-map-container">
+    <!-- 地图容器 -->
+    <div id="mapWrap" class="map-wrap"></div>
+    <!-- 地图操作按钮 -->
+    <div id="land-btn-wrap" class="map-btn-wrap">
+      <el-row>
+        <input id="drawPolygon" class="ant-btn ant-btn-red" type="button" value="画图" click="handleDrawPolygon"/>&nbsp;&nbsp;
+        <input id="drawReset" type="button" class="ant-btn ant-btn-red" value="还原" @click="handleDrawReset"/>
+      </el-row>
+    </div>
+  </div>
+</template>
+
+<script>
+  import ol from 'ol' // 确保项目已引入OpenLayers
+  import $ from 'jquery'
+
+  export default {
+    name: 'LandMapComponent',
+    props: {
+      // 地图配置参数
+      mapConfig: {
+        type: Object,
+        required: true,
+        default: () => ({
+          geoServerUrl: '', // GeoServer地址
+          landLayerName: '', // 地块图层名
+          villageBorderLayerName: '', // 村边界图层名
+          centerLng: 115.452752, // 默认中心点经度
+          centerLat: 31.789033, // 默认中心点纬度
+          zoom: 17.8, // 默认缩放级别
+          maxZoom: 18.3, // 最大缩放级别
+          minZoom: 0 // 最小缩放级别
+        })
+      },
+      // 目标地块数据（用于定位和高亮）
+      targetLand: {
+        type: Object,
+        default: () => ({
+          fid: '',
+          theGeom: '', // 地块几何信息
+          importCode: '' // 用于筛选村边界的编码
+        })
+      },
+      // 其他地块数据（用于加载已有地块图层）
+      otherLands: {
+        type: Array,
+        default: () => []
+      }
+    },
+    data() {
+      return {
+        map: null, // 地图实例
+        draw: null, // 绘制实例
+        vectorDrawingLayer: null, // 绘制图层
+        targetLandLayer: null, // 目标地块高亮图层
+        otherLandsLayer: null, // 其他地块图层
+        villageBorderLayer: null, // 村边界图层
+        drawResult: null // 绘制结果（几何坐标）
+      }
+    },
+    watch: {
+      // 监听地块数据变化，重新加载图层
+      targetLand: {
+        deep: true,
+        handler(newVal) {
+          this.initTargetLandLayer(newVal)
+          this.initVillageBorderLayer(newVal.importCode)
+        }
+      },
+      otherLands: {
+        deep: true,
+        handler(newVal) {
+          this.initOtherLandsLayer(newVal)
+        }
+      },
+      // 监听地图配置变化，重新初始化地图
+      mapConfig: {
+        deep: true,
+        handler(newVal) {
+          this.destroyMap() // 销毁旧地图
+          this.initMap(newVal) // 初始化新地图
+        }
+      }
+    },
+    mounted() {
+      // 组件挂载后初始化地图
+      this.initMap(this.mapConfig)
+    },
+    beforeUnmount() {
+      // 组件卸载前销毁地图资源
+      this.destroyMap()
+    },
+    methods: {
+      /**
+       * 初始化地图核心实例
+       * @param {Object} config - 地图配置
+       */
+      initMap(config) {
+        // 1. 定义投影（EPSG:3857）
+        const projection = new ol.proj.Projection({
+          code: 'EPSG:3857',
+          units: 'degrees'
+        })
+
+        // 2. 加载底图（天地图卫星影像+标注）
+        const aerialLayer = new ol.layer.Tile({
+          source: new ol.source.XYZ({
+            url: `http://t0.tianditu.gov.cn/img_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=img&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=cc4aba6e967096098249efa069733067`
+          }),
+          name: '卫星影像图'
+        })
+
+        const labelLayer = new ol.layer.Tile({
+          source: new ol.source.XYZ({
+            url: `https://t0.tianditu.gov.cn/DataServer?T=cia_w&x={x}&y={y}&l={z}&tk=cc4aba6e967096098249efa069733067`
+          }),
+          name: '文字标注层'
+        })
+
+        // 3. 创建地图实例
+        this.map = new ol.Map({
+          controls: ol.control.defaults({
+            attribution: false, // 隐藏版权信息
+            zoom: false, // 隐藏缩放按钮
+            rotate: false // 隐藏旋转按钮
+          }),
+          layers: [aerialLayer, labelLayer],
+          projection: projection,
+          target: 'mapWrap',
+          view: new ol.View({
+            center: ol.proj.fromLonLat([config.centerLng, config.centerLat]),
+            zoom: config.zoom,
+            minZoom: config.minZoom,
+            maxZoom: config.maxZoom
+          })
+        })
+
+        // 4. 初始化附属图层
+        this.initVillageBorderLayer(this.targetLand.importCode)
+        this.initOtherLandsLayer(this.otherLands)
+        this.initTargetLandLayer(this.targetLand)
+      },
+
+      /**
+       * 初始化村边界图层
+       * @param {String} importCode - 区域编码（用于筛选边界）
+       */
+      initVillageBorderLayer(importCode) {
+        // 销毁旧图层
+        if (this.villageBorderLayer) {
+          this.map.removeLayer(this.villageBorderLayer)
+        }
+
+        if (!importCode || !this.mapConfig.geoServerUrl) return
+
+        // 创建新的村边界图层（WMS服务）
+        this.villageBorderLayer = new ol.layer.Image({
+          source: new ol.source.ImageWMS({
+            url: `${this.mapConfig.geoServerUrl}/wms`,
+            params: {
+              LAYERS: this.mapConfig.villageBorderLayerName,
+              cql_filter: `import_code = '${importCode}'`,
+              SRID: 3857
+            }
+          }),
+          name: 'villageBorderLayer'
+        })
+
+        this.map.addLayer(this.villageBorderLayer)
+      },
+
+      /**
+       * 初始化其他地块图层（青色显示）
+       * @param {Array} lands - 其他地块数据列表
+       */
+      initOtherLandsLayer(lands) {
+        // 销毁旧图层
+        if (this.otherLandsLayer) {
+          this.map.removeLayer(this.otherLandsLayer)
+        }
+
+        if (!lands.length) return
+
+        // 创建矢量数据源
+        const vectorSource = new ol.source.Vector()
+
+        // 遍历地块数据，添加到数据源
+        lands.forEach(land => {
+          if (land.theGeom && land.fid !== this.targetLand.fid) {
+            const feature = new ol.Feature({
+              geometry: new ol.geom.MultiPolygon(JSON.parse(land.theGeom).coordinates)
+            })
+            vectorSource.addFeature(feature)
+          }
+        })
+
+        // 创建其他地块图层
+        this.otherLandsLayer = new ol.layer.Vector({
+          source: vectorSource,
+          style: this.getOtherLandStyle() // 青色样式
+        })
+
+        this.map.addLayer(this.otherLandsLayer)
+      },
+
+      /**
+       * 初始化目标地块图层（黄色高亮）
+       * @param {Object} land - 目标地块数据
+       */
+      initTargetLandLayer(land) {
+        // 销毁旧图层
+        if (this.targetLandLayer) {
+          this.map.removeLayer(this.targetLandLayer)
+        }
+
+        if (!land.theGeom) return
+
+        // 创建目标地块数据源
+        const vectorSource = new ol.source.Vector({
+          features: new ol.format.GeoJSON().readFeatures({
+            type: 'Feature',
+            geometry: JSON.parse(land.theGeom)
+          })
+        })
+
+        // 创建目标地块图层（黄色高亮）
+        this.targetLandLayer = new ol.layer.Vector({
+          source: vectorSource,
+          style: this.getTargetLandStyle() // 黄色样式
+        })
+
+        this.map.addLayer(this.targetLandLayer)
+
+        // 定位到目标地块
+        this.locateToTargetLand(vectorSource)
+      },
+
+      /**
+       * 定位到目标地块
+       * @param {ol.source.Vector} source - 目标地块数据源
+       */
+      locateToTargetLand(source) {
+        const features = source.getFeatures()
+        if (!features.length) return
+
+        // 获取地块边界范围
+        const extent = source.getExtent()
+        // 地图居中到地块范围
+        this.map.getView().animate({
+          center: ol.extent.getCenter(extent),
+          zoom: this.mapConfig.zoom,
+          duration: 1000
+        })
+      },
+
+      /**
+       * 处理「画图」按钮点击事件
+       */
+      handleDrawPolygon() {
+        // 移除旧的绘制图层和交互
+        this.removeDrawInteraction()
+        if (this.vectorDrawingLayer) {
+          this.map.removeLayer(this.vectorDrawingLayer)
+        }
+
+        // 创建新的绘制数据源和图层
+        const drawSource = new ol.source.Vector({ wrapX: false })
+        this.vectorDrawingLayer = new ol.layer.Vector({ source: drawSource })
+        this.map.addLayer(this.vectorDrawingLayer)
+
+        // 创建绘制交互（多边形）
+        this.draw = new ol.interaction.Draw({
+          source: drawSource,
+          type: 'Polygon'
+        })
+
+        // 绘制结束事件：保存结果并通知父组件
+        this.draw.on('drawend', (evt) => {
+          const geometry = evt.feature.getGeometry()
+          this.drawResult = geometry.getCoordinates()
+          // 通知父组件绘制结果
+          this.$emit('draw-complete', this.drawResult)
+          // 移除绘制交互（防止重复绘制）
+          this.map.removeInteraction(this.draw)
+        })
+
+        this.map.addInteraction(this.draw)
+      },
+
+      /**
+       * 处理「还原」按钮点击事件
+       */
+      handleDrawReset() {
+        // 移除绘制交互和图层
+        this.removeDrawInteraction()
+        if (this.vectorDrawingLayer) {
+          this.map.removeLayer(this.vectorDrawingLayer)
+        }
+
+        // 清空绘制结果并通知父组件
+        this.drawResult = null
+        this.$emit('draw-reset')
+
+        // 重新加载目标地块图层（恢复高亮）
+        this.initTargetLandLayer(this.targetLand)
+      },
+
+      /**
+       * 移除绘制交互
+       */
+      removeDrawInteraction() {
+        if (this.draw && this.map) {
+          this.map.removeInteraction(this.draw)
+          this.draw = null
+        }
+      },
+
+      /**
+       * 获取目标地块样式（黄色高亮）
+       * @returns {ol.style.Style} 样式对象
+       */
+      getTargetLandStyle() {
+        return new ol.style.Style({
+          fill: new ol.style.Fill({ color: 'yellow' }),
+          stroke: new ol.style.Stroke({ color: 'yellow', width: 3 })
+        })
+      },
+
+      /**
+       * 获取其他地块样式（青色半透明）
+       * @returns {ol.style.Style} 样式对象
+       */
+      getOtherLandStyle() {
+        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 })
+        })
+      },
+
+      /**
+       * 销毁地图实例和资源
+       */
+      destroyMap() {
+        if (this.map) {
+          // 移除所有图层
+          const layers = this.map.getLayers().getArray()
+          layers.forEach(layer => this.map.removeLayer(layer))
+          // 移除所有交互
+          const interactions = this.map.getInteractions().getArray()
+          interactions.forEach(interaction => this.map.removeInteraction(interaction))
+          // 清空地图容器
+          document.getElementById('mapWrap').innerHTML = ''
+          this.map = null
+        }
+
+        // 重置状态
+        this.draw = null
+        this.vectorDrawingLayer = null
+        this.targetLandLayer = null
+        this.otherLandsLayer = null
+        this.villageBorderLayer = null
+        this.drawResult = null
+      },
+
+      /**
+       * 对外暴露：清除所有图层（供父组件调用）
+       */
+      clearAllLayers() {
+        this.removeDrawInteraction()
+        if (this.vectorDrawingLayer) this.map.removeLayer(this.vectorDrawingLayer)
+        if (this.targetLandLayer) this.map.removeLayer(this.targetLandLayer)
+        if (this.otherLandsLayer) this.map.removeLayer(this.otherLandsLayer)
+        if (this.villageBorderLayer) this.map.removeLayer(this.villageBorderLayer)
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .map-wrap {
+    width: 100%;
+    height: 100%;
+  }
+
+  .map-btn-wrap {
+    position: relative;
+    width: 40%;
+    left: 60%;
+    bottom: 95%;
+    z-index: 2000;
+  }
+
+  .ant-btn-red {
+    position: relative;
+    display: inline-block;
+    background: #D0EEFF;
+    border: 1px solid #99D3F5;
+    border-radius: 4px;
+    padding: 4px 12px;
+    overflow: hidden;
+    color: #1E88C7;
+    text-decoration: none;
+    text-indent: 0;
+    line-height: 20px;
+    right: -36%;
+  }
+</style>
diff --git a/src/components/house/MapField.vue b/src/components/house/MapField.vue
deleted file mode 100644
index e531168..0000000
--- a/src/components/house/MapField.vue
+++ /dev/null
@@ -1,286 +0,0 @@
-<template>
-  <div>
-    <div :id="'map-element' + elementId" class="map-element" style="width: 100%; height: 100%;"></div>
-    <div :id="'draw-toolbar' + elementId" class='draw-toolbar' v-show="allowDraw">
-      <el-row>
-        <input :id="'drawPolygon' + elementId" class="ant-btn ant-btn-red" type="button" value="画图"/>&nbsp;&nbsp;
-        <input :id="'drawRemove' + elementId" type="button" class="ant-btn ant-btn-red" value="取消画图"/>&nbsp;&nbsp;
-        <input :id="'drawReset' + elementId" type="button" class="ant-btn ant-btn-red" value="重置画图"/>
-      </el-row>
-    </div>
-    <div :id="'mark-toolbar' + elementId" class='draw-toolbar' v-show="allowMark">
-      <el-row>
-        <input :id="'markPoint' + elementId" class="ant-btn ant-btn-red" type="button" value="标记"/>&nbsp;&nbsp;
-        <input :id="'markReset' + elementId" type="button" class="ant-btn ant-btn-red" value="重置标记"/>
-      </el-row>
-    </div>
-  </div>
-</template>
-
-<script>
-  import $ from "jquery";
-  import {olMap} from "@/utils/ol_map";
-
-  const TYPE_NONE = 0; // 无交互 默认
-  const TYPE_DRAW = 1; // 绘制多边形 v-model为MultiPolygon的JSON
-  const TYPE_SELECT = 2; // 选择, 必须指定list属性 v-model为list索引, 未选中为-1
-  const TYPE_MARK = 3; // 标记点 v-model为[经度, 维度]数组
-
-  export default {
-    name: "MapField",
-    props: {
-      minMapZoom: {
-        type: Number,
-        default: 16,
-      },
-      maxMapZoom: {
-        type: Number,
-        default: 18.9,
-      },
-      allowDraw: {
-        type: Boolean,
-        default: false,
-      },
-      type: {
-        type: [Number, String], // 0 原始 1 绘制 2 选择
-        default: 0,
-      },
-      coord: {
-        type: Array,
-        default: function() {
-          return [115.452752, 31.789033];
-        },
-      },
-      value: {
-        type: [String, Array, Number],
-      },
-      list: {
-        type: Array,
-        default: function() {
-          return [];
-        },
-      },
-      allowSelect: {
-        type: Boolean,
-        default: false,
-      },
-      allowMark: {
-        type: Boolean,
-        default: false,
-      },
-    },
-    data() {
-      return {
-        isInited: false,
-        mapObject: null,
-        mapResult: null,
-        elementId: ('_' + Math.random()).replaceAll('.', ''),
-        internalValue: null, // string only
-      };
-    },
-    created() {
-    },
-    mounted() {
-      this.Init();
-      this.SetupCoord();
-      if(this.list)
-        this.mapObject.SetLayers(this.list);
-      if(this.value)
-        this.SetValue(this.value);
-    },
-    watch: {
-      value: function(newVal, oldVal) {
-        this.SetValue(newVal);
-      },
-      coord: {
-        handler: function(newVal, oldVal) {
-          this.SetupCoord();
-        },
-        deep: true,
-      },
-      list: {
-        handler: function(newVal, oldVal) {
-          if(this.type == TYPE_SELECT)
-          {
-            this.mapObject.ClearSelection();
-            this.mapObject.SetLayers(newVal);
-            if(this.internalValue >= 0 && this.internalValue < this.list.length)
-              this.mapObject.SetSelection(this.list[this.internalValue].name);
-          }
-        },
-        deep: true,
-      },
-    },
-    methods: {
-      SetValue(val) {
-        if(this.internalValue === val)
-          return;
-        this.internalValue = val;
-        this.UpdateValueToMap();
-      },
-      UpdateValueToMap() {
-        this.SetupCoord();
-        if(this.type == TYPE_SELECT)
-        {
-          this.mapObject.ClearSelection();
-          if(this.internalValue >= 0 && this.internalValue < this.list.length)
-            this.mapObject.SetSelection(this.list[this.internalValue].name);
-        }
-        else if(this.type == TYPE_MARK)
-        {
-          this.mapObject.RemoveDrawLayer();
-          if(this.internalValue && this.internalValue.length > 0)
-          {
-            let json = olMap.gen_polygon([this.internalValue]);
-            this.mapObject.SetLayer(olMap.MAP_FIELD_INIT_LAYER_NAME, json, null, null, {
-              'style.stroke.width': 10,
-              'style.stroke.color': '#FF0000',
-            });
-          }
-          else
-            this.mapObject.PopLayer(olMap.MAP_FIELD_INIT_LAYER_NAME);
-        }
-        else
-        {
-          this.mapObject.RemoveDrawLayer();
-          this.mapObject.SetLayer(olMap.MAP_FIELD_INIT_LAYER_NAME, this.internalValue);
-        }
-      },
-      Init() {
-        if(this.isInited)
-          return;
-        this.mapObject = new olMap('map-element' + this.elementId);
-        if(this.type == TYPE_DRAW)
-        {
-          this.mapObject.SetAllowDraw(this.allowDraw);
-          let self = this;
-          $("#drawPolygon" + this.elementId).click(function () {
-            self.mapObject.StartDraw();
-          });
-          //清除画图鼠标点击事件
-          $("#drawRemove" + this.elementId).click(function () {
-            self.mapObject.ClearDraw();
-          });
-          //还原之前图层
-          $("#drawReset" + this.elementId).click(function () {
-            self.mapObject.ResetDraw();
-          });
-          this.mapObject.SetCallback("draw::start", () => {
-            this.mapResult = null;
-          });
-          this.mapObject.SetCallback("draw::remove", () => {
-          });
-          this.mapObject.SetCallback("draw::end", (res) => {
-            this.mapResult = res;
-            this.SetInternalValue();
-          });
-          this.mapObject.SetCallback("draw::reset", () => {
-            this.mapResult = null;
-          });
-        }
-        else if(this.type == TYPE_SELECT)
-        {
-          this.mapObject.SetAllowSelect(this.allowSelect);
-          this.mapObject.SetCallback("interactive::select", (name) => {
-            console.log('select -> ' + name);
-            this.mapResult = name;
-            this.SetInternalValue();
-            this.$emit('select', name);
-          });
-        }
-        else if(this.type == TYPE_MARK)
-        {
-          this.mapObject.SetAllowMark(this.allowMark);
-          let self = this;
-          $("#markPoint" + this.elementId).click(function () {
-            self.mapObject.StartMark();
-          });
-          //还原之前图层
-          $("#markReset" + this.elementId).click(function () {
-            self.mapObject.ResetMark();
-          });
-          this.mapObject.SetCallback("mark::start", () => {
-            this.mapResult = null;
-          });
-          this.mapObject.SetCallback("mark::end", (res) => {
-            this.mapResult = res;
-            this.SetInternalValue();
-          });
-          this.mapObject.SetCallback("mark::reset", () => {
-            this.mapResult = null;
-          });
-        }
-        this.isInited = true;
-        if(this.internalValue)
-          this.UpdateValueToMap();
-      },
-      DestroyMap() {
-        if(!this.mapObject)
-          return;
-        //delete this.mapObject;
-        this.mapObject.DestroyMap();
-        this.mapObject = null;
-      },
-      SetInternalValue() {
-        if(this.type == TYPE_SELECT)
-        {
-          this.internalValue = this.mapResult;
-          if(this.mapResult)
-            this.internalValue = this.list.findIndex((x) => x.name == this.mapResult);
-          else
-            this.internalValue = -1;
-          this.$emit('input', this.internalValue);
-        }
-        else if(this.type == TYPE_MARK)
-        {
-          this.internalValue = this.mapResult ? this.mapResult : [null, null];
-          this.$emit('input', this.internalValue);
-        }
-        else
-        {
-          this.internalValue = JSON.stringify(this.mapResult);
-          this.$emit('input', this.internalValue);
-        }
-        //console.log(this.type, this.mapResult, this.internalValue);
-      },
-      Update() {
-        if(this.mapObject)
-          this.mapObject.Update();
-      },
-      SetupCoord() {
-        if(this.mapObject && this.coord && this.coord.length >= 2 && this.coord[0] && this.coord[1])
-          this.mapObject.SetCoord(this.coord[0], this.coord[1]);
-      }
-    },
-  }
-</script>
-
-<style scoped>
-
-  .map-element {
-    width: 100%;
-    height: 100%;
-  }
-
-  .draw-toolbar {
-    position: relative;
-    width: 40%;
-    left: 60%;
-    bottom: 95%;
-    z-index: 2000;
-  }
-
-  .ant-btn-red {
-    position: relative;
-    display: inline-block;
-    background: #D0EEFF;
-    border: 1px solid #99D3F5;
-    border-radius: 4px;
-    padding: 4px 12px;
-    overflow: hidden;
-    color: #1E88C7;
-    text-decoration: none;
-    text-indent: 0;
-    line-height: 20px;
-  }
-</style>
diff --git a/src/views/resource/land/index.vue b/src/views/resource/land/index.vue
index 3cfc725..6449826 100644
--- a/src/views/resource/land/index.vue
+++ b/src/views/resource/land/index.vue
@@ -332,18 +332,19 @@
         <div id="mapWrap"></div>
         <div id='land-btn-wrap'>
           <el-row>
-            <input id="drawPolygon" class="ant-btn ant-btn-red" type="button" value="画图"/>&nbsp;&nbsp;
-            <!-- <input id="drawRemove" type="button" class="ant-btn ant-btn-red" value="取消画图"/>&nbsp;&nbsp; -->
-            <input id="drawReset" type="button" class="ant-btn ant-btn-red" value="还原"/>
+            <input id="drawPolygon" class="ant-btn ant-btn-red" type="button" value="开启画图"/>&nbsp;&nbsp;
+             <!--<input id="drawRemove" type="button" class="ant-btn ant-btn-red" value="关闭画图"/>&nbsp;&nbsp; -->
+            <input id="drawReset" type="button" class="ant-btn ant-btn-red" value="还原图层"/>
           </el-row>
         </div>
       </div>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" v-if="diglogStatus" @click="submitFormMap">确 定</el-button>
+        <el-button type="primary" @click="submitFormMap">确 定</el-button>
         <el-button type="danger" @click="clearMapLayer">清除图层</el-button>
         <el-button @click="cancelMap">关 闭</el-button>
       </div>
     </el-dialog>
+
   </div>
 </template>
 
@@ -357,14 +358,13 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css"
 import "splitpanes/dist/splitpanes.css"
 import { deptTreeSelect } from "@/api/system/user"
 import {getConfigKey} from "@/api/system/config";
-import {getDept,getInfoByImportCode} from "@/api/system/dept";
-import MapField from "@/components/house/MapField";
+import {getDept, getInfoByImportCode} from "@/api/system/dept";
 import $ from "jquery";
 
 export default {
   name: "Land",
   dicts: ['ownership_type', 'land_use_type', 'survey_status', 'is_common', 'land_grade_type', 'land_type', 'land_use'],
-  components: { Treeselect, Splitpanes, Pane,MapField },
+  components: { Treeselect, Splitpanes, Pane },
   data() {
     return {
       // 遮罩层
@@ -407,15 +407,13 @@ export default {
         children: "children",
         label: "label"
       },
-      // 遮罩按钮新增点击状态
-      diglogStatus: true,
-      //地图
+      //地图参数
       openMap: false,
       mapTheGeomId: null,
       mapTheGeom: null,
       drawInsert:null,
-      tGeoOrganizationLng: null,
-      tGeoOrganizationLat: null,
+      jingdu: null,
+      weidu: null,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -447,7 +445,6 @@ export default {
         scmjm: [
           { required: true, message: "实测面积不能为空", trigger: "blur" }
         ],
-
       },
       // EXCEL导入
       upload: {
@@ -464,7 +461,6 @@ export default {
           // 上传的地址
           url: process.env.VUE_APP_BASE_API + "/resource/land/importData"
       },
-
     }
   },
   watch: {
@@ -476,6 +472,7 @@ export default {
   created() {
     this.getDeptTree()
     this.getList()
+
     // 获取geoserver的地址
     this.getGeoServerUrl();
     // 获取地块图层名称
@@ -500,7 +497,7 @@ export default {
       this.open = false
       this.reset()
     },
-    // 取消按钮
+    // 取消地图按钮
     cancelMap() {
       this.openMap = false;
       this.reset();
@@ -535,7 +532,6 @@ export default {
         deptName: null,
         sfzwd: '2'
       }
-      this.diglogStatus = true;
       this.resetForm("form")
     },
     /** 搜索按钮操作 */
@@ -772,8 +768,8 @@ export default {
       getDept(deptId).then(response => {
         let insertCode = response.data;
         if (insertCode != null) {
-          this.tGeoOrganizationLat = insertCode.latitude;
-          this.tGeoOrganizationLng = insertCode.longitude;
+          this.weidu = insertCode.latitude;
+          this.jingdu = insertCode.longitude;
         }
       });
     },
@@ -783,8 +779,8 @@ export default {
       getInfoByImportCode(row.importCode).then((res) => {
         let insertCode = res.data;
         if (insertCode != null) {
-          this.tGeoOrganizationLat = insertCode.latitude;
-          this.tGeoOrganizationLng = insertCode.longitude;
+          this.weidu = insertCode.latitude;
+          this.jingdu = insertCode.longitude;
         }
         const tableRow = { importCode: row.importCode };
         listLandQuery(tableRow).then(response => {
@@ -798,43 +794,40 @@ export default {
     },
     /** 地图提交按钮 */
     submitFormMap() {
-      this.diglogStatus = false;
       if(this.drawInsert !=null && this.drawInsert !=""){
         this.mapTheGeomId.theGeom = JSON.stringify(this.drawInsert);
       }else{
         this.mapTheGeomId.theGeom = this.mapTheGeomId.theGeomText
       }
-      let sysGis = { tableName: 't_resource_land',priId: 'fid',id: this.mapTheGeomId.fid,theGeom: this.mapTheGeomId.theGeom };
+      let sysGis = { tableName: 't_resource_land', priId: 'fid', id: this.mapTheGeomId.fid, theGeom: this.mapTheGeomId.theGeom };
       if (this.mapTheGeomId != null) {
         areaSavePri(sysGis).then(response => {
           this.$modal.msgSuccess("修改成功");
           this.openMap = false;
-          this.getList();
-          this.diglogStatus = true;
+          //this.getList();
         });
       }
     },
     /** 清除坐标点图层 */
     clearMapLayer() {
-      let sysGis = { tableName: 't_resource_land',priId: 'fid',id: this.mapTheGeomId.fid};
+      let sysGis = { tableName: 't_resource_land', priId: 'fid', id: this.mapTheGeomId.fid};
       cleanSavePri(sysGis).then(response => {
         this.$modal.msgSuccess("清除成功");
         this.openMap = false;
-        this.getList();
+        //this.getList();
       });
     },
     pointDarw(resourceList) {
       //加载地图编辑
       var that = this;
       var map;
-      //var hc_land;
-      var draw; // global so we can remove it later
+      var draw;
       var vector_drawing;
       var startDarw =false;
       var openDarw = false;
       this.mapTheGeomId = resourceList.find((land) => {
         //model就是上面的数据源
-        return land.fid === this.mapTheGeomId.fid; //筛选出匹配数据
+        return land.fid === this.mapTheGeomId.fid;
       });
       if (this.mapTheGeomId.theGeom != null && this.mapTheGeomId.theGeom != ""
         && this.mapTheGeomId.theGeom != undefined) {
@@ -844,9 +837,10 @@ export default {
         startDarw = false;
         openDarw = true;
       }
+
       if (startDarw) {
         document.getElementById("mapWrap").innerHTML = '';
-        var hc_land;
+        var thePolygon;
         var draw; // global so we can remove it later
         var vector_drawing;
         var projection = new ol.proj.Projection({
@@ -855,7 +849,6 @@ export default {
           units: "degrees",
           //extent:extent
         });
-
         var aerial = new ol.layer.Tile({
           source: new ol.source.XYZ({
             url: "http://t0.tianditu.gov.cn/img_w/wmts?" +
@@ -865,7 +858,6 @@ export default {
           isGroup: true,
           name: "卫星影像图",
         });
-
         var yingxzi = new ol.layer.Tile({
           source: new ol.source.XYZ({
             url: "https://t0.tianditu.gov.cn/DataServer?T=cia_w&x={x}&y={y}&l={z}&tk=cc4aba6e967096098249efa069733067",
@@ -882,8 +874,8 @@ export default {
           view: new ol.View({
             //center: ol.proj.fromLonLat([115.452752, 31.789033]),
             zoom: 17.8,
-            minZoom: 0, //地图缩小限制
-            maxZoom: 18.3, //地图放大限制
+            minZoom: 0,
+            maxZoom: 18.3,
           }),
         });
         // 添加村边界
@@ -899,7 +891,6 @@ export default {
           name: 'villageBorderLayer'
         });
         map.addLayer(mapBorder);
-
         // 添加已经存在的资源图层
         let vectorSource = new ol.source.Vector();
         for (let resource of resourceList) {
@@ -911,7 +902,6 @@ export default {
             vectorSource.addFeature(feature);
           }
         }
-
         let resourceLayer = new ol.layer.Vector({
           source: vectorSource,
           style:  (feature, resolution) => {
@@ -929,8 +919,8 @@ export default {
           }
         });
         map.addLayer(resourceLayer);
-        //图层查询定位开始 ---------start
-        hc_land = new ol.layer.Vector({
+        //当前图层查询定位
+        thePolygon = new ol.layer.Vector({
           title: "add Layer",
           source: new ol.source.Vector({
             projection: projection,
@@ -950,24 +940,21 @@ export default {
             }),
           }),
         });
-        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;
-        var minYMap = hc_land.values_.source.featuresRtree_.rbush_.data.minY;
-        //定位查询位置
-        var center = ol.extent.getCenter([maxXMap, maxYMap, minXMap, minYMap]); //获取边界区域的中心位置
+        map.addLayer(thePolygon);
+        var maxXMap = thePolygon.values_.source.featuresRtree_.rbush_.data.maxX;
+        var maxYMap = thePolygon.values_.source.featuresRtree_.rbush_.data.maxY;
+        var minXMap = thePolygon.values_.source.featuresRtree_.rbush_.data.minX;
+        var minYMap = thePolygon.values_.source.featuresRtree_.rbush_.data.minY;
+        var center = ol.extent.getCenter([maxXMap, maxYMap, minXMap, minYMap]);
         map.getView().animate({
-          // 只设置需要的属性即可
-          center: center, // 中心点
-          zoom: 17.8, // 缩放级别
-          rotation: undefined, // 缩放完成view视图旋转弧度
-          duration: 1000, // 缩放持续时间，默认不需要设置
+          center: center,
+          zoom: 17.8,
+          rotation: undefined,
+          duration: 1000,
         });
-        //图层查询定位结束 ---------end
         //开始绘制地图
         $("#drawPolygon").off("click").on("click", function () {
-          map.removeLayer(hc_land);
+          map.removeLayer(thePolygon);
           map.removeLayer(vector_drawing);
           that.drawInsert = null;
           //var source = new ol.source.Vector({wrapX: false});
@@ -975,7 +962,6 @@ export default {
             source: new ol.source.Vector(),
           });
           map.addLayer(vector_drawing);
-
           function addInteraction() {
             draw = new ol.interaction.Draw({
               source: vector_drawing.getSource(),
@@ -990,12 +976,11 @@ export default {
             });
             map.addInteraction(draw);
           }
-
           addInteraction();
         });
         //清除画图鼠标点击事件
         $("#drawRemove").off("click").on("click", function () {
-          //map.addLayer(hc_land);
+          //map.addLayer(thePolygon);
           map.removeInteraction(draw);
           //map.removeLayer(vector_drawing);
         });
@@ -1003,10 +988,11 @@ export default {
         $("#drawReset").off("click").on("click", function () {
           map.removeInteraction(draw);
           map.removeLayer(vector_drawing);
-          map.addLayer(hc_land);
+          map.addLayer(thePolygon);
           that.drawInsert = null;
         });
       }
+
       if (openDarw) {
         document.getElementById("mapWrap").innerHTML = '';
         var projection = new ol.proj.Projection({
@@ -1015,7 +1001,6 @@ export default {
           units: "degrees",
           //extent:extent
         });
-
         var aerial = new ol.layer.Tile({
           source: new ol.source.XYZ({
             url: "http://t0.tianditu.gov.cn/img_w/wmts?" +
@@ -1035,9 +1020,8 @@ export default {
         });
         //获取坐标是否存在
         var Zb;
-        if (this.tGeoOrganizationLng != null && this.tGeoOrganizationLat != null && this.tGeoOrganizationLng !=""
-          && this.tGeoOrganizationLat !="" && this.tGeoOrganizationLng !=undefined && this.tGeoOrganizationLat !=undefined) {
-          Zb = [this.tGeoOrganizationLng, this.tGeoOrganizationLat]
+        if (this.jingdu != null && this.jingdu !="") {
+          Zb = [this.jingdu, this.weidu]
         } else {
           Zb = [115.452752, 31.789033];
         }
@@ -1069,7 +1053,6 @@ export default {
           name: 'villageBorderLayer'
         });
         map.addLayer(mapBorder);
-
         // 添加已经存在的资源图层
         let vectorSource = new ol.source.Vector();
         for (let resource of resourceList) {
@@ -1081,7 +1064,6 @@ export default {
             vectorSource.addFeature(feature);
           }
         }
-
         let resourceLayer = new ol.layer.Vector({
           source: vectorSource,
           style:  (feature, resolution) => {
@@ -1100,10 +1082,9 @@ export default {
         });
         map.addLayer(resourceLayer);
 
-        //图层查询定位结束 ---------end
         //开始绘制地图
         $("#drawPolygon").off("click").on("click", function () {
-          //map.removeLayer(hc_land);
+          //map.removeLayer(thePolygon);
           map.removeLayer(vector_drawing);
           that.drawInsert = null;
           map.removeInteraction(draw);
@@ -1130,20 +1111,21 @@ export default {
             });
             map.addInteraction(draw);
           }
-
           addInteraction();
         });
+
         //清除画图鼠标点击事件
         $("#drawRemove").off("click").on("click", function () {
-          //map.addLayer(hc_land);
+          //map.addLayer(thePolygon);
           map.removeInteraction(draw);
           //map.removeLayer(vector_drawing);
         });
+
         //还原之前图层
         $("#drawReset").off("click").on("click", function () {
           map.removeInteraction(draw);
           map.removeLayer(vector_drawing);
-          //map.addLayer(hc_land);
+          //map.addLayer(thePolygon);
           that.drawInsert = null;
         });
       }
@@ -1156,6 +1138,7 @@ export default {
     height: 75vh;
     overflow-y: scroll;
   }
+
   #land-btn-wrap {
     position: relative;
     width: 40%;
@@ -1163,7 +1146,6 @@ export default {
     bottom: 95%;
     z-index: 2000;
   }
-
   #mapWrap {
     width: 100%;
     height: 100%;

From 7320217c636b6572af925f31f0b029c7d851fa1f Mon Sep 17 00:00:00 2001
From: zzl <961867786@qq.com>
Date: Fri, 12 Sep 2025 09:28:53 +0800
Subject: [PATCH 02/11] =?UTF-8?q?=E5=9C=B0=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/gis/MapField.vue | 561 +++++++++++++-------------------
 src/views/app/map-bf.vue        |   4 +-
 src/views/app/map.vue           |   4 +-
 3 files changed, 223 insertions(+), 346 deletions(-)

diff --git a/src/components/gis/MapField.vue b/src/components/gis/MapField.vue
index d187e5f..e531168 100644
--- a/src/components/gis/MapField.vue
+++ b/src/components/gis/MapField.vue
@@ -1,390 +1,268 @@
 <template>
-  <div class="land-map-container">
-    <!-- 地图容器 -->
-    <div id="mapWrap" class="map-wrap"></div>
-    <!-- 地图操作按钮 -->
-    <div id="land-btn-wrap" class="map-btn-wrap">
+  <div>
+    <div :id="'map-element' + elementId" class="map-element" style="width: 100%; height: 100%;"></div>
+    <div :id="'draw-toolbar' + elementId" class='draw-toolbar' v-show="allowDraw">
       <el-row>
-        <input id="drawPolygon" class="ant-btn ant-btn-red" type="button" value="画图" click="handleDrawPolygon"/>&nbsp;&nbsp;
-        <input id="drawReset" type="button" class="ant-btn ant-btn-red" value="还原" @click="handleDrawReset"/>
+        <input :id="'drawPolygon' + elementId" class="ant-btn ant-btn-red" type="button" value="画图"/>&nbsp;&nbsp;
+        <input :id="'drawRemove' + elementId" type="button" class="ant-btn ant-btn-red" value="取消画图"/>&nbsp;&nbsp;
+        <input :id="'drawReset' + elementId" type="button" class="ant-btn ant-btn-red" value="重置画图"/>
+      </el-row>
+    </div>
+    <div :id="'mark-toolbar' + elementId" class='draw-toolbar' v-show="allowMark">
+      <el-row>
+        <input :id="'markPoint' + elementId" class="ant-btn ant-btn-red" type="button" value="标记"/>&nbsp;&nbsp;
+        <input :id="'markReset' + elementId" type="button" class="ant-btn ant-btn-red" value="重置标记"/>
       </el-row>
     </div>
   </div>
 </template>
 
 <script>
-  import ol from 'ol' // 确保项目已引入OpenLayers
-  import $ from 'jquery'
+  import $ from "jquery";
+  import {olMap} from "@/utils/ol_map";
+
+  const TYPE_NONE = 0; // 无交互 默认
+  const TYPE_DRAW = 1; // 绘制多边形 v-model为MultiPolygon的JSON
+  const TYPE_SELECT = 2; // 选择, 必须指定list属性 v-model为list索引, 未选中为-1
+  const TYPE_MARK = 3; // 标记点 v-model为[经度, 维度]数组
 
   export default {
-    name: 'LandMapComponent',
+    name: "MapField",
     props: {
-      // 地图配置参数
-      mapConfig: {
-        type: Object,
-        required: true,
-        default: () => ({
-          geoServerUrl: '', // GeoServer地址
-          landLayerName: '', // 地块图层名
-          villageBorderLayerName: '', // 村边界图层名
-          centerLng: 115.452752, // 默认中心点经度
-          centerLat: 31.789033, // 默认中心点纬度
-          zoom: 17.8, // 默认缩放级别
-          maxZoom: 18.3, // 最大缩放级别
-          minZoom: 0 // 最小缩放级别
-        })
+      minMapZoom: {
+        type: Number,
+        default: 16,
+      },
+      maxMapZoom: {
+        type: Number,
+        default: 18.9,
       },
-      // 目标地块数据（用于定位和高亮）
-      targetLand: {
-        type: Object,
-        default: () => ({
-          fid: '',
-          theGeom: '', // 地块几何信息
-          importCode: '' // 用于筛选村边界的编码
-        })
+      allowDraw: {
+        type: Boolean,
+        default: false,
       },
-      // 其他地块数据（用于加载已有地块图层）
-      otherLands: {
+      type: {
+        type: [Number, String], // 0 原始 1 绘制 2 选择
+        default: 0,
+      },
+      coord: {
         type: Array,
-        default: () => []
-      }
+        default: function() {
+          return [115.452752, 31.789033];
+        },
+      },
+      value: {
+        type: [String, Array, Number],
+      },
+      list: {
+        type: Array,
+        default: function() {
+          return [];
+        },
+      },
+      allowSelect: {
+        type: Boolean,
+        default: false,
+      },
+      allowMark: {
+        type: Boolean,
+        default: false,
+      },
     },
     data() {
       return {
-        map: null, // 地图实例
-        draw: null, // 绘制实例
-        vectorDrawingLayer: null, // 绘制图层
-        targetLandLayer: null, // 目标地块高亮图层
-        otherLandsLayer: null, // 其他地块图层
-        villageBorderLayer: null, // 村边界图层
-        drawResult: null // 绘制结果（几何坐标）
-      }
+        isInited: false,
+        mapObject: null,
+        mapResult: null,
+        elementId: ('_' + Math.random()).replaceAll('.', ''),
+        internalValue: null, // string only
+      };
+    },
+    created() {
+    },
+    mounted() {
+      this.Init();
+      this.SetupCoord();
+      if(this.list)
+        this.mapObject.SetLayers(this.list);
+      if(this.value)
+        this.SetValue(this.value);
     },
     watch: {
-      // 监听地块数据变化，重新加载图层
-      targetLand: {
-        deep: true,
-        handler(newVal) {
-          this.initTargetLandLayer(newVal)
-          this.initVillageBorderLayer(newVal.importCode)
-        }
+      value: function(newVal, oldVal) {
+        this.SetValue(newVal);
       },
-      otherLands: {
+      coord: {
+        handler: function(newVal, oldVal) {
+          this.SetupCoord();
+        },
         deep: true,
-        handler(newVal) {
-          this.initOtherLandsLayer(newVal)
-        }
       },
-      // 监听地图配置变化，重新初始化地图
-      mapConfig: {
+      list: {
+        handler: function(newVal, oldVal) {
+          if(this.type == TYPE_SELECT)
+          {
+            this.mapObject.ClearSelection();
+            this.mapObject.SetLayers(newVal);
+            if(this.internalValue >= 0 && this.internalValue < this.list.length)
+              this.mapObject.SetSelection(this.list[this.internalValue].name);
+          }
+        },
         deep: true,
-        handler(newVal) {
-          this.destroyMap() // 销毁旧地图
-          this.initMap(newVal) // 初始化新地图
-        }
-      }
-    },
-    mounted() {
-      // 组件挂载后初始化地图
-      this.initMap(this.mapConfig)
-    },
-    beforeUnmount() {
-      // 组件卸载前销毁地图资源
-      this.destroyMap()
+      },
     },
     methods: {
-      /**
-       * 初始化地图核心实例
-       * @param {Object} config - 地图配置
-       */
-      initMap(config) {
-        // 1. 定义投影（EPSG:3857）
-        const projection = new ol.proj.Projection({
-          code: 'EPSG:3857',
-          units: 'degrees'
-        })
-
-        // 2. 加载底图（天地图卫星影像+标注）
-        const aerialLayer = new ol.layer.Tile({
-          source: new ol.source.XYZ({
-            url: `http://t0.tianditu.gov.cn/img_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=img&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=cc4aba6e967096098249efa069733067`
-          }),
-          name: '卫星影像图'
-        })
-
-        const labelLayer = new ol.layer.Tile({
-          source: new ol.source.XYZ({
-            url: `https://t0.tianditu.gov.cn/DataServer?T=cia_w&x={x}&y={y}&l={z}&tk=cc4aba6e967096098249efa069733067`
-          }),
-          name: '文字标注层'
-        })
-
-        // 3. 创建地图实例
-        this.map = new ol.Map({
-          controls: ol.control.defaults({
-            attribution: false, // 隐藏版权信息
-            zoom: false, // 隐藏缩放按钮
-            rotate: false // 隐藏旋转按钮
-          }),
-          layers: [aerialLayer, labelLayer],
-          projection: projection,
-          target: 'mapWrap',
-          view: new ol.View({
-            center: ol.proj.fromLonLat([config.centerLng, config.centerLat]),
-            zoom: config.zoom,
-            minZoom: config.minZoom,
-            maxZoom: config.maxZoom
-          })
-        })
-
-        // 4. 初始化附属图层
-        this.initVillageBorderLayer(this.targetLand.importCode)
-        this.initOtherLandsLayer(this.otherLands)
-        this.initTargetLandLayer(this.targetLand)
+      SetValue(val) {
+        if(this.internalValue === val)
+          return;
+        this.internalValue = val;
+        this.UpdateValueToMap();
       },
-
-      /**
-       * 初始化村边界图层
-       * @param {String} importCode - 区域编码（用于筛选边界）
-       */
-      initVillageBorderLayer(importCode) {
-        // 销毁旧图层
-        if (this.villageBorderLayer) {
-          this.map.removeLayer(this.villageBorderLayer)
-        }
-
-        if (!importCode || !this.mapConfig.geoServerUrl) return
-
-        // 创建新的村边界图层（WMS服务）
-        this.villageBorderLayer = new ol.layer.Image({
-          source: new ol.source.ImageWMS({
-            url: `${this.mapConfig.geoServerUrl}/wms`,
-            params: {
-              LAYERS: this.mapConfig.villageBorderLayerName,
-              cql_filter: `import_code = '${importCode}'`,
-              SRID: 3857
-            }
-          }),
-          name: 'villageBorderLayer'
-        })
-
-        this.map.addLayer(this.villageBorderLayer)
-      },
-
-      /**
-       * 初始化其他地块图层（青色显示）
-       * @param {Array} lands - 其他地块数据列表
-       */
-      initOtherLandsLayer(lands) {
-        // 销毁旧图层
-        if (this.otherLandsLayer) {
-          this.map.removeLayer(this.otherLandsLayer)
+      UpdateValueToMap() {
+        this.SetupCoord();
+        if(this.type == TYPE_SELECT)
+        {
+          this.mapObject.ClearSelection();
+          if(this.internalValue >= 0 && this.internalValue < this.list.length)
+            this.mapObject.SetSelection(this.list[this.internalValue].name);
         }
-
-        if (!lands.length) return
-
-        // 创建矢量数据源
-        const vectorSource = new ol.source.Vector()
-
-        // 遍历地块数据，添加到数据源
-        lands.forEach(land => {
-          if (land.theGeom && land.fid !== this.targetLand.fid) {
-            const feature = new ol.Feature({
-              geometry: new ol.geom.MultiPolygon(JSON.parse(land.theGeom).coordinates)
-            })
-            vectorSource.addFeature(feature)
+        else if(this.type == TYPE_MARK)
+        {
+          this.mapObject.RemoveDrawLayer();
+          if(this.internalValue && this.internalValue.length > 0)
+          {
+            let json = olMap.gen_polygon([this.internalValue]);
+            this.mapObject.SetLayer(olMap.MAP_FIELD_INIT_LAYER_NAME, json, null, null, {
+              'style.stroke.width': 10,
+              'style.stroke.color': '#FF0000',
+            });
           }
-        })
-
-        // 创建其他地块图层
-        this.otherLandsLayer = new ol.layer.Vector({
-          source: vectorSource,
-          style: this.getOtherLandStyle() // 青色样式
-        })
-
-        this.map.addLayer(this.otherLandsLayer)
-      },
-
-      /**
-       * 初始化目标地块图层（黄色高亮）
-       * @param {Object} land - 目标地块数据
-       */
-      initTargetLandLayer(land) {
-        // 销毁旧图层
-        if (this.targetLandLayer) {
-          this.map.removeLayer(this.targetLandLayer)
+          else
+            this.mapObject.PopLayer(olMap.MAP_FIELD_INIT_LAYER_NAME);
         }
-
-        if (!land.theGeom) return
-
-        // 创建目标地块数据源
-        const vectorSource = new ol.source.Vector({
-          features: new ol.format.GeoJSON().readFeatures({
-            type: 'Feature',
-            geometry: JSON.parse(land.theGeom)
-          })
-        })
-
-        // 创建目标地块图层（黄色高亮）
-        this.targetLandLayer = new ol.layer.Vector({
-          source: vectorSource,
-          style: this.getTargetLandStyle() // 黄色样式
-        })
-
-        this.map.addLayer(this.targetLandLayer)
-
-        // 定位到目标地块
-        this.locateToTargetLand(vectorSource)
-      },
-
-      /**
-       * 定位到目标地块
-       * @param {ol.source.Vector} source - 目标地块数据源
-       */
-      locateToTargetLand(source) {
-        const features = source.getFeatures()
-        if (!features.length) return
-
-        // 获取地块边界范围
-        const extent = source.getExtent()
-        // 地图居中到地块范围
-        this.map.getView().animate({
-          center: ol.extent.getCenter(extent),
-          zoom: this.mapConfig.zoom,
-          duration: 1000
-        })
-      },
-
-      /**
-       * 处理「画图」按钮点击事件
-       */
-      handleDrawPolygon() {
-        // 移除旧的绘制图层和交互
-        this.removeDrawInteraction()
-        if (this.vectorDrawingLayer) {
-          this.map.removeLayer(this.vectorDrawingLayer)
+        else
+        {
+          this.mapObject.RemoveDrawLayer();
+          this.mapObject.SetLayer(olMap.MAP_FIELD_INIT_LAYER_NAME, this.internalValue);
         }
-
-        // 创建新的绘制数据源和图层
-        const drawSource = new ol.source.Vector({ wrapX: false })
-        this.vectorDrawingLayer = new ol.layer.Vector({ source: drawSource })
-        this.map.addLayer(this.vectorDrawingLayer)
-
-        // 创建绘制交互（多边形）
-        this.draw = new ol.interaction.Draw({
-          source: drawSource,
-          type: 'Polygon'
-        })
-
-        // 绘制结束事件：保存结果并通知父组件
-        this.draw.on('drawend', (evt) => {
-          const geometry = evt.feature.getGeometry()
-          this.drawResult = geometry.getCoordinates()
-          // 通知父组件绘制结果
-          this.$emit('draw-complete', this.drawResult)
-          // 移除绘制交互（防止重复绘制）
-          this.map.removeInteraction(this.draw)
-        })
-
-        this.map.addInteraction(this.draw)
       },
-
-      /**
-       * 处理「还原」按钮点击事件
-       */
-      handleDrawReset() {
-        // 移除绘制交互和图层
-        this.removeDrawInteraction()
-        if (this.vectorDrawingLayer) {
-          this.map.removeLayer(this.vectorDrawingLayer)
+      Init() {
+        if(this.isInited)
+          return;
+        this.mapObject = new olMap('map-element' + this.elementId);
+        if(this.type == TYPE_DRAW)
+        {
+          this.mapObject.SetAllowDraw(this.allowDraw);
+          let self = this;
+          $("#drawPolygon" + this.elementId).click(function () {
+            self.mapObject.StartDraw();
+          });
+          //清除画图鼠标点击事件
+          $("#drawRemove" + this.elementId).click(function () {
+            self.mapObject.ClearDraw();
+          });
+          //还原之前图层
+          $("#drawReset" + this.elementId).click(function () {
+            self.mapObject.ResetDraw();
+          });
+          this.mapObject.SetCallback("draw::start", () => {
+            this.mapResult = null;
+          });
+          this.mapObject.SetCallback("draw::remove", () => {
+          });
+          this.mapObject.SetCallback("draw::end", (res) => {
+            this.mapResult = res;
+            this.SetInternalValue();
+          });
+          this.mapObject.SetCallback("draw::reset", () => {
+            this.mapResult = null;
+          });
         }
-
-        // 清空绘制结果并通知父组件
-        this.drawResult = null
-        this.$emit('draw-reset')
-
-        // 重新加载目标地块图层（恢复高亮）
-        this.initTargetLandLayer(this.targetLand)
-      },
-
-      /**
-       * 移除绘制交互
-       */
-      removeDrawInteraction() {
-        if (this.draw && this.map) {
-          this.map.removeInteraction(this.draw)
-          this.draw = null
+        else if(this.type == TYPE_SELECT)
+        {
+          this.mapObject.SetAllowSelect(this.allowSelect);
+          this.mapObject.SetCallback("interactive::select", (name) => {
+            console.log('select -> ' + name);
+            this.mapResult = name;
+            this.SetInternalValue();
+            this.$emit('select', name);
+          });
+        }
+        else if(this.type == TYPE_MARK)
+        {
+          this.mapObject.SetAllowMark(this.allowMark);
+          let self = this;
+          $("#markPoint" + this.elementId).click(function () {
+            self.mapObject.StartMark();
+          });
+          //还原之前图层
+          $("#markReset" + this.elementId).click(function () {
+            self.mapObject.ResetMark();
+          });
+          this.mapObject.SetCallback("mark::start", () => {
+            this.mapResult = null;
+          });
+          this.mapObject.SetCallback("mark::end", (res) => {
+            this.mapResult = res;
+            this.SetInternalValue();
+          });
+          this.mapObject.SetCallback("mark::reset", () => {
+            this.mapResult = null;
+          });
         }
+        this.isInited = true;
+        if(this.internalValue)
+          this.UpdateValueToMap();
       },
-
-      /**
-       * 获取目标地块样式（黄色高亮）
-       * @returns {ol.style.Style} 样式对象
-       */
-      getTargetLandStyle() {
-        return new ol.style.Style({
-          fill: new ol.style.Fill({ color: 'yellow' }),
-          stroke: new ol.style.Stroke({ color: 'yellow', width: 3 })
-        })
+      DestroyMap() {
+        if(!this.mapObject)
+          return;
+        //delete this.mapObject;
+        this.mapObject.DestroyMap();
+        this.mapObject = null;
       },
-
-      /**
-       * 获取其他地块样式（青色半透明）
-       * @returns {ol.style.Style} 样式对象
-       */
-      getOtherLandStyle() {
-        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 })
-        })
-      },
-
-      /**
-       * 销毁地图实例和资源
-       */
-      destroyMap() {
-        if (this.map) {
-          // 移除所有图层
-          const layers = this.map.getLayers().getArray()
-          layers.forEach(layer => this.map.removeLayer(layer))
-          // 移除所有交互
-          const interactions = this.map.getInteractions().getArray()
-          interactions.forEach(interaction => this.map.removeInteraction(interaction))
-          // 清空地图容器
-          document.getElementById('mapWrap').innerHTML = ''
-          this.map = null
+      SetInternalValue() {
+        if(this.type == TYPE_SELECT)
+        {
+          this.internalValue = this.mapResult;
+          if(this.mapResult)
+            this.internalValue = this.list.findIndex((x) => x.name == this.mapResult);
+          else
+            this.internalValue = -1;
+          this.$emit('input', this.internalValue);
         }
-
-        // 重置状态
-        this.draw = null
-        this.vectorDrawingLayer = null
-        this.targetLandLayer = null
-        this.otherLandsLayer = null
-        this.villageBorderLayer = null
-        this.drawResult = null
+        else if(this.type == TYPE_MARK)
+        {
+          this.internalValue = this.mapResult ? this.mapResult : [null, null];
+          this.$emit('input', this.internalValue);
+        }
+        else
+        {
+          this.internalValue = JSON.stringify(this.mapResult);
+          this.$emit('input', this.internalValue);
+        }
+        //console.log(this.type, this.mapResult, this.internalValue);
       },
-
-      /**
-       * 对外暴露：清除所有图层（供父组件调用）
-       */
-      clearAllLayers() {
-        this.removeDrawInteraction()
-        if (this.vectorDrawingLayer) this.map.removeLayer(this.vectorDrawingLayer)
-        if (this.targetLandLayer) this.map.removeLayer(this.targetLandLayer)
-        if (this.otherLandsLayer) this.map.removeLayer(this.otherLandsLayer)
-        if (this.villageBorderLayer) this.map.removeLayer(this.villageBorderLayer)
+      Update() {
+        if(this.mapObject)
+          this.mapObject.Update();
+      },
+      SetupCoord() {
+        if(this.mapObject && this.coord && this.coord.length >= 2 && this.coord[0] && this.coord[1])
+          this.mapObject.SetCoord(this.coord[0], this.coord[1]);
       }
-    }
+    },
   }
 </script>
 
 <style scoped>
-  .map-wrap {
+
+  .map-element {
     width: 100%;
     height: 100%;
   }
 
-  .map-btn-wrap {
+  .draw-toolbar {
     position: relative;
     width: 40%;
     left: 60%;
@@ -404,6 +282,5 @@
     text-decoration: none;
     text-indent: 0;
     line-height: 20px;
-    right: -36%;
   }
 </style>
diff --git a/src/views/app/map-bf.vue b/src/views/app/map-bf.vue
index 83c8796..89c62f9 100644
--- a/src/views/app/map-bf.vue
+++ b/src/views/app/map-bf.vue
@@ -183,13 +183,13 @@
   import { deptTreeSelect } from "@/api/system/user"
   import {getConfigKey} from "@/api/system/config";
   import {getDept,getInfoByImportCode} from "@/api/system/dept";
-  import MapField from "@/components/house/MapField";
+
   import $ from "jquery";
 
 
   export default {
     name: "contractedVillageContractor",
-    components: { Treeselect, Splitpanes, Pane,MapField },
+    components: { Treeselect, Splitpanes, Pane },
     data() {
       return {
         form: {},
diff --git a/src/views/app/map.vue b/src/views/app/map.vue
index 7acc35d..d9b1e2b 100644
--- a/src/views/app/map.vue
+++ b/src/views/app/map.vue
@@ -180,13 +180,13 @@
   import { deptTreeSelect } from "@/api/system/user"
   import {getConfigKey} from "@/api/system/config";
   import {getDept,getInfoByImportCode} from "@/api/system/dept";
-  import MapField from "@/components/house/MapField";
+
   import $ from "jquery";
 
 
   export default {
     name: "contractedVillageContractor",
-    components: { Treeselect, Splitpanes, Pane,MapField },
+    components: { Treeselect, Splitpanes, Pane },
     data() {
       return {
         fform: {},                         // 地块信息表单参数

From 2a11548883348edc5dbfc3f394604dbf99ef2ee4 Mon Sep 17 00:00:00 2001
From: zzl <961867786@qq.com>
Date: Fri, 12 Sep 2025 10:31:47 +0800
Subject: [PATCH 03/11] =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/resource/land/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/resource/land/index.vue b/src/views/resource/land/index.vue
index 6449826..a984ce2 100644
--- a/src/views/resource/land/index.vue
+++ b/src/views/resource/land/index.vue
@@ -226,7 +226,7 @@
           <el-descriptions-item label="实物图">
             <div v-if="!!form.dkImg">
               <el-tooltip effect="light" :content="item" placement="bottom" v-for="(item, index) in form.dkImg.split(',')" :key="index">
-                <el-image style="height: 64px; width: 64px; margin: 2px; display: inline-block;" fit="scale-down" :src="this.baseRoutingUrll + item" :preview-src-list="form.dkImg.split(',').map((x) => this.baseRoutingUrll + x)"/>
+                <el-image style="height: 64px; width: 64px; margin: 2px; display: inline-block;" fit="scale-down" :src="baseRoutingUrll + item" :preview-src-list="form.dkImg.split(',').map((x) => baseRoutingUrll + x)"/>
               </el-tooltip>
             </div>
           </el-descriptions-item>

From 5439f63f89e65df1a09048698618c8c8a2c5e2fe Mon Sep 17 00:00:00 2001
From: zzl <961867786@qq.com>
Date: Fri, 12 Sep 2025 10:41:11 +0800
Subject: [PATCH 04/11] =?UTF-8?q?=E5=9C=B0=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/app/index.vue | 2 +-
 src/views/app/login.vue | 2 +-
 src/views/login.vue     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/app/index.vue b/src/views/app/index.vue
index 5da14b6..fa1b53c 100644
--- a/src/views/app/index.vue
+++ b/src/views/app/index.vue
@@ -14,7 +14,7 @@
 
       <img src="../../assets/images/app/banner.png" width="100%" style="margin: 2vh 0;" alt="">
 
-      <van-notice-bar scrollable text="技术是开发它的人的共同灵魂。"  color="#000000" >
+      <van-notice-bar scrollable text="让资源调查更简单、快捷！"  color="#000000" >
           <p slot="left-icon" class="notice_tt">通知</p>
       </van-notice-bar>
 
diff --git a/src/views/app/login.vue b/src/views/app/login.vue
index e1b640b..e183f59 100644
--- a/src/views/app/login.vue
+++ b/src/views/app/login.vue
@@ -55,7 +55,7 @@
         </van-form>
       </div>
 
-      <p class="copy">中农融信北京科技股份有限公司</p>
+      <p class="copy">>{{this.$store.getters.technicalSupport == "" ? "中农融信（北京）科技股份有限公司" : this.$store.getters.technicalSupport}}</p>
     </div>
 </template>
 
diff --git a/src/views/login.vue b/src/views/login.vue
index 27e0f07..57b6585 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -191,7 +191,7 @@ export default {
   bottom: 0;
   width: 100%;
   text-align: center;
-  color: #fff;
+  color: #000000;
   font-family: Arial;
   font-size: 12px;
   letter-spacing: 1px;

From e787c8b77a850644fd56a9aa9ee1747b0e79c488 Mon Sep 17 00:00:00 2001
From: zzl <961867786@qq.com>
Date: Fri, 12 Sep 2025 10:51:07 +0800
Subject: [PATCH 05/11] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/app/login.vue | 2 +-
 src/views/app/user.vue  | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/views/app/login.vue b/src/views/app/login.vue
index e183f59..8adeec9 100644
--- a/src/views/app/login.vue
+++ b/src/views/app/login.vue
@@ -55,7 +55,7 @@
         </van-form>
       </div>
 
-      <p class="copy">>{{this.$store.getters.technicalSupport == "" ? "中农融信（北京）科技股份有限公司" : this.$store.getters.technicalSupport}}</p>
+      <p class="copy">{{this.$store.getters.technicalSupport == "" ? "中农融信（北京）科技股份有限公司" : this.$store.getters.technicalSupport}}</p>
     </div>
 </template>
 
diff --git a/src/views/app/user.vue b/src/views/app/user.vue
index 208f60d..8588fe1 100644
--- a/src/views/app/user.vue
+++ b/src/views/app/user.vue
@@ -24,7 +24,7 @@
             <img src="../../assets/images/app/user_icon_02.png" width="25" alt="">
           </template>
         </van-cell>
-        <van-cell title="退出登录" is-link center :border="false">
+        <van-cell title="退出登录" is-link center :border="false" @click = "logOut">
           <template slot="icon">
             <img src="../../assets/images/app/user_icon_03.png" width="25" alt="">
           </template>
@@ -49,7 +49,12 @@
     methods: {
       goBack(){
         history.go(-1)
-      }
+      },
+      logOut() {
+        this.$store.dispatch('LogOut').then(() => {
+          location.href = '/app/index'
+        })
+      },
     },
   };
 </script>

From ce3ba3ef8bd3640ca9b71d265fe57c507303a0b7 Mon Sep 17 00:00:00 2001
From: zzl <961867786@qq.com>
Date: Fri, 12 Sep 2025 11:02:28 +0800
Subject: [PATCH 06/11] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/app/index.vue |  7 ++++---
 src/views/app/list.vue  |  3 ++-
 src/views/app/user.vue  | 10 ++++++----
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/views/app/index.vue b/src/views/app/index.vue
index fa1b53c..ec9f6ba 100644
--- a/src/views/app/index.vue
+++ b/src/views/app/index.vue
@@ -5,8 +5,8 @@
         <div class="left">
           <div class="avatar"><img src="../../assets/images/app/user_header.png" alt=""></div>
           <div class="info">
-            <p>张晋升</p>
-            <p>常家围子村委会</p>
+            <p>{{ nickName }}</p>
+            <p>{{ deptName }}</p>
           </div>
         </div>
         <van-icon name="setting" size="25" @click="$router.push({ path: '/app/user' })" />
@@ -43,7 +43,8 @@
     },
     created() {
       this.getMenuApp();
-      console.log(this.$store.getters)
+      this.nickName = this.$store.getters.user.user.nickName;
+      this.deptName = this.$store.getters.user.user.dept.deptName;
     },
     methods: {
       getMenuApp(){
diff --git a/src/views/app/list.vue b/src/views/app/list.vue
index 4ca28e4..de4321a 100644
--- a/src/views/app/list.vue
+++ b/src/views/app/list.vue
@@ -96,7 +96,8 @@
       };
     },
     created() {
-      console.log(this.dict.type.survey_status)
+      //console.log(this.dict.type.survey_status)
+      this.queryParams.importCode = this.$store.getters.user.user.dept.importCode;
     },
     methods: {
       onClickLeft(){
diff --git a/src/views/app/user.vue b/src/views/app/user.vue
index 8588fe1..9dd9e02 100644
--- a/src/views/app/user.vue
+++ b/src/views/app/user.vue
@@ -7,8 +7,8 @@
         <div class="left">
           <div class="avatar"><img src="../../assets/images/app/user_header.png" alt=""></div>
           <div class="info">
-            <p>张晋升</p>
-            <p>常家围子村委会</p>
+            <p>{{ nickName }}</p>
+            <p>{{ deptName }}</p>
           </div>
         </div>
       </div>
@@ -40,11 +40,13 @@
     name: "appUser",
     data() {
       return {
-
+        nickName: null,
+        deptName: null
       };
     },
     created() {
-
+      this.nickName = this.$store.getters.user.user.nickName;
+      this.deptName = this.$store.getters.user.user.dept.deptName;
     },
     methods: {
       goBack(){

From a548027d63d60cf15bc49bfea72f9ffbe275fa19 Mon Sep 17 00:00:00 2001
From: zzl <961867786@qq.com>
Date: Fri, 12 Sep 2025 11:14:44 +0800
Subject: [PATCH 07/11] =?UTF-8?q?=E5=9C=B0=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/app/list.vue | 30 +++---------------------------
 1 file changed, 3 insertions(+), 27 deletions(-)

diff --git a/src/views/app/list.vue b/src/views/app/list.vue
index de4321a..2ec67cc 100644
--- a/src/views/app/list.vue
+++ b/src/views/app/list.vue
@@ -1,12 +1,6 @@
 <template>
     <div class="home_wrapper">
-    <van-nav-bar
-      title="土地列表管理"
-      left-arrow
-      placeholder
-      safe-area-inset-top
-      @click-left="onClickLeft"
-    />
+    <van-nav-bar title="土地列表管理" left-arrow placeholder safe-area-inset-top @click-left="onClickLeft"/>
 
       <div class="search_box">
         <div class="left">
@@ -17,23 +11,11 @@
       </div>
 
       <van-popup v-model="showPicker" round position="bottom">
-        <van-picker
-          show-toolbar
-          :columns="dict.type.survey_status"
-          value-key="label"
-          @cancel="showPicker = false"
-          @confirm="onConfirm"
-        />
+        <van-picker show-toolbar :columns="dict.type.survey_status" value-key="label" @cancel="showPicker = false" @confirm="onConfirm"/>
       </van-popup>
 
       <div class="list_main">
-        <van-list
-          v-model="loading"
-          :finished="finished"
-          finished-text="没有更多了"
-          @load="getList"
-        >
-          <!--1-->
+        <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="getList">
           <van-swipe-cell right-width="200" class="item" v-for="(item,index) in landList" :key="index">
             <div class="item_box" @click="$router.push({name:'appDetail',query:{dkbm:item.dkbm}})">
               <div class="head_block">
@@ -51,7 +33,6 @@
               <div style="background-color: #ee0a24;height: 100%" @click="handleDelete(item)">删除</div>
             </template>
           </van-swipe-cell>
-
         </van-list>
       </div>
 
@@ -59,7 +40,6 @@
 </template>
 
 <script>
-  // import { getMenuApp } from "@/api/app/index";
   import { Dialog } from 'vant';
   import { listLand, delLand } from "@/api/resource/land"
   export default {
@@ -96,7 +76,6 @@
       };
     },
     created() {
-      //console.log(this.dict.type.survey_status)
       this.queryParams.importCode = this.$store.getters.user.user.dept.importCode;
     },
     methods: {
@@ -119,7 +98,6 @@
         })
       },
       onConfirm(value) {
-        console.log(value)
         this.surveyStatus = value.label;
         this.queryParams.surveyStatus = value.value;
         this.showPicker = false;
@@ -141,7 +119,6 @@
       /** 删除按钮操作 */
       handleDelete(row) {
         const fids = row.fid || this.ids
-
         Dialog.confirm({
           title: '提示',
           message: '是否确认删除地块属性编号为"' + fids + '"的数据项？',
@@ -156,7 +133,6 @@
           .catch(() => {
             // on cancel
           });
-
       }
     },
   };

From 09a708996a2e49b8f927d8be17c7647c411bf277 Mon Sep 17 00:00:00 2001
From: Zhao <beyondk2000@gmail.com>
Date: Fri, 12 Sep 2025 11:31:10 +0800
Subject: [PATCH 08/11] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/business/import.js          | 26 +++++++++
 src/utils/index.js                  | 28 +++++++++
 src/views/business/import/index.vue | 88 +++++++++++++++++++++++++++--
 3 files changed, 137 insertions(+), 5 deletions(-)

diff --git a/src/api/business/import.js b/src/api/business/import.js
index 3124286..399d9e4 100644
--- a/src/api/business/import.js
+++ b/src/api/business/import.js
@@ -60,3 +60,29 @@ export function printImport(query) {
     params: query
   })
 }
+
+// 开始导入任务
+export function startImport(id) {
+  return request({
+    url: '/business/import/start/' + id,
+    method: 'post',
+  })
+}
+
+// 导入任务日志
+export function importLog(id, offset) {
+  return request({
+    url: '/business/import/log/' + id,
+    method: 'get',
+    params: {offset}
+  })
+}
+
+// 下载导入任务日志
+export function downloadLog(id) {
+  return request({
+    url: '/business/import/downloadLog/' + id,
+    method: 'get',
+    responseType: 'blob',
+  })
+}
diff --git a/src/utils/index.js b/src/utils/index.js
index 9375db7..8dd6b7d 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -388,3 +388,31 @@ export function isNumberStr(str) {
   return /^[+-]?(0|([1-9]\d*))(\.\d+)?$/g.test(str)
 }
 
+export function save(name, src) {
+  let a = 0;
+  let url = null;
+  try
+  {
+    url = window.URL.createObjectURL(new Blob([src]))
+    a = document.createElement('a');
+    document.body.append(a);
+    a.style.display = 'none'
+    a.href = url;
+    a.setAttribute('download', name)
+    a.click();
+    return true;
+  }
+  catch(e)
+  {
+    console.error(e);
+    return false;
+  }
+  finally
+  {
+    if(a)
+      a.remove();
+    if(url)
+      window.URL.revokeObjectURL(url);
+  }
+}
+
diff --git a/src/views/business/import/index.vue b/src/views/business/import/index.vue
index 342eef4..2b4244d 100644
--- a/src/views/business/import/index.vue
+++ b/src/views/business/import/index.vue
@@ -105,7 +105,8 @@
                 <template slot-scope="scope">
                   <el-button size="mini" type="text" icon="el-icon-view" @click="handleLook(scope.row)" v-hasPermi="['business:import:query']">查看</el-button>
                   <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['business:import:edit']">修改</el-button>
-                  <el-button size="mini" type="text" icon="el-icon-video-play" @click="handleDo(scope.row)" v-hasPermi="['business:import:do']" v-if="scope.row.taskStatus == '1'">执行</el-button>
+                  <el-button size="mini" type="text" icon="el-icon-video-play" @click="handleDo(scope.row)" v-hasPermi="['business:import:do']" v-if="scope.row.taskStatus == '0'">执行</el-button>
+                  <el-button size="mini" type="text" icon="el-icon-tickets" @click="openLog(scope.row)" v-hasPermi="['business:import:do']">日志</el-button>
 
                   <el-dropdown size="mini" v-hasPermi="['business:import:remove']">
                     <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
@@ -134,7 +135,7 @@
                   <div class="el-upload__tip" slot="tip">
                       <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的导入任务
                   </div>
-                  <p style="color: red">1、仅允许导入xls、xlsx格式文件；</p>
+                  <p style="color: red">1、仅允许导入zip格式文件；</p>
                   <p style="color: red">2、覆盖导入：指先将所选区划当前在库数据删除，然后按新数据包解析导入；</p>
                   <p style="color: red">3、增量导入：指按新数据包解析并追加导入；</p>
                   <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline" @click="importTemplate">下载模板</el-link>
@@ -201,17 +202,37 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+    <el-dialog title="任务日志" :visible.sync="log.logOpen" width="800px" append-to-body>
+      <div v-html="log.logText">
+      </div>
+      <!-- 弹框操作按钮 -->
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="downloadLog">下 载</el-button>
+        <el-button @click="closeLog">关 闭</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { listImport, getImport, getImportDetail, delImport, addImport, updateImport, printImport } from "@/api/business/import"
+import {
+  listImport,
+  getImport,
+  getImportDetail,
+  delImport,
+  addImport,
+  updateImport,
+  printImport,
+  startImport, importLog, downloadLog
+} from "@/api/business/import"
 import { getToken } from "@/utils/auth"
 import Treeselect from "@riophae/vue-treeselect";
 import {Pane, Splitpanes} from "splitpanes";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css"
 import "splitpanes/dist/splitpanes.css"
 import { deptTreeSelect } from "@/api/system/user"
+import {save} from "@/utils";
 
 export default {
   name: "Import",
@@ -315,7 +336,11 @@ export default {
           // 上传的地址
           url: process.env.VUE_APP_BASE_API + "/business/import/importData"
       },
-
+      log: {
+        taskId: null,
+        logOpen: false,
+        logText: '',
+      },
     }
   },
   watch: {
@@ -586,7 +611,60 @@ export default {
       this.selectDeptName = data.label
       this.handleQuery()
     },
-
+    /** 开始 */
+    handleDo(row) {
+      const ids = row.id || this.ids
+      this.$modal.confirm('是否确认开始编号为"' + ids + '"的导入任务？').then(function() {
+        return startImport(ids)
+      }).then((resp) => {
+        this.getList()
+        this.$modal.msgSuccess(resp.data == 2 ? '正在执行' : '已加入队列, 等待执行')
+      }).catch(() => {})
+    },
+    /** 日志 */
+    handleLog(row, offset = 0) {
+      if(!this.log.logOpen)
+        return;
+      importLog(row.id, offset).then(({data}) => {
+          if(null == data.text)
+          {
+              this.log.logText = '';
+              return;
+          }
+        this.log.logText += data.text
+        .replaceAll('<', '&lt;')
+        .replaceAll('>', '&gt;')
+        .replaceAll('\r\n', '<br/>')
+        .replaceAll('\r', '<br/>')
+        .replaceAll('\n', '<br/>')
+        ;
+        if(!data.eof && this.log.logOpen && (data.taskStatus === '1' || data.taskStatus === '2'))
+        {
+          setTimeout(() => {
+            this.handleLog(row, data.length);
+          }, data.nextPollDelay > 0 ? data.nextPollDelay : 2000);
+        }
+      });
+    },
+    /** 日志 */
+    downloadLog() {
+      if(!this.log.taskId)
+          return;
+      downloadLog(this.log.taskId).then((resp) => {
+        save(`导入任务_${this.log.taskId}.log`, resp);
+      });
+    },
+    openLog(row) {
+      this.log.logText = '';
+      this.log.logOpen = true;
+      this.log.taskId = row.id;
+      this.handleLog(row);
+    },
+    closeLog() {
+      this.log.logOpen = false;
+      this.log.taskId = null;
+      this.log.logText = '';
+    },
   }
 }
 </script>

From c2bd9d14151e5e306707050fc1adb5fd873fce34 Mon Sep 17 00:00:00 2001
From: yangfuda <945208611@qq.com>
Date: Fri, 12 Sep 2025 13:50:01 +0800
Subject: [PATCH 09/11] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/big/resource.js  |  9 ++++++++
 src/api/resource/land.js |  2 +-
 src/views/index.vue      | 46 ++++++++++++++++++++++++++++------------
 3 files changed, 42 insertions(+), 15 deletions(-)
 create mode 100644 src/api/big/resource.js

diff --git a/src/api/big/resource.js b/src/api/big/resource.js
new file mode 100644
index 0000000..f8899db
--- /dev/null
+++ b/src/api/big/resource.js
@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+
+export function homepageStatistics(query) {
+  return request({
+    url: '/big/resource/homepageStatistics',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file
diff --git a/src/api/resource/land.js b/src/api/resource/land.js
index 8cd5a69..25b3c2e 100644
--- a/src/api/resource/land.js
+++ b/src/api/resource/land.js
@@ -75,4 +75,4 @@ export function printLand(query) {
     method: 'get',
     params: query
   })
-}
+}
\ No newline at end of file
diff --git a/src/views/index.vue b/src/views/index.vue
index d7d8be7..c73c522 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -11,44 +11,44 @@
       <div class="info-cards">
         <div class="info-card">
           <h3>地块总数</h3>
-          <p class="number">12,345</p>
+          <p class="number"><countTo v-if="homepageStatistics" :startVal="0" :endVal="Number(homepageStatistics.dataNum1)" :duration="2000"></countTo> 块</p>
         </div>
         <div class="info-card">
           <h3>承包总金额</h3>
-          <p class="number">¥ 456,789</p>
+          <p class="number">¥ <countTo v-if="homepageStatistics" :startVal="0" :endVal="Number(homepageStatistics.dataNum6)" :duration="2000"></countTo></p>
         </div>
       </div>
 
       <div class="info-cards">
         <div class="info-card">
           <h3>待调查总数</h3>
-          <p class="number">8,642</p>
+          <p class="number"><countTo v-if="homepageStatistics" :startVal="0" :endVal="Number(homepageStatistics.dataNum2)" :duration="2000"></countTo> 块</p>
         </div>
         <div class="info-card">
           <h3>兑现总金额</h3>
-          <p class="number">8,642</p>
+          <p class="number">¥ <countTo v-if="homepageStatistics" :startVal="0" :endVal="Number(homepageStatistics.dataNum7)" :duration="2000"></countTo></p>
         </div>
       </div>
 
       <div class="info-cards">
         <div class="info-card">
           <h3>已调查总数</h3>
-          <p class="number">¥ 456,789</p>
+          <p class="number"><countTo v-if="homepageStatistics" :startVal="0" :endVal="Number(homepageStatistics.dataNum3)" :duration="2000"></countTo> 块</p>
         </div>
         <div class="info-card">
           <h3>尚欠总金额</h3>
-          <p class="number">¥ 456,789</p>
+          <p class="number">¥ <countTo v-if="homepageStatistics" :startVal="0" :endVal="Number(homepageStatistics.dataNum8)" :duration="2000"></countTo></p>
         </div>
       </div>
 
       <div class="info-cards">
         <div class="info-card">
           <h3>地块总面积</h3>
-          <p class="number">8,642</p>
+          <p class="number"><countTo v-if="homepageStatistics" :startVal="0" :endVal="Number(homepageStatistics.dataNum4)" :duration="2000"></countTo> 亩</p>
         </div>
         <div class="info-card">
           <h3>经营总面积</h3>
-          <p class="number">¥ 456,789</p>
+          <p class="number"><countTo v-if="homepageStatistics" :startVal="0" :endVal="Number(homepageStatistics.dataNum9)" :duration="2000"></countTo> 亩</p>
         </div>
 
       </div>
@@ -56,11 +56,11 @@
       <div class="info-cards">
         <div class="info-card">
           <h3>机动地总面积</h3>
-          <p class="number">¥ 456,789</p>
+          <p class="number"><countTo v-if="homepageStatistics" :startVal="0" :endVal="Number(homepageStatistics.dataNum5)" :duration="2000"></countTo> 亩</p>
         </div>
         <div class="info-card">
           <h3>年总收益</h3>
-          <p class="number">8,642</p>
+          <p class="number">¥ <countTo v-if="homepageStatistics" :startVal="0" :endVal="Number(homepageStatistics.dataNum10)" :duration="2000"></countTo></p>
         </div>
       </div>
     </div>
@@ -69,14 +69,32 @@
 
 <script>
   import * as echarts from 'echarts';
+  import { homepageStatistics } from "@/api/big/resource"
+  import countTo from "vue-count-to";
 
   export default {
     name: 'Dashboard',
+    data() {
+        return {
+          homepageStatistics:null,
+          progressResourceInvestigationList:[],
+        }
+    },
+    components: { countTo},
     mounted() {
+      this.progressResourceInvestigation();
       this.initLineChart();
-
     },
     methods: {
+      progressResourceInvestigation(){
+        homepageStatistics().then((res) => {
+          if (res.code == 200) {
+            this.homepageStatistics = res.data.homepageStatistics;
+            this.progressResourceInvestigationList = res.data.progressResourceInvestigation;
+            this.initLineChart();
+          }
+        });
+      },
       initLineChart() {
         const chart = echarts.init(this.$refs.lineChart);
         const option = {
@@ -95,7 +113,7 @@
           xAxis: {
             type: 'category',
             boundaryGap: false,
-            data: ['A市', 'B市', 'C市', 'D市', 'E市', 'F市', 'G市']
+            data: this.progressResourceInvestigationList.map(item => item.deptName)
           },
           yAxis: {
             type: 'value'
@@ -104,7 +122,7 @@
             {
               name: '已调查',
               type: 'line',
-              data: [220, 182, 191, 234, 290, 330, 310],
+              data: this.progressResourceInvestigationList.map(item => item.dataNum1),
               smooth: true,
               lineStyle: {
                 width: 3,
@@ -117,7 +135,7 @@
             {
               name: '待调查',
               type: 'line',
-              data: [150, 232, 201, 154, 190, 330, 410],
+              data: this.progressResourceInvestigationList.map(item => item.dataNum2),
               smooth: true,
               lineStyle: {
                 width: 3,

From 48d94ef430cb831568f69428434d43e9188922ea Mon Sep 17 00:00:00 2001
From: zzl <961867786@qq.com>
Date: Fri, 12 Sep 2025 14:12:59 +0800
Subject: [PATCH 10/11] =?UTF-8?q?=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/index.vue | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/views/index.vue b/src/views/index.vue
index c73c522..9fbf71d 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -11,7 +11,7 @@
       <div class="info-cards">
         <div class="info-card">
           <h3>地块总数</h3>
-          <p class="number"><countTo v-if="homepageStatistics" :startVal="0" :endVal="Number(homepageStatistics.dataNum1)" :duration="2000"></countTo> 块</p>
+          <p class="number"><countTo v-if="homepageStatistics" :startVal="0" :endVal="Number(homepageStatistics.dataNum1)" :duration="2000"></countTo> 宗</p>
         </div>
         <div class="info-card">
           <h3>承包总金额</h3>
@@ -22,7 +22,7 @@
       <div class="info-cards">
         <div class="info-card">
           <h3>待调查总数</h3>
-          <p class="number"><countTo v-if="homepageStatistics" :startVal="0" :endVal="Number(homepageStatistics.dataNum2)" :duration="2000"></countTo> 块</p>
+          <p class="number"><countTo v-if="homepageStatistics" :startVal="0" :endVal="Number(homepageStatistics.dataNum2)" :duration="2000"></countTo> 宗</p>
         </div>
         <div class="info-card">
           <h3>兑现总金额</h3>
@@ -33,7 +33,7 @@
       <div class="info-cards">
         <div class="info-card">
           <h3>已调查总数</h3>
-          <p class="number"><countTo v-if="homepageStatistics" :startVal="0" :endVal="Number(homepageStatistics.dataNum3)" :duration="2000"></countTo> 块</p>
+          <p class="number"><countTo v-if="homepageStatistics" :startVal="0" :endVal="Number(homepageStatistics.dataNum3)" :duration="2000"></countTo> 宗</p>
         </div>
         <div class="info-card">
           <h3>尚欠总金额</h3>
@@ -47,10 +47,9 @@
           <p class="number"><countTo v-if="homepageStatistics" :startVal="0" :endVal="Number(homepageStatistics.dataNum4)" :duration="2000"></countTo> 亩</p>
         </div>
         <div class="info-card">
-          <h3>经营总面积</h3>
-          <p class="number"><countTo v-if="homepageStatistics" :startVal="0" :endVal="Number(homepageStatistics.dataNum9)" :duration="2000"></countTo> 亩</p>
+          <h3>年总收益</h3>
+          <p class="number">¥ <countTo v-if="homepageStatistics" :startVal="0" :endVal="Number(homepageStatistics.dataNum10)" :duration="2000"></countTo></p>
         </div>
-
       </div>
 
       <div class="info-cards">
@@ -59,10 +58,11 @@
           <p class="number"><countTo v-if="homepageStatistics" :startVal="0" :endVal="Number(homepageStatistics.dataNum5)" :duration="2000"></countTo> 亩</p>
         </div>
         <div class="info-card">
-          <h3>年总收益</h3>
-          <p class="number">¥ <countTo v-if="homepageStatistics" :startVal="0" :endVal="Number(homepageStatistics.dataNum10)" :duration="2000"></countTo></p>
+          <h3>经营总面积</h3>
+          <p class="number"><countTo v-if="homepageStatistics" :startVal="0" :endVal="Number(homepageStatistics.dataNum9)" :duration="2000"></countTo> 亩</p>
         </div>
       </div>
+
     </div>
   </div>
 </template>

From 0a79719eaffd6b63bca813f9bbee85ab5f3da1da Mon Sep 17 00:00:00 2001
From: zzl <961867786@qq.com>
Date: Fri, 12 Sep 2025 14:29:32 +0800
Subject: [PATCH 11/11] =?UTF-8?q?=E5=9C=B0=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/app/list.vue            | 4 ++--
 src/views/app/operate_edit.vue    | 4 ++--
 src/views/resource/land/index.vue | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/app/list.vue b/src/views/app/list.vue
index 2ec67cc..808d8fb 100644
--- a/src/views/app/list.vue
+++ b/src/views/app/list.vue
@@ -5,7 +5,7 @@
       <div class="search_box">
         <div class="left">
           <p @click="showPicker = true">{{surveyStatus}}<van-icon name="play" /></p>
-          <van-field v-model="value" @input="searchChange" @clear="searchClear" clearable left-icon="search" placeholder="请输入地块名称" />
+          <van-field v-model="value" @input="searchChange" @clear="searchClear" clearable left-icon="search" placeholder="地块编码" />
         </div>
         <van-button type="primary" round @click="goSearch" >搜索</van-button>
       </div>
@@ -103,7 +103,7 @@
         this.showPicker = false;
       },
       searchChange(value) {
-        this.queryParams.dkmc = value;
+        this.queryParams.dkbm = value;
       },
       goSearch(){
         this.queryParams.pageNum = 1;
diff --git a/src/views/app/operate_edit.vue b/src/views/app/operate_edit.vue
index 539ce80..fee7aeb 100644
--- a/src/views/app/operate_edit.vue
+++ b/src/views/app/operate_edit.vue
@@ -171,9 +171,9 @@
               this.form = response.data
             })
           }
-          getInfoByImportCode(response.data.importCode).then((res) => {
+          /*getInfoByImportCode(response.data.importCode).then((res) => {
             this.form.deptId = res.data.deptId
-          });
+          });*/
         });
       },
       onConfirmJydxlx(value) {
diff --git a/src/views/resource/land/index.vue b/src/views/resource/land/index.vue
index a984ce2..395bbd3 100644
--- a/src/views/resource/land/index.vue
+++ b/src/views/resource/land/index.vue
@@ -514,7 +514,7 @@ export default {
         dkmc: null,
         syqxz: '30',
         dklb: '22',
-        tdlylx: '011',
+        tdlylx: '01',
         dldj: '01',
         tdyt: '1',
         sfjbnt: '1',