diff --git a/src/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue
index 931a024..cf0d03d 100644
--- a/src/components/CaseCommon/caseDetail.vue
+++ b/src/components/CaseCommon/caseDetail.vue
@@ -365,15 +365,13 @@
 import { getCaseDetail, getUserList, getDeptList, getCaseTypeList, getCaseTypeDetailList, getCaseTypeTimes } from '@/api/coorBusiness/case'
 import { getCommonLanguage, getFilingTypeList, getCaseLevelList, getEorc } from '@/api/coorBusiness/dict'
 import { historicalRecords, nextNodes, completeCaseTask } from '@/api/coorBusiness/process'
-import TianDiTuMapRead from '@/components/Map/tiandiMapRead'
-import ArcGisMapRead from '@/components/Map/arcgisMapRead'
 import LeafletMapRead from '@/components/Map/leafletMapRead'
 import { radioMap } from './radioMap'
 import CaseFile from '@/components/caseCommon/caseFile'
 
 export default {
   name: 'CaseDetail',
-  components: { TianDiTuMapRead, ArcGisMapRead, CaseFile, LeafletMapRead },
+  components: { CaseFile, LeafletMapRead },
   data() {
     const validateEmptyString = (rule, value, callback) => {
       if (!value.trim()) {

diff --git a/src/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue
index 931a024..cf0d03d 100644
--- a/src/components/CaseCommon/caseDetail.vue
+++ b/src/components/CaseCommon/caseDetail.vue
@@ -365,15 +365,13 @@
 import { getCaseDetail, getUserList, getDeptList, getCaseTypeList, getCaseTypeDetailList, getCaseTypeTimes } from '@/api/coorBusiness/case'
 import { getCommonLanguage, getFilingTypeList, getCaseLevelList, getEorc } from '@/api/coorBusiness/dict'
 import { historicalRecords, nextNodes, completeCaseTask } from '@/api/coorBusiness/process'
-import TianDiTuMapRead from '@/components/Map/tiandiMapRead'
-import ArcGisMapRead from '@/components/Map/arcgisMapRead'
 import LeafletMapRead from '@/components/Map/leafletMapRead'
 import { radioMap } from './radioMap'
 import CaseFile from '@/components/caseCommon/caseFile'
 
 export default {
   name: 'CaseDetail',
-  components: { TianDiTuMapRead, ArcGisMapRead, CaseFile, LeafletMapRead },
+  components: { CaseFile, LeafletMapRead },
   data() {
     const validateEmptyString = (rule, value, callback) => {
       if (!value.trim()) {
diff --git a/src/components/CaseCommon/caseDetailRead.vue b/src/components/CaseCommon/caseDetailRead.vue
index f8440a7..587e8df 100644
--- a/src/components/CaseCommon/caseDetailRead.vue
+++ b/src/components/CaseCommon/caseDetailRead.vue
@@ -163,7 +163,6 @@
       :append-to-body="true"
       title="位置详情"
     >
-      <!--<arc-gis-map :longitude="caseDetail.lng" :latitude="caseDetail.lat"/>-->
       <leaflet-map-read :longitude="caseDetail.lng" :latitude="caseDetail.lat"/>
     </el-dialog>
   </app-container>
@@ -172,12 +171,11 @@
 <script>
 import 'element-ui/lib/theme-chalk/index.css'
 import { getCaseDetail } from '@/api/coorBusiness/case'
-import ArcGisMapRead from '@/components/Map/arcgisMapRead'
 import LeafletMapRead from '@/components/Map/leafletMapRead'
 
 export default {
   name: 'CaseDetail',
-  components: { ArcGisMapRead, LeafletMapRead },
+  components: { LeafletMapRead },
   props: {
     id: {
       type: String,

diff --git a/src/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue
index 931a024..cf0d03d 100644
--- a/src/components/CaseCommon/caseDetail.vue
+++ b/src/components/CaseCommon/caseDetail.vue
@@ -365,15 +365,13 @@
 import { getCaseDetail, getUserList, getDeptList, getCaseTypeList, getCaseTypeDetailList, getCaseTypeTimes } from '@/api/coorBusiness/case'
 import { getCommonLanguage, getFilingTypeList, getCaseLevelList, getEorc } from '@/api/coorBusiness/dict'
 import { historicalRecords, nextNodes, completeCaseTask } from '@/api/coorBusiness/process'
-import TianDiTuMapRead from '@/components/Map/tiandiMapRead'
-import ArcGisMapRead from '@/components/Map/arcgisMapRead'
 import LeafletMapRead from '@/components/Map/leafletMapRead'
 import { radioMap } from './radioMap'
 import CaseFile from '@/components/caseCommon/caseFile'
 
 export default {
   name: 'CaseDetail',
-  components: { TianDiTuMapRead, ArcGisMapRead, CaseFile, LeafletMapRead },
+  components: { CaseFile, LeafletMapRead },
   data() {
     const validateEmptyString = (rule, value, callback) => {
       if (!value.trim()) {
diff --git a/src/components/CaseCommon/caseDetailRead.vue b/src/components/CaseCommon/caseDetailRead.vue
index f8440a7..587e8df 100644
--- a/src/components/CaseCommon/caseDetailRead.vue
+++ b/src/components/CaseCommon/caseDetailRead.vue
@@ -163,7 +163,6 @@
       :append-to-body="true"
       title="位置详情"
     >
-      <!--<arc-gis-map :longitude="caseDetail.lng" :latitude="caseDetail.lat"/>-->
       <leaflet-map-read :longitude="caseDetail.lng" :latitude="caseDetail.lat"/>
     </el-dialog>
   </app-container>
@@ -172,12 +171,11 @@
 <script>
 import 'element-ui/lib/theme-chalk/index.css'
 import { getCaseDetail } from '@/api/coorBusiness/case'
-import ArcGisMapRead from '@/components/Map/arcgisMapRead'
 import LeafletMapRead from '@/components/Map/leafletMapRead'
 
 export default {
   name: 'CaseDetail',
-  components: { ArcGisMapRead, LeafletMapRead },
+  components: { LeafletMapRead },
   props: {
     id: {
       type: String,
diff --git a/src/components/Map/leafletMap.vue b/src/components/Map/leafletMap.vue
index e1150e9..3217e42 100644
--- a/src/components/Map/leafletMap.vue
+++ b/src/components/Map/leafletMap.vue
@@ -122,7 +122,7 @@
 
       const that = this
       map.on('click', function(e) {
-        that.clearPoints()
+        that.clearMarkers() // 清除定位点，不清除查询出来的兴趣点
 
         // 加载定位点
         if (that.showEventPointPopup) {
@@ -238,6 +238,11 @@
         url: `${this.baseUrl}${this.partsAllUrl}`,
         minZoom: 19
       })
+
+      // 加载网格图层，用于选择网格
+      this.layers.grid = esri.featureLayer({
+        url: `${this.baseUrl}${this.gridUrl}`
+      })
     },
     switchEventOrComponent: function() {
       // 如果选中的是事件定位（1）或部件定位（0），点击地图时弹出事件或者部件的popup；否则（2以上）显示兴趣点结果的属性popup
@@ -254,11 +259,18 @@
       }
     },
     clearPoints() {
+      this.clearMarkers()
+      this.clearPois()
+    },
+    clearPois: function() {
       const that = this
-      this.markers.forEach(marker => {
+      this.pois.forEach(marker => {
         that.map.removeLayer(marker)
       })
-      this.pois.forEach(marker => {
+    },
+    clearMarkers: function() {
+      const that = this
+      this.markers.forEach(marker => {
         that.map.removeLayer(marker)
       })
     },
@@ -270,13 +282,17 @@
       }).then(response => {
         if (response.code === 200) {
           console.log(response)
-          this.clearMap()
+          this.clearPois() // 清除查询的兴趣点结果，不清除地图选点
           const data = response.data
           if (data.total === 0) {
             this.$message.warning('未找到 "' + that.keywords + '" 的兴趣点，请重新查询')
           } else if (data.total > that.limit) {
             this.$message.warning('"' + that.keywords + '" 的兴趣点结果过多，请重新查询')
           } else {
+            let minLng = data.rows[0].pointX
+            let minLat = data.rows[0].pointY
+            let maxLng = data.rows[0].pointX
+            let maxLat = data.rows[0].pointY
             data.rows.forEach(item => {
               const popupStr = '<div class="popup-div">' +
                 '<div class="popup-title">兴趣点</div>' +
@@ -288,7 +304,20 @@
               poi.bindPopup(popupStr).openPopup()
               that.pois.push(poi)
               that.map.addLayer(poi)
+
+              // 查找左上角和右下角的坐标
+              if (minLng > item.pointX) minLng = item.pointX
+              if (minLat > item.pointY) minLat = item.pointY
+              if (maxLng < item.pointX) maxLng = item.pointX
+              if (maxLat < item.pointY) maxLat = item.pointY
             })
+
+            const topLeft = L.latLng(maxLat, minLng) // 左上角经纬度
+            const bottomRight = L.latLng(minLat, maxLng) // 右下角经纬度
+            const bounds = L.latLngBounds(topLeft, bottomRight)
+
+            // 定位到矩形
+            that.map.fitBounds(bounds)
           }
         }
       })
@@ -303,7 +332,7 @@
         this.form.communityName,
         this.form.gridId)
 
-      this.clearMap()
+      this.clearPoints()
     },
     // 返回部件定位的结果
     checkComponentPoint: function() {
@@ -316,7 +345,7 @@
         this.form.gridId,
         this.form.componentId)
 
-      this.clearMap()
+      this.clearPoints()
     },
     clearMap() {
       this.clearPoints()

diff --git a/src/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue
index 931a024..cf0d03d 100644
--- a/src/components/CaseCommon/caseDetail.vue
+++ b/src/components/CaseCommon/caseDetail.vue
@@ -365,15 +365,13 @@
 import { getCaseDetail, getUserList, getDeptList, getCaseTypeList, getCaseTypeDetailList, getCaseTypeTimes } from '@/api/coorBusiness/case'
 import { getCommonLanguage, getFilingTypeList, getCaseLevelList, getEorc } from '@/api/coorBusiness/dict'
 import { historicalRecords, nextNodes, completeCaseTask } from '@/api/coorBusiness/process'
-import TianDiTuMapRead from '@/components/Map/tiandiMapRead'
-import ArcGisMapRead from '@/components/Map/arcgisMapRead'
 import LeafletMapRead from '@/components/Map/leafletMapRead'
 import { radioMap } from './radioMap'
 import CaseFile from '@/components/caseCommon/caseFile'
 
 export default {
   name: 'CaseDetail',
-  components: { TianDiTuMapRead, ArcGisMapRead, CaseFile, LeafletMapRead },
+  components: { CaseFile, LeafletMapRead },
   data() {
     const validateEmptyString = (rule, value, callback) => {
       if (!value.trim()) {
diff --git a/src/components/CaseCommon/caseDetailRead.vue b/src/components/CaseCommon/caseDetailRead.vue
index f8440a7..587e8df 100644
--- a/src/components/CaseCommon/caseDetailRead.vue
+++ b/src/components/CaseCommon/caseDetailRead.vue
@@ -163,7 +163,6 @@
       :append-to-body="true"
       title="位置详情"
     >
-      <!--<arc-gis-map :longitude="caseDetail.lng" :latitude="caseDetail.lat"/>-->
       <leaflet-map-read :longitude="caseDetail.lng" :latitude="caseDetail.lat"/>
     </el-dialog>
   </app-container>
@@ -172,12 +171,11 @@
 <script>
 import 'element-ui/lib/theme-chalk/index.css'
 import { getCaseDetail } from '@/api/coorBusiness/case'
-import ArcGisMapRead from '@/components/Map/arcgisMapRead'
 import LeafletMapRead from '@/components/Map/leafletMapRead'
 
 export default {
   name: 'CaseDetail',
-  components: { ArcGisMapRead, LeafletMapRead },
+  components: { LeafletMapRead },
   props: {
     id: {
       type: String,
diff --git a/src/components/Map/leafletMap.vue b/src/components/Map/leafletMap.vue
index e1150e9..3217e42 100644
--- a/src/components/Map/leafletMap.vue
+++ b/src/components/Map/leafletMap.vue
@@ -122,7 +122,7 @@
 
       const that = this
       map.on('click', function(e) {
-        that.clearPoints()
+        that.clearMarkers() // 清除定位点，不清除查询出来的兴趣点
 
         // 加载定位点
         if (that.showEventPointPopup) {
@@ -238,6 +238,11 @@
         url: `${this.baseUrl}${this.partsAllUrl}`,
         minZoom: 19
       })
+
+      // 加载网格图层，用于选择网格
+      this.layers.grid = esri.featureLayer({
+        url: `${this.baseUrl}${this.gridUrl}`
+      })
     },
     switchEventOrComponent: function() {
       // 如果选中的是事件定位（1）或部件定位（0），点击地图时弹出事件或者部件的popup；否则（2以上）显示兴趣点结果的属性popup
@@ -254,11 +259,18 @@
       }
     },
     clearPoints() {
+      this.clearMarkers()
+      this.clearPois()
+    },
+    clearPois: function() {
       const that = this
-      this.markers.forEach(marker => {
+      this.pois.forEach(marker => {
         that.map.removeLayer(marker)
       })
-      this.pois.forEach(marker => {
+    },
+    clearMarkers: function() {
+      const that = this
+      this.markers.forEach(marker => {
         that.map.removeLayer(marker)
       })
     },
@@ -270,13 +282,17 @@
       }).then(response => {
         if (response.code === 200) {
           console.log(response)
-          this.clearMap()
+          this.clearPois() // 清除查询的兴趣点结果，不清除地图选点
           const data = response.data
           if (data.total === 0) {
             this.$message.warning('未找到 "' + that.keywords + '" 的兴趣点，请重新查询')
           } else if (data.total > that.limit) {
             this.$message.warning('"' + that.keywords + '" 的兴趣点结果过多，请重新查询')
           } else {
+            let minLng = data.rows[0].pointX
+            let minLat = data.rows[0].pointY
+            let maxLng = data.rows[0].pointX
+            let maxLat = data.rows[0].pointY
             data.rows.forEach(item => {
               const popupStr = '<div class="popup-div">' +
                 '<div class="popup-title">兴趣点</div>' +
@@ -288,7 +304,20 @@
               poi.bindPopup(popupStr).openPopup()
               that.pois.push(poi)
               that.map.addLayer(poi)
+
+              // 查找左上角和右下角的坐标
+              if (minLng > item.pointX) minLng = item.pointX
+              if (minLat > item.pointY) minLat = item.pointY
+              if (maxLng < item.pointX) maxLng = item.pointX
+              if (maxLat < item.pointY) maxLat = item.pointY
             })
+
+            const topLeft = L.latLng(maxLat, minLng) // 左上角经纬度
+            const bottomRight = L.latLng(minLat, maxLng) // 右下角经纬度
+            const bounds = L.latLngBounds(topLeft, bottomRight)
+
+            // 定位到矩形
+            that.map.fitBounds(bounds)
           }
         }
       })
@@ -303,7 +332,7 @@
         this.form.communityName,
         this.form.gridId)
 
-      this.clearMap()
+      this.clearPoints()
     },
     // 返回部件定位的结果
     checkComponentPoint: function() {
@@ -316,7 +345,7 @@
         this.form.gridId,
         this.form.componentId)
 
-      this.clearMap()
+      this.clearPoints()
     },
     clearMap() {
       this.clearPoints()
diff --git a/src/views/callCase/callCase.vue b/src/views/callCase/callCase.vue
index 6f471f5..cfd9d6a 100644
--- a/src/views/callCase/callCase.vue
+++ b/src/views/callCase/callCase.vue
@@ -256,8 +256,6 @@
 import { getCaseSource, getCaseLevel, getCaseEorC, getCaseType, getCaseDetailType, getCaseTypesTime, getVerifyPerson, addCase } from '@/api/callCase/callCase'
 import { getDeptList } from '@/api/coorBusiness/case'
 import { Uploadimg } from '@/api/common'
-import TianDiTuMap from '@/components/Map/tiandiMap'
-import ArcgisMapComp from '@/components/Map/arcGISMap'
 import LeafletMap from '@/components/Map/leafletMap'
 import VideoUpload from './components/videoUpload'
 import AudioUpload from './components/audioUpload'
@@ -265,8 +263,6 @@
 export default {
   name: 'CallCase',
   components: {// 注册组件
-    TianDiTuMap: TianDiTuMap,
-    ArcgisMapComp: ArcgisMapComp,
     VideoUpload: VideoUpload,
     AudioUpload: AudioUpload,
     LeafletMap: LeafletMap

diff --git a/src/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue
index 931a024..cf0d03d 100644
--- a/src/components/CaseCommon/caseDetail.vue
+++ b/src/components/CaseCommon/caseDetail.vue
@@ -365,15 +365,13 @@
 import { getCaseDetail, getUserList, getDeptList, getCaseTypeList, getCaseTypeDetailList, getCaseTypeTimes } from '@/api/coorBusiness/case'
 import { getCommonLanguage, getFilingTypeList, getCaseLevelList, getEorc } from '@/api/coorBusiness/dict'
 import { historicalRecords, nextNodes, completeCaseTask } from '@/api/coorBusiness/process'
-import TianDiTuMapRead from '@/components/Map/tiandiMapRead'
-import ArcGisMapRead from '@/components/Map/arcgisMapRead'
 import LeafletMapRead from '@/components/Map/leafletMapRead'
 import { radioMap } from './radioMap'
 import CaseFile from '@/components/caseCommon/caseFile'
 
 export default {
   name: 'CaseDetail',
-  components: { TianDiTuMapRead, ArcGisMapRead, CaseFile, LeafletMapRead },
+  components: { CaseFile, LeafletMapRead },
   data() {
     const validateEmptyString = (rule, value, callback) => {
       if (!value.trim()) {
diff --git a/src/components/CaseCommon/caseDetailRead.vue b/src/components/CaseCommon/caseDetailRead.vue
index f8440a7..587e8df 100644
--- a/src/components/CaseCommon/caseDetailRead.vue
+++ b/src/components/CaseCommon/caseDetailRead.vue
@@ -163,7 +163,6 @@
       :append-to-body="true"
       title="位置详情"
     >
-      <!--<arc-gis-map :longitude="caseDetail.lng" :latitude="caseDetail.lat"/>-->
       <leaflet-map-read :longitude="caseDetail.lng" :latitude="caseDetail.lat"/>
     </el-dialog>
   </app-container>
@@ -172,12 +171,11 @@
 <script>
 import 'element-ui/lib/theme-chalk/index.css'
 import { getCaseDetail } from '@/api/coorBusiness/case'
-import ArcGisMapRead from '@/components/Map/arcgisMapRead'
 import LeafletMapRead from '@/components/Map/leafletMapRead'
 
 export default {
   name: 'CaseDetail',
-  components: { ArcGisMapRead, LeafletMapRead },
+  components: { LeafletMapRead },
   props: {
     id: {
       type: String,
diff --git a/src/components/Map/leafletMap.vue b/src/components/Map/leafletMap.vue
index e1150e9..3217e42 100644
--- a/src/components/Map/leafletMap.vue
+++ b/src/components/Map/leafletMap.vue
@@ -122,7 +122,7 @@
 
       const that = this
       map.on('click', function(e) {
-        that.clearPoints()
+        that.clearMarkers() // 清除定位点，不清除查询出来的兴趣点
 
         // 加载定位点
         if (that.showEventPointPopup) {
@@ -238,6 +238,11 @@
         url: `${this.baseUrl}${this.partsAllUrl}`,
         minZoom: 19
       })
+
+      // 加载网格图层，用于选择网格
+      this.layers.grid = esri.featureLayer({
+        url: `${this.baseUrl}${this.gridUrl}`
+      })
     },
     switchEventOrComponent: function() {
       // 如果选中的是事件定位（1）或部件定位（0），点击地图时弹出事件或者部件的popup；否则（2以上）显示兴趣点结果的属性popup
@@ -254,11 +259,18 @@
       }
     },
     clearPoints() {
+      this.clearMarkers()
+      this.clearPois()
+    },
+    clearPois: function() {
       const that = this
-      this.markers.forEach(marker => {
+      this.pois.forEach(marker => {
         that.map.removeLayer(marker)
       })
-      this.pois.forEach(marker => {
+    },
+    clearMarkers: function() {
+      const that = this
+      this.markers.forEach(marker => {
         that.map.removeLayer(marker)
       })
     },
@@ -270,13 +282,17 @@
       }).then(response => {
         if (response.code === 200) {
           console.log(response)
-          this.clearMap()
+          this.clearPois() // 清除查询的兴趣点结果，不清除地图选点
           const data = response.data
           if (data.total === 0) {
             this.$message.warning('未找到 "' + that.keywords + '" 的兴趣点，请重新查询')
           } else if (data.total > that.limit) {
             this.$message.warning('"' + that.keywords + '" 的兴趣点结果过多，请重新查询')
           } else {
+            let minLng = data.rows[0].pointX
+            let minLat = data.rows[0].pointY
+            let maxLng = data.rows[0].pointX
+            let maxLat = data.rows[0].pointY
             data.rows.forEach(item => {
               const popupStr = '<div class="popup-div">' +
                 '<div class="popup-title">兴趣点</div>' +
@@ -288,7 +304,20 @@
               poi.bindPopup(popupStr).openPopup()
               that.pois.push(poi)
               that.map.addLayer(poi)
+
+              // 查找左上角和右下角的坐标
+              if (minLng > item.pointX) minLng = item.pointX
+              if (minLat > item.pointY) minLat = item.pointY
+              if (maxLng < item.pointX) maxLng = item.pointX
+              if (maxLat < item.pointY) maxLat = item.pointY
             })
+
+            const topLeft = L.latLng(maxLat, minLng) // 左上角经纬度
+            const bottomRight = L.latLng(minLat, maxLng) // 右下角经纬度
+            const bounds = L.latLngBounds(topLeft, bottomRight)
+
+            // 定位到矩形
+            that.map.fitBounds(bounds)
           }
         }
       })
@@ -303,7 +332,7 @@
         this.form.communityName,
         this.form.gridId)
 
-      this.clearMap()
+      this.clearPoints()
     },
     // 返回部件定位的结果
     checkComponentPoint: function() {
@@ -316,7 +345,7 @@
         this.form.gridId,
         this.form.componentId)
 
-      this.clearMap()
+      this.clearPoints()
     },
     clearMap() {
       this.clearPoints()
diff --git a/src/views/callCase/callCase.vue b/src/views/callCase/callCase.vue
index 6f471f5..cfd9d6a 100644
--- a/src/views/callCase/callCase.vue
+++ b/src/views/callCase/callCase.vue
@@ -256,8 +256,6 @@
 import { getCaseSource, getCaseLevel, getCaseEorC, getCaseType, getCaseDetailType, getCaseTypesTime, getVerifyPerson, addCase } from '@/api/callCase/callCase'
 import { getDeptList } from '@/api/coorBusiness/case'
 import { Uploadimg } from '@/api/common'
-import TianDiTuMap from '@/components/Map/tiandiMap'
-import ArcgisMapComp from '@/components/Map/arcGISMap'
 import LeafletMap from '@/components/Map/leafletMap'
 import VideoUpload from './components/videoUpload'
 import AudioUpload from './components/audioUpload'
@@ -265,8 +263,6 @@
 export default {
   name: 'CallCase',
   components: {// 注册组件
-    TianDiTuMap: TianDiTuMap,
-    ArcgisMapComp: ArcgisMapComp,
     VideoUpload: VideoUpload,
     AudioUpload: AudioUpload,
     LeafletMap: LeafletMap
diff --git a/src/views/caseCommon/caseDetailRead.vue b/src/views/caseCommon/caseDetailRead.vue
index c46689b..d9e9a4b 100644
--- a/src/views/caseCommon/caseDetailRead.vue
+++ b/src/views/caseCommon/caseDetailRead.vue
@@ -186,8 +186,8 @@
       :append-to-body="true"
       title="位置详情"
     >
-      <!--<tian-di-tu-map-read :longitude="Number(caseDetail.lng)" :latitude="Number(caseDetail.lat)" />-->
-      <arc-gis-map-read :longitude="Number(caseDetail.lng)" :latitude="Number(caseDetail.lat)"/>
+
+      <leaflet-map-read :longitude="Number(caseDetail.lng)" :latitude="Number(caseDetail.lat)"/>
     </el-dialog>
   </app-container>
 </template>
@@ -196,13 +196,12 @@
 import 'element-ui/lib/theme-chalk/index.css'
 import { getCaseDetail } from '@/api/coorBusiness/case'
 import { historicalRecords } from '@/api/coorBusiness/process'
-import TianDiTuMapRead from '@/components/Map/tiandiMapRead'
-import ArcGisMapRead from '@/components/Map/arcgisMapRead'
+import LeafletMapRead from '@/components/Map/leafletMapRead'
 import CaseFile from '@/components/caseCommon/caseFile'
 
 export default {
   name: 'CaseDetail',
-  components: { TianDiTuMapRead, ArcGisMapRead, CaseFile },
+  components: { LeafletMapRead, CaseFile },
   data() {
     return {
       id: '',

diff --git a/src/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue
index 931a024..cf0d03d 100644
--- a/src/components/CaseCommon/caseDetail.vue
+++ b/src/components/CaseCommon/caseDetail.vue
@@ -365,15 +365,13 @@
 import { getCaseDetail, getUserList, getDeptList, getCaseTypeList, getCaseTypeDetailList, getCaseTypeTimes } from '@/api/coorBusiness/case'
 import { getCommonLanguage, getFilingTypeList, getCaseLevelList, getEorc } from '@/api/coorBusiness/dict'
 import { historicalRecords, nextNodes, completeCaseTask } from '@/api/coorBusiness/process'
-import TianDiTuMapRead from '@/components/Map/tiandiMapRead'
-import ArcGisMapRead from '@/components/Map/arcgisMapRead'
 import LeafletMapRead from '@/components/Map/leafletMapRead'
 import { radioMap } from './radioMap'
 import CaseFile from '@/components/caseCommon/caseFile'
 
 export default {
   name: 'CaseDetail',
-  components: { TianDiTuMapRead, ArcGisMapRead, CaseFile, LeafletMapRead },
+  components: { CaseFile, LeafletMapRead },
   data() {
     const validateEmptyString = (rule, value, callback) => {
       if (!value.trim()) {
diff --git a/src/components/CaseCommon/caseDetailRead.vue b/src/components/CaseCommon/caseDetailRead.vue
index f8440a7..587e8df 100644
--- a/src/components/CaseCommon/caseDetailRead.vue
+++ b/src/components/CaseCommon/caseDetailRead.vue
@@ -163,7 +163,6 @@
       :append-to-body="true"
       title="位置详情"
     >
-      <!--<arc-gis-map :longitude="caseDetail.lng" :latitude="caseDetail.lat"/>-->
       <leaflet-map-read :longitude="caseDetail.lng" :latitude="caseDetail.lat"/>
     </el-dialog>
   </app-container>
@@ -172,12 +171,11 @@
 <script>
 import 'element-ui/lib/theme-chalk/index.css'
 import { getCaseDetail } from '@/api/coorBusiness/case'
-import ArcGisMapRead from '@/components/Map/arcgisMapRead'
 import LeafletMapRead from '@/components/Map/leafletMapRead'
 
 export default {
   name: 'CaseDetail',
-  components: { ArcGisMapRead, LeafletMapRead },
+  components: { LeafletMapRead },
   props: {
     id: {
       type: String,
diff --git a/src/components/Map/leafletMap.vue b/src/components/Map/leafletMap.vue
index e1150e9..3217e42 100644
--- a/src/components/Map/leafletMap.vue
+++ b/src/components/Map/leafletMap.vue
@@ -122,7 +122,7 @@
 
       const that = this
       map.on('click', function(e) {
-        that.clearPoints()
+        that.clearMarkers() // 清除定位点，不清除查询出来的兴趣点
 
         // 加载定位点
         if (that.showEventPointPopup) {
@@ -238,6 +238,11 @@
         url: `${this.baseUrl}${this.partsAllUrl}`,
         minZoom: 19
       })
+
+      // 加载网格图层，用于选择网格
+      this.layers.grid = esri.featureLayer({
+        url: `${this.baseUrl}${this.gridUrl}`
+      })
     },
     switchEventOrComponent: function() {
       // 如果选中的是事件定位（1）或部件定位（0），点击地图时弹出事件或者部件的popup；否则（2以上）显示兴趣点结果的属性popup
@@ -254,11 +259,18 @@
       }
     },
     clearPoints() {
+      this.clearMarkers()
+      this.clearPois()
+    },
+    clearPois: function() {
       const that = this
-      this.markers.forEach(marker => {
+      this.pois.forEach(marker => {
         that.map.removeLayer(marker)
       })
-      this.pois.forEach(marker => {
+    },
+    clearMarkers: function() {
+      const that = this
+      this.markers.forEach(marker => {
         that.map.removeLayer(marker)
       })
     },
@@ -270,13 +282,17 @@
       }).then(response => {
         if (response.code === 200) {
           console.log(response)
-          this.clearMap()
+          this.clearPois() // 清除查询的兴趣点结果，不清除地图选点
           const data = response.data
           if (data.total === 0) {
             this.$message.warning('未找到 "' + that.keywords + '" 的兴趣点，请重新查询')
           } else if (data.total > that.limit) {
             this.$message.warning('"' + that.keywords + '" 的兴趣点结果过多，请重新查询')
           } else {
+            let minLng = data.rows[0].pointX
+            let minLat = data.rows[0].pointY
+            let maxLng = data.rows[0].pointX
+            let maxLat = data.rows[0].pointY
             data.rows.forEach(item => {
               const popupStr = '<div class="popup-div">' +
                 '<div class="popup-title">兴趣点</div>' +
@@ -288,7 +304,20 @@
               poi.bindPopup(popupStr).openPopup()
               that.pois.push(poi)
               that.map.addLayer(poi)
+
+              // 查找左上角和右下角的坐标
+              if (minLng > item.pointX) minLng = item.pointX
+              if (minLat > item.pointY) minLat = item.pointY
+              if (maxLng < item.pointX) maxLng = item.pointX
+              if (maxLat < item.pointY) maxLat = item.pointY
             })
+
+            const topLeft = L.latLng(maxLat, minLng) // 左上角经纬度
+            const bottomRight = L.latLng(minLat, maxLng) // 右下角经纬度
+            const bounds = L.latLngBounds(topLeft, bottomRight)
+
+            // 定位到矩形
+            that.map.fitBounds(bounds)
           }
         }
       })
@@ -303,7 +332,7 @@
         this.form.communityName,
         this.form.gridId)
 
-      this.clearMap()
+      this.clearPoints()
     },
     // 返回部件定位的结果
     checkComponentPoint: function() {
@@ -316,7 +345,7 @@
         this.form.gridId,
         this.form.componentId)
 
-      this.clearMap()
+      this.clearPoints()
     },
     clearMap() {
       this.clearPoints()
diff --git a/src/views/callCase/callCase.vue b/src/views/callCase/callCase.vue
index 6f471f5..cfd9d6a 100644
--- a/src/views/callCase/callCase.vue
+++ b/src/views/callCase/callCase.vue
@@ -256,8 +256,6 @@
 import { getCaseSource, getCaseLevel, getCaseEorC, getCaseType, getCaseDetailType, getCaseTypesTime, getVerifyPerson, addCase } from '@/api/callCase/callCase'
 import { getDeptList } from '@/api/coorBusiness/case'
 import { Uploadimg } from '@/api/common'
-import TianDiTuMap from '@/components/Map/tiandiMap'
-import ArcgisMapComp from '@/components/Map/arcGISMap'
 import LeafletMap from '@/components/Map/leafletMap'
 import VideoUpload from './components/videoUpload'
 import AudioUpload from './components/audioUpload'
@@ -265,8 +263,6 @@
 export default {
   name: 'CallCase',
   components: {// 注册组件
-    TianDiTuMap: TianDiTuMap,
-    ArcgisMapComp: ArcgisMapComp,
     VideoUpload: VideoUpload,
     AudioUpload: AudioUpload,
     LeafletMap: LeafletMap
diff --git a/src/views/caseCommon/caseDetailRead.vue b/src/views/caseCommon/caseDetailRead.vue
index c46689b..d9e9a4b 100644
--- a/src/views/caseCommon/caseDetailRead.vue
+++ b/src/views/caseCommon/caseDetailRead.vue
@@ -186,8 +186,8 @@
       :append-to-body="true"
       title="位置详情"
     >
-      <!--<tian-di-tu-map-read :longitude="Number(caseDetail.lng)" :latitude="Number(caseDetail.lat)" />-->
-      <arc-gis-map-read :longitude="Number(caseDetail.lng)" :latitude="Number(caseDetail.lat)"/>
+
+      <leaflet-map-read :longitude="Number(caseDetail.lng)" :latitude="Number(caseDetail.lat)"/>
     </el-dialog>
   </app-container>
 </template>
@@ -196,13 +196,12 @@
 import 'element-ui/lib/theme-chalk/index.css'
 import { getCaseDetail } from '@/api/coorBusiness/case'
 import { historicalRecords } from '@/api/coorBusiness/process'
-import TianDiTuMapRead from '@/components/Map/tiandiMapRead'
-import ArcGisMapRead from '@/components/Map/arcgisMapRead'
+import LeafletMapRead from '@/components/Map/leafletMapRead'
 import CaseFile from '@/components/caseCommon/caseFile'
 
 export default {
   name: 'CaseDetail',
-  components: { TianDiTuMapRead, ArcGisMapRead, CaseFile },
+  components: { LeafletMapRead, CaseFile },
   data() {
     return {
       id: '',
diff --git a/src/views/caseCommon/caseDetailSupervise.vue b/src/views/caseCommon/caseDetailSupervise.vue
index c7fc5ab..9897d38 100644
--- a/src/views/caseCommon/caseDetailSupervise.vue
+++ b/src/views/caseCommon/caseDetailSupervise.vue
@@ -206,8 +206,8 @@
       :append-to-body="true"
       title="位置详情"
     >
-      <!--<tian-di-tu-map-read :longitude="Number(caseDetail.lng)" :latitude="Number(caseDetail.lat)"/>-->
-      <arc-gis-map-read :longitude="Number(caseDetail.lng)" :latitude="Number(caseDetail.lat)"/>
+
+      <leaflet-map-read :longitude="caseDetail.lng" :latitude="caseDetail.lat"/>
     </el-dialog>
   </app-container>
 </template>
@@ -218,13 +218,12 @@
 import { getCommonLanguage } from '@/api/coorBusiness/dict'
 import { historicalRecords } from '@/api/coorBusiness/process'
 import { superviseCaseTask, urgeCaseTask } from '@/api/supervise/supervise'
-import TianDiTuMapRead from '@/components/Map/tiandiMapRead'
-import ArcGisMapRead from '@/components/Map/arcgisMapRead'
+import LeafletMapRead from '@/components/Map/leafletMapRead'
 import CaseFile from '@/components/caseCommon/caseFile'
 
 export default {
   name: 'CaseDetail',
-  components: { TianDiTuMapRead, ArcGisMapRead, CaseFile },
+  components: { LeafletMapRead, CaseFile },
   data() {
     return {
       id: '',

diff --git a/src/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue
index 931a024..cf0d03d 100644
--- a/src/components/CaseCommon/caseDetail.vue
+++ b/src/components/CaseCommon/caseDetail.vue
@@ -365,15 +365,13 @@
 import { getCaseDetail, getUserList, getDeptList, getCaseTypeList, getCaseTypeDetailList, getCaseTypeTimes } from '@/api/coorBusiness/case'
 import { getCommonLanguage, getFilingTypeList, getCaseLevelList, getEorc } from '@/api/coorBusiness/dict'
 import { historicalRecords, nextNodes, completeCaseTask } from '@/api/coorBusiness/process'
-import TianDiTuMapRead from '@/components/Map/tiandiMapRead'
-import ArcGisMapRead from '@/components/Map/arcgisMapRead'
 import LeafletMapRead from '@/components/Map/leafletMapRead'
 import { radioMap } from './radioMap'
 import CaseFile from '@/components/caseCommon/caseFile'
 
 export default {
   name: 'CaseDetail',
-  components: { TianDiTuMapRead, ArcGisMapRead, CaseFile, LeafletMapRead },
+  components: { CaseFile, LeafletMapRead },
   data() {
     const validateEmptyString = (rule, value, callback) => {
       if (!value.trim()) {
diff --git a/src/components/CaseCommon/caseDetailRead.vue b/src/components/CaseCommon/caseDetailRead.vue
index f8440a7..587e8df 100644
--- a/src/components/CaseCommon/caseDetailRead.vue
+++ b/src/components/CaseCommon/caseDetailRead.vue
@@ -163,7 +163,6 @@
       :append-to-body="true"
       title="位置详情"
     >
-      <!--<arc-gis-map :longitude="caseDetail.lng" :latitude="caseDetail.lat"/>-->
       <leaflet-map-read :longitude="caseDetail.lng" :latitude="caseDetail.lat"/>
     </el-dialog>
   </app-container>
@@ -172,12 +171,11 @@
 <script>
 import 'element-ui/lib/theme-chalk/index.css'
 import { getCaseDetail } from '@/api/coorBusiness/case'
-import ArcGisMapRead from '@/components/Map/arcgisMapRead'
 import LeafletMapRead from '@/components/Map/leafletMapRead'
 
 export default {
   name: 'CaseDetail',
-  components: { ArcGisMapRead, LeafletMapRead },
+  components: { LeafletMapRead },
   props: {
     id: {
       type: String,
diff --git a/src/components/Map/leafletMap.vue b/src/components/Map/leafletMap.vue
index e1150e9..3217e42 100644
--- a/src/components/Map/leafletMap.vue
+++ b/src/components/Map/leafletMap.vue
@@ -122,7 +122,7 @@
 
       const that = this
       map.on('click', function(e) {
-        that.clearPoints()
+        that.clearMarkers() // 清除定位点，不清除查询出来的兴趣点
 
         // 加载定位点
         if (that.showEventPointPopup) {
@@ -238,6 +238,11 @@
         url: `${this.baseUrl}${this.partsAllUrl}`,
         minZoom: 19
       })
+
+      // 加载网格图层，用于选择网格
+      this.layers.grid = esri.featureLayer({
+        url: `${this.baseUrl}${this.gridUrl}`
+      })
     },
     switchEventOrComponent: function() {
       // 如果选中的是事件定位（1）或部件定位（0），点击地图时弹出事件或者部件的popup；否则（2以上）显示兴趣点结果的属性popup
@@ -254,11 +259,18 @@
       }
     },
     clearPoints() {
+      this.clearMarkers()
+      this.clearPois()
+    },
+    clearPois: function() {
       const that = this
-      this.markers.forEach(marker => {
+      this.pois.forEach(marker => {
         that.map.removeLayer(marker)
       })
-      this.pois.forEach(marker => {
+    },
+    clearMarkers: function() {
+      const that = this
+      this.markers.forEach(marker => {
         that.map.removeLayer(marker)
       })
     },
@@ -270,13 +282,17 @@
       }).then(response => {
         if (response.code === 200) {
           console.log(response)
-          this.clearMap()
+          this.clearPois() // 清除查询的兴趣点结果，不清除地图选点
           const data = response.data
           if (data.total === 0) {
             this.$message.warning('未找到 "' + that.keywords + '" 的兴趣点，请重新查询')
           } else if (data.total > that.limit) {
             this.$message.warning('"' + that.keywords + '" 的兴趣点结果过多，请重新查询')
           } else {
+            let minLng = data.rows[0].pointX
+            let minLat = data.rows[0].pointY
+            let maxLng = data.rows[0].pointX
+            let maxLat = data.rows[0].pointY
             data.rows.forEach(item => {
               const popupStr = '<div class="popup-div">' +
                 '<div class="popup-title">兴趣点</div>' +
@@ -288,7 +304,20 @@
               poi.bindPopup(popupStr).openPopup()
               that.pois.push(poi)
               that.map.addLayer(poi)
+
+              // 查找左上角和右下角的坐标
+              if (minLng > item.pointX) minLng = item.pointX
+              if (minLat > item.pointY) minLat = item.pointY
+              if (maxLng < item.pointX) maxLng = item.pointX
+              if (maxLat < item.pointY) maxLat = item.pointY
             })
+
+            const topLeft = L.latLng(maxLat, minLng) // 左上角经纬度
+            const bottomRight = L.latLng(minLat, maxLng) // 右下角经纬度
+            const bounds = L.latLngBounds(topLeft, bottomRight)
+
+            // 定位到矩形
+            that.map.fitBounds(bounds)
           }
         }
       })
@@ -303,7 +332,7 @@
         this.form.communityName,
         this.form.gridId)
 
-      this.clearMap()
+      this.clearPoints()
     },
     // 返回部件定位的结果
     checkComponentPoint: function() {
@@ -316,7 +345,7 @@
         this.form.gridId,
         this.form.componentId)
 
-      this.clearMap()
+      this.clearPoints()
     },
     clearMap() {
       this.clearPoints()
diff --git a/src/views/callCase/callCase.vue b/src/views/callCase/callCase.vue
index 6f471f5..cfd9d6a 100644
--- a/src/views/callCase/callCase.vue
+++ b/src/views/callCase/callCase.vue
@@ -256,8 +256,6 @@
 import { getCaseSource, getCaseLevel, getCaseEorC, getCaseType, getCaseDetailType, getCaseTypesTime, getVerifyPerson, addCase } from '@/api/callCase/callCase'
 import { getDeptList } from '@/api/coorBusiness/case'
 import { Uploadimg } from '@/api/common'
-import TianDiTuMap from '@/components/Map/tiandiMap'
-import ArcgisMapComp from '@/components/Map/arcGISMap'
 import LeafletMap from '@/components/Map/leafletMap'
 import VideoUpload from './components/videoUpload'
 import AudioUpload from './components/audioUpload'
@@ -265,8 +263,6 @@
 export default {
   name: 'CallCase',
   components: {// 注册组件
-    TianDiTuMap: TianDiTuMap,
-    ArcgisMapComp: ArcgisMapComp,
     VideoUpload: VideoUpload,
     AudioUpload: AudioUpload,
     LeafletMap: LeafletMap
diff --git a/src/views/caseCommon/caseDetailRead.vue b/src/views/caseCommon/caseDetailRead.vue
index c46689b..d9e9a4b 100644
--- a/src/views/caseCommon/caseDetailRead.vue
+++ b/src/views/caseCommon/caseDetailRead.vue
@@ -186,8 +186,8 @@
       :append-to-body="true"
       title="位置详情"
     >
-      <!--<tian-di-tu-map-read :longitude="Number(caseDetail.lng)" :latitude="Number(caseDetail.lat)" />-->
-      <arc-gis-map-read :longitude="Number(caseDetail.lng)" :latitude="Number(caseDetail.lat)"/>
+
+      <leaflet-map-read :longitude="Number(caseDetail.lng)" :latitude="Number(caseDetail.lat)"/>
     </el-dialog>
   </app-container>
 </template>
@@ -196,13 +196,12 @@
 import 'element-ui/lib/theme-chalk/index.css'
 import { getCaseDetail } from '@/api/coorBusiness/case'
 import { historicalRecords } from '@/api/coorBusiness/process'
-import TianDiTuMapRead from '@/components/Map/tiandiMapRead'
-import ArcGisMapRead from '@/components/Map/arcgisMapRead'
+import LeafletMapRead from '@/components/Map/leafletMapRead'
 import CaseFile from '@/components/caseCommon/caseFile'
 
 export default {
   name: 'CaseDetail',
-  components: { TianDiTuMapRead, ArcGisMapRead, CaseFile },
+  components: { LeafletMapRead, CaseFile },
   data() {
     return {
       id: '',
diff --git a/src/views/caseCommon/caseDetailSupervise.vue b/src/views/caseCommon/caseDetailSupervise.vue
index c7fc5ab..9897d38 100644
--- a/src/views/caseCommon/caseDetailSupervise.vue
+++ b/src/views/caseCommon/caseDetailSupervise.vue
@@ -206,8 +206,8 @@
       :append-to-body="true"
       title="位置详情"
     >
-      <!--<tian-di-tu-map-read :longitude="Number(caseDetail.lng)" :latitude="Number(caseDetail.lat)"/>-->
-      <arc-gis-map-read :longitude="Number(caseDetail.lng)" :latitude="Number(caseDetail.lat)"/>
+
+      <leaflet-map-read :longitude="caseDetail.lng" :latitude="caseDetail.lat"/>
     </el-dialog>
   </app-container>
 </template>
@@ -218,13 +218,12 @@
 import { getCommonLanguage } from '@/api/coorBusiness/dict'
 import { historicalRecords } from '@/api/coorBusiness/process'
 import { superviseCaseTask, urgeCaseTask } from '@/api/supervise/supervise'
-import TianDiTuMapRead from '@/components/Map/tiandiMapRead'
-import ArcGisMapRead from '@/components/Map/arcgisMapRead'
+import LeafletMapRead from '@/components/Map/leafletMapRead'
 import CaseFile from '@/components/caseCommon/caseFile'
 
 export default {
   name: 'CaseDetail',
-  components: { TianDiTuMapRead, ArcGisMapRead, CaseFile },
+  components: { LeafletMapRead, CaseFile },
   data() {
     return {
       id: '',
diff --git a/src/views/supervise/components/caseDetailSupervise.vue b/src/views/supervise/components/caseDetailSupervise.vue
index c0c97a1..71a9e05 100644
--- a/src/views/supervise/components/caseDetailSupervise.vue
+++ b/src/views/supervise/components/caseDetailSupervise.vue
@@ -185,7 +185,7 @@
       :append-to-body="true"
       title="位置详情"
     >
-      <arc-gis-map :longitude="caseDetail.lng" :latitude="caseDetail.lat"/>
+      <leaflet-map-read :longitude="caseDetail.lng" :latitude="caseDetail.lat"/>
     </el-dialog>
   </app-container>
 </template>
@@ -195,11 +195,11 @@
 import { getCommonLanguage } from '@/api/coorBusiness/dict'
 import { historicalRecords } from '@/api/coorBusiness/process'
 import { superviseCaseTask } from '@/api/supervise/supervise'
-import ArcGisMapRead from '@/components/Map/arcgisMapRead'
+import LeafletMapRead from '@/components/Map/leafletMapRead'
 
 export default {
   name: 'CaseDetail',
-  components: { ArcGisMapRead },
+  components: { LeafletMapRead },
   props: {
     id: {
       type: String,