diff --git a/src/assets/icons/icon-poi.png b/src/assets/icons/icon-poi.png
new file mode 100644
index 0000000..364f2f6
--- /dev/null
+++ b/src/assets/icons/icon-poi.png
Binary files differ

diff --git a/src/assets/icons/icon-poi.png b/src/assets/icons/icon-poi.png
new file mode 100644
index 0000000..364f2f6
--- /dev/null
+++ b/src/assets/icons/icon-poi.png
Binary files differ
diff --git a/src/components/Map/leafletMap.vue b/src/components/Map/leafletMap.vue
index c8b0b6f..e1150e9 100644
--- a/src/components/Map/leafletMap.vue
+++ b/src/components/Map/leafletMap.vue
@@ -1,25 +1,21 @@
 <template>
-  <div style="margin-top: -10px">
+  <div style="margin-top: -30px; margin-bottom: -10px;">
     <el-row :gutter="20">
-      <div v-show="showpoi">
-        <el-col :span="3">
-          <el-input v-model="keywords" size="small" type="text" placeholder="兴趣点关键字" clearable />
-        </el-col>
-        <el-col :span="5">
-          <el-button type="primary" size="small" @click="queryOnMap">查询</el-button>
-          <el-button type="info" size="small" @click="clearMap"> 清除地图 </el-button>
-        </el-col>
-      </div>
+      <el-col v-show="showpoi" :span="8">
+        <el-input v-model="keywords" size="small" type="text" placeholder="兴趣点关键字" clearable style="width: 50%" />
+        <el-button type="primary" size="small" @click="queryOnMap">查询</el-button>
+        <el-button type="info" size="small" @click="clearMap"> 清除地图 </el-button>
+      </el-col>
 
-      <el-col :span="6" :offset="8" style="text-align: right;">
+      <el-col :span="8" style="text-align: right">
         <el-radio-group v-model="queryEventSwitch" size="small" @change="switchEventOrComponent">
           <el-radio-button label="1">事件定位</el-radio-button>
           <el-radio-button label="0">部件定位</el-radio-button>
-          <el-radio-button v-show="showpoi" label="2">兴趣点属性</el-radio-button>
+          <!--          <el-radio-button v-show="showpoi" label="2">兴趣点属性</el-radio-button>-->
         </el-radio-group>
       </el-col>
 
-      <el-col v-if="queryEventSwitch === '0'" :span="10" :offset="0" style="text-align: right;">
+      <el-col v-if="queryEventSwitch === '0'" :span="8" style="text-align: right;">
         <el-select v-model="form.componentId" placeholder="选择部件" clearable value="" size="small">
           <el-option
             v-for="item in compListOpts"
@@ -30,7 +26,7 @@
         <el-button type="primary" size="small" @click="checkComponentPoint"> 部件提交 </el-button>
       </el-col>
 
-      <el-col v-if="queryEventSwitch === '1'" :span="10" :offset="0" style="text-align: right;">
+      <el-col v-if="queryEventSwitch === '1'" :span="8" :offset="0" style="text-align: right;">
         <el-button type="primary" size="small" @click="checkEventPoint"> 事件提交 </el-button>
       </el-col>
     </el-row>
@@ -42,18 +38,40 @@
 <script>
 import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import { mapConfig, serverConfig } from './ArcGISConfig'
+import { mapGetters } from 'vuex'
+import { merchantListPage } from '@/api/geoCoding/geoCoding'
+
 const esri = require('esri-leaflet')
 
+const icon = L.icon({
+  iconUrl: require('@/assets/icons/icon-position.png'),
+  iconSize: [32, 32],
+  iconAnchor: [16, 32],
+  popupAnchor: [0, -32]
+})
+
+const poiIcon = L.icon({
+  iconUrl: require('@/assets/icons/icon-poi.png'),
+  iconSize: [16, 16],
+  iconAnchor: [8, 16],
+  popupAnchor: [0, -16]
+})
+
+const deltaLng10 = 0.00002536 // 10米范围经度值偏移量（大约）
+const deltaLat10 = 0.00002256 // 10米范围纬度值偏移量（大约）
+
 export default {
   name: 'LeafletMap',
   data() {
     return {
       map: null,
-      markers: [],
+      baseLayer: [],
+      markers: [], // 选点
+      pois: [], // 兴趣点结果
       layers: {
         bjPoint: '', // 部件点图层
-        grid: '' // 单元网格图层
+        grid: '', // 单元网格图层
+        shopPoint: '' // 商铺图层
       },
       form: {
         longitude: '', // 定位点经度
@@ -64,23 +82,33 @@
         componentId: '', // 部件ID
         componentName: '' // 部件名称
       }, // 主页面返回值
-      showpoi: false,
+      showpoi: true,
       keywords: '', // 查询关键字
+      limit: 100, // 兴趣点查询的最大结果数
       showEventPointPopup: true, // 是否显示事部件的popup
       queryEventSwitch: '1', // 1==查询事件；0==查询部件
       compListOpts: [] // 部件选择下拉框option
     }
   },
+  computed: {
+    ...mapGetters([
+      'baseUrl',
+      'partsUrl',
+      'mapUrl',
+      'gridUrl',
+      'partsAllUrl'
+    ])
+  },
   mounted() {
     this.initMap()
   },
   methods: {
     initMap() {
-      const map = L.map('map', {
-        minZoom: 13,
-        // maxZoom: 18,
-        center: [27.755, 116.08],
-        zoom: 16,
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: 14,
+        maxZoom: 25,
+        center: this.baseConfig.center,
+        zoom: this.baseConfig.zoom,
         zoomControl: false,
         attributionControl: false,
         crs: L.CRS.EPSG3857
@@ -89,135 +117,181 @@
       this.map = map // data上需要挂载
       window.map = map
 
-      esri.dynamicMapLayer({
-        url: serverConfig.mapUrlBase
-      }).addTo(map)
-
+      // 加载图层
       this.addLayers()
 
       const that = this
       map.on('click', function(e) {
-
-        console.log('e', e)
-        console.log('e.latlng', e.latlng)
-        console.log('queryEventSwitch', that.queryEventSwitch)
         that.clearPoints()
 
         // 加载定位点
         if (that.showEventPointPopup) {
-          const icon = L.icon({
-            iconUrl: require('../../assets/icons/icon-position.png'),
-            iconSize: [35, 35]
-          })
           const pos = L.marker(e.latlng, {
             icon: icon
           })
           that.markers.push(pos)
           that.map.addLayer(pos)
 
-          // 查询事件或者部件
-          if (that.queryEventSwitch === '1') {
-            // 事件定位
-            // 1查询底图得到所在网格与所在社区
-            const query = that.layers.grid.query()
-            query.nearby(e.latlng, 10)
-            query.run(function(error, featureCollection, response) {
-              if (error) {
-                console.log(error)
-                return
-              }
-              const result = featureCollection.features[0].properties
-              // 赋值
-              that.form.longitude = e.latlng.lng
-              that.form.latitude = e.latlng.lat
-              that.form.gridId = result.CommuId
-              that.form.communityId = result.CommuId
-              that.form.communityName = result.CommuName
-
-              pos.bindPopup('坐标：[' + that.form.longitude.toFixed(4) + ', ' + that.form.latitude.toFixed(4) + ']' + '<p>' + '所在社区：' + result.CommuName).openPopup()
-            })
-          } else if (that.queryEventSwitch === '0') {
-            var latlngs = []
-            var p1 = that.getLonAndLat(e.latlng.lng, e.latlng.lat, 0, 2.5)
-            latlngs.push([p1.lat, p1.lon])
-            var p2 = that.getLonAndLat(e.latlng.lng, e.latlng.lat, 90, 2.5)
-            latlngs.push([p2.lat, p2.lon])
-            var p3 = that.getLonAndLat(e.latlng.lng, e.latlng.lat, 180, 2.5)
-            latlngs.push([p3.lat, p3.lon])
-            var p4 = that.getLonAndLat(e.latlng.lng, e.latlng.lat, 270, 2.5)
-            latlngs.push([p4.lat, p4.lon])
-
-            var polyline = L.polygon(latlngs)
-            const bjQuery = that.layers.bjPoint.query()
-            bjQuery.within(polyline)
-            bjQuery.run(function(error, featureCollection, response) {
-              if (error) {
-                console.log(error)
-                return
-              }
-              if (featureCollection.features.length > 0) {
-                const result = featureCollection.features
-                console.log(result)
-                // 赋值
-                that.compListOpts = []
-                let content = ''
-                result.forEach((item, index) => {
-                  content += '<p>部件' + (index + 1) + '：' + item.properties.大类名称 + '-' + item.properties.小类名称 + '-' + item.properties.编码
-                  const comp = {}
-                  comp.name = '部件' + (index + 1) + '：' + item.properties.大类名称 + '-' + item.properties.小类名称 + '-' + item.properties.编码
-                  comp.value = item.properties.编码
-                  that.compListOpts.push(comp)
-                })
-
-                pos.bindPopup('坐标：[' + e.latlng.lng.toFixed(4) + ', ' + e.latlng.lat.toFixed(4) + ']，附近5米的部件有：' + content).openPopup()
-
-                const query = that.layers.grid.query()
-                query.nearby(e.latlng, 10)
-                query.run(function(error, featureCollection, response) {
-                  if (error) {
-                    console.log(error)
-                    return
-                  }
-                  const result = featureCollection.features[0].properties
-                  // 赋值
-                  that.form.longitude = e.latlng.lng
-                  that.form.latitude = e.latlng.lat
-                  that.form.gridId = result.CommuId
-                  that.form.communityId = result.CommuId
-                  that.form.communityName = result.CommuName
-                })
-              } else {
-                that.$message({
-                  message: '没有查询到部件，请重新定位',
-                  type: 'warning'
-                })
-              }
-            }
-            )
+          // 飞到定位点
+          let zoom = that.map.getZoom()
+          if (zoom < 18) {
+            zoom = 18
           }
+          that.map.flyTo(e.latlng, zoom)
+
+          // 查询所点的网格
+          const query = that.layers.grid.query()
+          query.nearby(e.latlng, 10)
+          query.run(function(error, featureCollection, response) {
+            if (error) {
+              console.log(error)
+              return
+            }
+            const result = featureCollection.features[0].properties
+            // 赋值
+            that.form.longitude = e.latlng.lng
+            that.form.latitude = e.latlng.lat
+            that.form.gridId = result.GBID
+            that.form.communityId = result.GBID.substring(0, 12)
+            that.form.communityName = result.Note
+
+            if (that.queryEventSwitch === '1') {
+              // 事件定位
+              // 弹出事件点位信息
+              const popupStr = '<div class="popup-div">' +
+                '<div class="popup-title">事件点</div>' +
+                '<div class="dashed-line"></div>' +
+                '<div class="popup-item"><label>坐标</label>' + that.form.longitude.toFixed(4) + ', ' + that.form.latitude.toFixed(4) + '</div>' +
+                '<div class="popup-item"><label>所在社区</label>' + that.form.communityName + '</div>' +
+                '<div class="popup-item"><label>网格编号</label>' + that.form.gridId + '</div>' +
+                '</div>'
+
+              pos.bindPopup(popupStr).openPopup()
+            } else if (that.queryEventSwitch === '0') {
+              // 部件定位
+              // 1构建部件查询多边形，上下左右四个点
+              const latlngs = []
+              const p1 = [e.latlng.lat + deltaLat10, e.latlng.lng] // 上方点
+              const p2 = [e.latlng.lat, e.latlng.lng + deltaLng10] // 右侧点
+              const p3 = [e.latlng.lat - deltaLat10, e.latlng.lng] // 下方点
+              const p4 = [e.latlng.lat, e.latlng.lng - deltaLng10] // 左侧点
+              latlngs.push(p1)
+              latlngs.push(p2)
+              latlngs.push(p3)
+              latlngs.push(p4)
+
+              const polyline = L.polygon(latlngs)
+              const bjQuery = that.layers.bjPoint.query()
+              bjQuery.within(polyline)
+              bjQuery.run(function(error, featureCollection, response) {
+                if (error) {
+                  console.log(error)
+                  return
+                }
+
+                // 查询到结果
+                if (featureCollection.features.length > 0) {
+                  const result = featureCollection.features
+                  // 赋值
+                  that.compListOpts = []
+
+                  // 构建弹出窗口信息
+                  let popupStr = '<div class="popup-div">' +
+                    '<div class="popup-title">部件</div>' +
+                    '<div class="dashed-line"></div>' +
+                    '<div class="popup-item">坐标[' + e.latlng.lng.toFixed(4) + ', ' + e.latlng.lat.toFixed(4) + ']附近的部件有</div>' +
+                    '<div class="popup-item"><label>所在社区</label>' + that.form.communityName + '</div>' +
+                    '<div class="popup-item"><label>网格编号</label>' + that.form.gridId + '</div>'
+
+                  result.forEach((item, index) => {
+                    popupStr += '<div class="popup-subitem"><label style="padding-right: 5px;">部件' + (index + 1) + '</label>' + item.properties.dl + '/' + item.properties.xl + '[' + item.properties.objid + ']</div>'
+                    const comp = {}
+                    comp.name = '部件' + (index + 1) + '：' + item.properties.dl + '/' + item.properties.xl + '[' + item.properties.objid + ']'
+                    comp.value = item.properties.objid
+                    that.compListOpts.push(comp)
+                  })
+
+                  popupStr += '</div>'
+                  pos.bindPopup(popupStr).openPopup()
+                } else {
+                  that.$message({ message: '没有查询到部件，请重新定位', type: 'warning' })
+                }
+              })
+            }
+          })
         }
       })
     },
     addLayers() {
+      // 加载天地图底图和标注
+      this.baseLayer.push(L.tileLayer(this.baseConfig.mapUrl).addTo(this.map))
+      this.baseLayer.push(L.tileLayer(this.baseConfig.labelUrl).addTo(this.map))
+
+      // 加载底图
+      esri.dynamicMapLayer({
+        url: `${this.baseUrl}${this.mapUrl}`,
+        zIndex: 1
+      }).addTo(this.map)
+
+      // 初始化部件图层（不分层），待切换到部件定位时加载
       this.layers.bjPoint = esri.featureLayer({
-        url: serverConfig.mapUrlBj + '/0'
+        url: `${this.baseUrl}${this.partsAllUrl}`,
+        minZoom: 19
       })
-      this.layers.grid = esri.featureLayer({
-        url: serverConfig.mapUrlBase + '/16'
-      })
-      this.map.addLayer(this.layers.bjPoint)
-      this.map.addLayer(this.layers.grid)
     },
     switchEventOrComponent: function() {
       // 如果选中的是事件定位（1）或部件定位（0），点击地图时弹出事件或者部件的popup；否则（2以上）显示兴趣点结果的属性popup
       this.showEventPointPopup = this.queryEventSwitch < 2
       this.clearPoints()
+
+      if (this.queryEventSwitch === '0') {
+        // 加载和显示部件图层
+        this.map.addLayer(this.layers.bjPoint)
+        // 清空部件选择的列表
+        this.compListOpts = []
+      } else {
+        this.map.removeLayer(this.layers.bjPoint)
+      }
     },
     clearPoints() {
       const that = this
       this.markers.forEach(marker => {
         that.map.removeLayer(marker)
       })
+      this.pois.forEach(marker => {
+        that.map.removeLayer(marker)
+      })
+    },
+    queryOnMap: function() {
+      const that = this
+      merchantListPage({
+        keyword: this.keywords,
+        limit: this.limit
+      }).then(response => {
+        if (response.code === 200) {
+          console.log(response)
+          this.clearMap()
+          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 {
+            data.rows.forEach(item => {
+              const popupStr = '<div class="popup-div">' +
+                '<div class="popup-title">兴趣点</div>' +
+                '<div class="dashed-line"></div>' +
+                '<div class="popup-item"><label>名称</label>' + item.merchantName + '</div>' +
+                '<div class="popup-item"><label>详细地址</label>' + item.address + '</div>' +
+                '</div>'
+              const poi = L.marker([item.pointY, item.pointX], { icon: poiIcon })
+              poi.bindPopup(popupStr).openPopup()
+              that.pois.push(poi)
+              that.map.addLayer(poi)
+            })
+          }
+        }
+      })
     },
     // 返回事件定位的结果
     checkEventPoint: function() {
@@ -258,72 +332,52 @@
       this.form.gridId = '' // 单元网格ID
       this.form.componentId = '' // 部件ID
       this.form.componentName = '' // 部件名称
-    },
-    numberToRadius(t) {
-      return (t * Math.PI) / 180
-    },
-    numberToDegree(t) {
-      return (180 * t) / Math.PI
-    },
-    /**
-     * 根据一个经纬度及距离角度，算出另外一个经纬度
-     * @param {*} lon 经度 113.3960698
-     * @param {*} lat 纬度 22.941386
-     * @param {*} brng 方位角 45 ---- 正北方：000°或360° 正东方：090° 正南方：180° 正西方：270°
-     * @param {*} dist 90000距离(米)
-     */
-    getLonAndLat(lon, lat, brng, dist) {
-      // 大地坐标系资料WGS-84 长半径a=6378137 短半径b=6356752.3142 扁率f=1/298.2572236
-      var a = 6378137
-      var b = 6356752.3142
-      var f = 1 / 298.257223563
-      var lon1 = lon * 1
-      var lat1 = lat * 1
-      var s = dist
-      var alpha1 = this.numberToRadius(brng)
-      var sinAlpha1 = Math.sin(alpha1)
-      var cosAlpha1 = Math.cos(alpha1)
-      var tanU1 = (1 - f) * Math.tan(this.numberToRadius(lat1))
-      var cosU1 = 1 / Math.sqrt((1 + tanU1 * tanU1)), sinU1 = tanU1 * cosU1
-      var sigma1 = Math.atan2(tanU1, cosAlpha1)
-      var sinAlpha = cosU1 * sinAlpha1
-      var cosSqAlpha = 1 - sinAlpha * sinAlpha
-      var uSq = cosSqAlpha * (a * a - b * b) / (b * b)
-      var A = 1 + uSq / 16384 * (4096 + uSq * (-768 + uSq * (320 - 175 * uSq)))
-      var B = uSq / 1024 * (256 + uSq * (-128 + uSq * (74 - 47 * uSq)))
-      var sigma = s / (b * A), sigmaP = 2 * Math.PI
-      while (Math.abs(sigma - sigmaP) > 1e-12) {
-        var cos2SigmaM = Math.cos(2 * sigma1 + sigma)
-        var sinSigma = Math.sin(sigma)
-        var cosSigma = Math.cos(sigma)
-        var deltaSigma = B * sinSigma * (cos2SigmaM + B / 4 * (cosSigma * (-1 + 2 * cos2SigmaM * cos2SigmaM) -
-          B / 6 * cos2SigmaM * (-3 + 4 * sinSigma * sinSigma) * (-3 + 4 * cos2SigmaM * cos2SigmaM)))
-        sigmaP = sigma
-        sigma = s / (b * A) + deltaSigma
-      }
-      var tmp = sinU1 * sinSigma - cosU1 * cosSigma * cosAlpha1
-      var lat2 = Math.atan2(sinU1 * cosSigma + cosU1 * sinSigma * cosAlpha1, (1 - f) * Math.sqrt(sinAlpha * sinAlpha + tmp * tmp))
-      var lambda = Math.atan2(sinSigma * sinAlpha1, cosU1 * cosSigma - sinU1 * sinSigma * cosAlpha1)
-      var C = f / 16 * cosSqAlpha * (4 + f * (4 - 3 * cosSqAlpha))
-      var L = lambda - (1 - C) * f * sinAlpha * (sigma + C * sinSigma * (cos2SigmaM + C * cosSigma * (-1 + 2 * cos2SigmaM * cos2SigmaM)))
-      var revAz = Math.atan2(sinAlpha, -tmp) // final bearing
-      var lonLatObj = { lon: lon1 + this.numberToDegree(L), lat: this.numberToDegree(lat2) }
-      return lonLatObj
     }
   }
 }
 </script>
 
 <style scoped>
-  @import 'https://js.arcgis.com/4.13/esri/css/main.css';
   .baseMap {
-    height:60vh;
+    height: 65vh;
     width: 100%;
-    margin-top: 25px;
+    margin-top: 10px;
     border: 1px solid #DCDCDC;
     border-radius: 4px;
   }
-  .leaflet-container {
-    background: #fff0;
+</style>
+
+<style>
+  .leaflet-container a.leaflet-popup-close-button {
+    top: 5px; /* 修改弹窗关闭按钮样式 */
+    right: 10px; /* 修改弹窗关闭按钮样式 */
+  }
+
+  .leaflet-popup-content .popup-div {
+    font-size: 15px;
+    padding: 6px;
+  }
+
+  .leaflet-popup-content .popup-title {
+    font-weight: bold;
+  }
+
+  .leaflet-popup-content .dashed-line {
+    border-bottom: 1px dashed #dddddd;
+    margin: 10px -10px;
+  }
+
+  .leaflet-popup-content .popup-item {
+    padding-bottom: 6px;
+  }
+
+  .leaflet-popup-content .popup-item label {
+    font-weight: bold;
+    padding-right: 15px;
+  }
+
+  .leaflet-popup-content .popup-subitem {
+    padding-bottom: 6px;
+    font-size: 12px;
   }
 </style>

diff --git a/src/assets/icons/icon-poi.png b/src/assets/icons/icon-poi.png
new file mode 100644
index 0000000..364f2f6
--- /dev/null
+++ b/src/assets/icons/icon-poi.png
Binary files differ
diff --git a/src/components/Map/leafletMap.vue b/src/components/Map/leafletMap.vue
index c8b0b6f..e1150e9 100644
--- a/src/components/Map/leafletMap.vue
+++ b/src/components/Map/leafletMap.vue
@@ -1,25 +1,21 @@
 <template>
-  <div style="margin-top: -10px">
+  <div style="margin-top: -30px; margin-bottom: -10px;">
     <el-row :gutter="20">
-      <div v-show="showpoi">
-        <el-col :span="3">
-          <el-input v-model="keywords" size="small" type="text" placeholder="兴趣点关键字" clearable />
-        </el-col>
-        <el-col :span="5">
-          <el-button type="primary" size="small" @click="queryOnMap">查询</el-button>
-          <el-button type="info" size="small" @click="clearMap"> 清除地图 </el-button>
-        </el-col>
-      </div>
+      <el-col v-show="showpoi" :span="8">
+        <el-input v-model="keywords" size="small" type="text" placeholder="兴趣点关键字" clearable style="width: 50%" />
+        <el-button type="primary" size="small" @click="queryOnMap">查询</el-button>
+        <el-button type="info" size="small" @click="clearMap"> 清除地图 </el-button>
+      </el-col>
 
-      <el-col :span="6" :offset="8" style="text-align: right;">
+      <el-col :span="8" style="text-align: right">
         <el-radio-group v-model="queryEventSwitch" size="small" @change="switchEventOrComponent">
           <el-radio-button label="1">事件定位</el-radio-button>
           <el-radio-button label="0">部件定位</el-radio-button>
-          <el-radio-button v-show="showpoi" label="2">兴趣点属性</el-radio-button>
+          <!--          <el-radio-button v-show="showpoi" label="2">兴趣点属性</el-radio-button>-->
         </el-radio-group>
       </el-col>
 
-      <el-col v-if="queryEventSwitch === '0'" :span="10" :offset="0" style="text-align: right;">
+      <el-col v-if="queryEventSwitch === '0'" :span="8" style="text-align: right;">
         <el-select v-model="form.componentId" placeholder="选择部件" clearable value="" size="small">
           <el-option
             v-for="item in compListOpts"
@@ -30,7 +26,7 @@
         <el-button type="primary" size="small" @click="checkComponentPoint"> 部件提交 </el-button>
       </el-col>
 
-      <el-col v-if="queryEventSwitch === '1'" :span="10" :offset="0" style="text-align: right;">
+      <el-col v-if="queryEventSwitch === '1'" :span="8" :offset="0" style="text-align: right;">
         <el-button type="primary" size="small" @click="checkEventPoint"> 事件提交 </el-button>
       </el-col>
     </el-row>
@@ -42,18 +38,40 @@
 <script>
 import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import { mapConfig, serverConfig } from './ArcGISConfig'
+import { mapGetters } from 'vuex'
+import { merchantListPage } from '@/api/geoCoding/geoCoding'
+
 const esri = require('esri-leaflet')
 
+const icon = L.icon({
+  iconUrl: require('@/assets/icons/icon-position.png'),
+  iconSize: [32, 32],
+  iconAnchor: [16, 32],
+  popupAnchor: [0, -32]
+})
+
+const poiIcon = L.icon({
+  iconUrl: require('@/assets/icons/icon-poi.png'),
+  iconSize: [16, 16],
+  iconAnchor: [8, 16],
+  popupAnchor: [0, -16]
+})
+
+const deltaLng10 = 0.00002536 // 10米范围经度值偏移量（大约）
+const deltaLat10 = 0.00002256 // 10米范围纬度值偏移量（大约）
+
 export default {
   name: 'LeafletMap',
   data() {
     return {
       map: null,
-      markers: [],
+      baseLayer: [],
+      markers: [], // 选点
+      pois: [], // 兴趣点结果
       layers: {
         bjPoint: '', // 部件点图层
-        grid: '' // 单元网格图层
+        grid: '', // 单元网格图层
+        shopPoint: '' // 商铺图层
       },
       form: {
         longitude: '', // 定位点经度
@@ -64,23 +82,33 @@
         componentId: '', // 部件ID
         componentName: '' // 部件名称
       }, // 主页面返回值
-      showpoi: false,
+      showpoi: true,
       keywords: '', // 查询关键字
+      limit: 100, // 兴趣点查询的最大结果数
       showEventPointPopup: true, // 是否显示事部件的popup
       queryEventSwitch: '1', // 1==查询事件；0==查询部件
       compListOpts: [] // 部件选择下拉框option
     }
   },
+  computed: {
+    ...mapGetters([
+      'baseUrl',
+      'partsUrl',
+      'mapUrl',
+      'gridUrl',
+      'partsAllUrl'
+    ])
+  },
   mounted() {
     this.initMap()
   },
   methods: {
     initMap() {
-      const map = L.map('map', {
-        minZoom: 13,
-        // maxZoom: 18,
-        center: [27.755, 116.08],
-        zoom: 16,
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: 14,
+        maxZoom: 25,
+        center: this.baseConfig.center,
+        zoom: this.baseConfig.zoom,
         zoomControl: false,
         attributionControl: false,
         crs: L.CRS.EPSG3857
@@ -89,135 +117,181 @@
       this.map = map // data上需要挂载
       window.map = map
 
-      esri.dynamicMapLayer({
-        url: serverConfig.mapUrlBase
-      }).addTo(map)
-
+      // 加载图层
       this.addLayers()
 
       const that = this
       map.on('click', function(e) {
-
-        console.log('e', e)
-        console.log('e.latlng', e.latlng)
-        console.log('queryEventSwitch', that.queryEventSwitch)
         that.clearPoints()
 
         // 加载定位点
         if (that.showEventPointPopup) {
-          const icon = L.icon({
-            iconUrl: require('../../assets/icons/icon-position.png'),
-            iconSize: [35, 35]
-          })
           const pos = L.marker(e.latlng, {
             icon: icon
           })
           that.markers.push(pos)
           that.map.addLayer(pos)
 
-          // 查询事件或者部件
-          if (that.queryEventSwitch === '1') {
-            // 事件定位
-            // 1查询底图得到所在网格与所在社区
-            const query = that.layers.grid.query()
-            query.nearby(e.latlng, 10)
-            query.run(function(error, featureCollection, response) {
-              if (error) {
-                console.log(error)
-                return
-              }
-              const result = featureCollection.features[0].properties
-              // 赋值
-              that.form.longitude = e.latlng.lng
-              that.form.latitude = e.latlng.lat
-              that.form.gridId = result.CommuId
-              that.form.communityId = result.CommuId
-              that.form.communityName = result.CommuName
-
-              pos.bindPopup('坐标：[' + that.form.longitude.toFixed(4) + ', ' + that.form.latitude.toFixed(4) + ']' + '<p>' + '所在社区：' + result.CommuName).openPopup()
-            })
-          } else if (that.queryEventSwitch === '0') {
-            var latlngs = []
-            var p1 = that.getLonAndLat(e.latlng.lng, e.latlng.lat, 0, 2.5)
-            latlngs.push([p1.lat, p1.lon])
-            var p2 = that.getLonAndLat(e.latlng.lng, e.latlng.lat, 90, 2.5)
-            latlngs.push([p2.lat, p2.lon])
-            var p3 = that.getLonAndLat(e.latlng.lng, e.latlng.lat, 180, 2.5)
-            latlngs.push([p3.lat, p3.lon])
-            var p4 = that.getLonAndLat(e.latlng.lng, e.latlng.lat, 270, 2.5)
-            latlngs.push([p4.lat, p4.lon])
-
-            var polyline = L.polygon(latlngs)
-            const bjQuery = that.layers.bjPoint.query()
-            bjQuery.within(polyline)
-            bjQuery.run(function(error, featureCollection, response) {
-              if (error) {
-                console.log(error)
-                return
-              }
-              if (featureCollection.features.length > 0) {
-                const result = featureCollection.features
-                console.log(result)
-                // 赋值
-                that.compListOpts = []
-                let content = ''
-                result.forEach((item, index) => {
-                  content += '<p>部件' + (index + 1) + '：' + item.properties.大类名称 + '-' + item.properties.小类名称 + '-' + item.properties.编码
-                  const comp = {}
-                  comp.name = '部件' + (index + 1) + '：' + item.properties.大类名称 + '-' + item.properties.小类名称 + '-' + item.properties.编码
-                  comp.value = item.properties.编码
-                  that.compListOpts.push(comp)
-                })
-
-                pos.bindPopup('坐标：[' + e.latlng.lng.toFixed(4) + ', ' + e.latlng.lat.toFixed(4) + ']，附近5米的部件有：' + content).openPopup()
-
-                const query = that.layers.grid.query()
-                query.nearby(e.latlng, 10)
-                query.run(function(error, featureCollection, response) {
-                  if (error) {
-                    console.log(error)
-                    return
-                  }
-                  const result = featureCollection.features[0].properties
-                  // 赋值
-                  that.form.longitude = e.latlng.lng
-                  that.form.latitude = e.latlng.lat
-                  that.form.gridId = result.CommuId
-                  that.form.communityId = result.CommuId
-                  that.form.communityName = result.CommuName
-                })
-              } else {
-                that.$message({
-                  message: '没有查询到部件，请重新定位',
-                  type: 'warning'
-                })
-              }
-            }
-            )
+          // 飞到定位点
+          let zoom = that.map.getZoom()
+          if (zoom < 18) {
+            zoom = 18
           }
+          that.map.flyTo(e.latlng, zoom)
+
+          // 查询所点的网格
+          const query = that.layers.grid.query()
+          query.nearby(e.latlng, 10)
+          query.run(function(error, featureCollection, response) {
+            if (error) {
+              console.log(error)
+              return
+            }
+            const result = featureCollection.features[0].properties
+            // 赋值
+            that.form.longitude = e.latlng.lng
+            that.form.latitude = e.latlng.lat
+            that.form.gridId = result.GBID
+            that.form.communityId = result.GBID.substring(0, 12)
+            that.form.communityName = result.Note
+
+            if (that.queryEventSwitch === '1') {
+              // 事件定位
+              // 弹出事件点位信息
+              const popupStr = '<div class="popup-div">' +
+                '<div class="popup-title">事件点</div>' +
+                '<div class="dashed-line"></div>' +
+                '<div class="popup-item"><label>坐标</label>' + that.form.longitude.toFixed(4) + ', ' + that.form.latitude.toFixed(4) + '</div>' +
+                '<div class="popup-item"><label>所在社区</label>' + that.form.communityName + '</div>' +
+                '<div class="popup-item"><label>网格编号</label>' + that.form.gridId + '</div>' +
+                '</div>'
+
+              pos.bindPopup(popupStr).openPopup()
+            } else if (that.queryEventSwitch === '0') {
+              // 部件定位
+              // 1构建部件查询多边形，上下左右四个点
+              const latlngs = []
+              const p1 = [e.latlng.lat + deltaLat10, e.latlng.lng] // 上方点
+              const p2 = [e.latlng.lat, e.latlng.lng + deltaLng10] // 右侧点
+              const p3 = [e.latlng.lat - deltaLat10, e.latlng.lng] // 下方点
+              const p4 = [e.latlng.lat, e.latlng.lng - deltaLng10] // 左侧点
+              latlngs.push(p1)
+              latlngs.push(p2)
+              latlngs.push(p3)
+              latlngs.push(p4)
+
+              const polyline = L.polygon(latlngs)
+              const bjQuery = that.layers.bjPoint.query()
+              bjQuery.within(polyline)
+              bjQuery.run(function(error, featureCollection, response) {
+                if (error) {
+                  console.log(error)
+                  return
+                }
+
+                // 查询到结果
+                if (featureCollection.features.length > 0) {
+                  const result = featureCollection.features
+                  // 赋值
+                  that.compListOpts = []
+
+                  // 构建弹出窗口信息
+                  let popupStr = '<div class="popup-div">' +
+                    '<div class="popup-title">部件</div>' +
+                    '<div class="dashed-line"></div>' +
+                    '<div class="popup-item">坐标[' + e.latlng.lng.toFixed(4) + ', ' + e.latlng.lat.toFixed(4) + ']附近的部件有</div>' +
+                    '<div class="popup-item"><label>所在社区</label>' + that.form.communityName + '</div>' +
+                    '<div class="popup-item"><label>网格编号</label>' + that.form.gridId + '</div>'
+
+                  result.forEach((item, index) => {
+                    popupStr += '<div class="popup-subitem"><label style="padding-right: 5px;">部件' + (index + 1) + '</label>' + item.properties.dl + '/' + item.properties.xl + '[' + item.properties.objid + ']</div>'
+                    const comp = {}
+                    comp.name = '部件' + (index + 1) + '：' + item.properties.dl + '/' + item.properties.xl + '[' + item.properties.objid + ']'
+                    comp.value = item.properties.objid
+                    that.compListOpts.push(comp)
+                  })
+
+                  popupStr += '</div>'
+                  pos.bindPopup(popupStr).openPopup()
+                } else {
+                  that.$message({ message: '没有查询到部件，请重新定位', type: 'warning' })
+                }
+              })
+            }
+          })
         }
       })
     },
     addLayers() {
+      // 加载天地图底图和标注
+      this.baseLayer.push(L.tileLayer(this.baseConfig.mapUrl).addTo(this.map))
+      this.baseLayer.push(L.tileLayer(this.baseConfig.labelUrl).addTo(this.map))
+
+      // 加载底图
+      esri.dynamicMapLayer({
+        url: `${this.baseUrl}${this.mapUrl}`,
+        zIndex: 1
+      }).addTo(this.map)
+
+      // 初始化部件图层（不分层），待切换到部件定位时加载
       this.layers.bjPoint = esri.featureLayer({
-        url: serverConfig.mapUrlBj + '/0'
+        url: `${this.baseUrl}${this.partsAllUrl}`,
+        minZoom: 19
       })
-      this.layers.grid = esri.featureLayer({
-        url: serverConfig.mapUrlBase + '/16'
-      })
-      this.map.addLayer(this.layers.bjPoint)
-      this.map.addLayer(this.layers.grid)
     },
     switchEventOrComponent: function() {
       // 如果选中的是事件定位（1）或部件定位（0），点击地图时弹出事件或者部件的popup；否则（2以上）显示兴趣点结果的属性popup
       this.showEventPointPopup = this.queryEventSwitch < 2
       this.clearPoints()
+
+      if (this.queryEventSwitch === '0') {
+        // 加载和显示部件图层
+        this.map.addLayer(this.layers.bjPoint)
+        // 清空部件选择的列表
+        this.compListOpts = []
+      } else {
+        this.map.removeLayer(this.layers.bjPoint)
+      }
     },
     clearPoints() {
       const that = this
       this.markers.forEach(marker => {
         that.map.removeLayer(marker)
       })
+      this.pois.forEach(marker => {
+        that.map.removeLayer(marker)
+      })
+    },
+    queryOnMap: function() {
+      const that = this
+      merchantListPage({
+        keyword: this.keywords,
+        limit: this.limit
+      }).then(response => {
+        if (response.code === 200) {
+          console.log(response)
+          this.clearMap()
+          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 {
+            data.rows.forEach(item => {
+              const popupStr = '<div class="popup-div">' +
+                '<div class="popup-title">兴趣点</div>' +
+                '<div class="dashed-line"></div>' +
+                '<div class="popup-item"><label>名称</label>' + item.merchantName + '</div>' +
+                '<div class="popup-item"><label>详细地址</label>' + item.address + '</div>' +
+                '</div>'
+              const poi = L.marker([item.pointY, item.pointX], { icon: poiIcon })
+              poi.bindPopup(popupStr).openPopup()
+              that.pois.push(poi)
+              that.map.addLayer(poi)
+            })
+          }
+        }
+      })
     },
     // 返回事件定位的结果
     checkEventPoint: function() {
@@ -258,72 +332,52 @@
       this.form.gridId = '' // 单元网格ID
       this.form.componentId = '' // 部件ID
       this.form.componentName = '' // 部件名称
-    },
-    numberToRadius(t) {
-      return (t * Math.PI) / 180
-    },
-    numberToDegree(t) {
-      return (180 * t) / Math.PI
-    },
-    /**
-     * 根据一个经纬度及距离角度，算出另外一个经纬度
-     * @param {*} lon 经度 113.3960698
-     * @param {*} lat 纬度 22.941386
-     * @param {*} brng 方位角 45 ---- 正北方：000°或360° 正东方：090° 正南方：180° 正西方：270°
-     * @param {*} dist 90000距离(米)
-     */
-    getLonAndLat(lon, lat, brng, dist) {
-      // 大地坐标系资料WGS-84 长半径a=6378137 短半径b=6356752.3142 扁率f=1/298.2572236
-      var a = 6378137
-      var b = 6356752.3142
-      var f = 1 / 298.257223563
-      var lon1 = lon * 1
-      var lat1 = lat * 1
-      var s = dist
-      var alpha1 = this.numberToRadius(brng)
-      var sinAlpha1 = Math.sin(alpha1)
-      var cosAlpha1 = Math.cos(alpha1)
-      var tanU1 = (1 - f) * Math.tan(this.numberToRadius(lat1))
-      var cosU1 = 1 / Math.sqrt((1 + tanU1 * tanU1)), sinU1 = tanU1 * cosU1
-      var sigma1 = Math.atan2(tanU1, cosAlpha1)
-      var sinAlpha = cosU1 * sinAlpha1
-      var cosSqAlpha = 1 - sinAlpha * sinAlpha
-      var uSq = cosSqAlpha * (a * a - b * b) / (b * b)
-      var A = 1 + uSq / 16384 * (4096 + uSq * (-768 + uSq * (320 - 175 * uSq)))
-      var B = uSq / 1024 * (256 + uSq * (-128 + uSq * (74 - 47 * uSq)))
-      var sigma = s / (b * A), sigmaP = 2 * Math.PI
-      while (Math.abs(sigma - sigmaP) > 1e-12) {
-        var cos2SigmaM = Math.cos(2 * sigma1 + sigma)
-        var sinSigma = Math.sin(sigma)
-        var cosSigma = Math.cos(sigma)
-        var deltaSigma = B * sinSigma * (cos2SigmaM + B / 4 * (cosSigma * (-1 + 2 * cos2SigmaM * cos2SigmaM) -
-          B / 6 * cos2SigmaM * (-3 + 4 * sinSigma * sinSigma) * (-3 + 4 * cos2SigmaM * cos2SigmaM)))
-        sigmaP = sigma
-        sigma = s / (b * A) + deltaSigma
-      }
-      var tmp = sinU1 * sinSigma - cosU1 * cosSigma * cosAlpha1
-      var lat2 = Math.atan2(sinU1 * cosSigma + cosU1 * sinSigma * cosAlpha1, (1 - f) * Math.sqrt(sinAlpha * sinAlpha + tmp * tmp))
-      var lambda = Math.atan2(sinSigma * sinAlpha1, cosU1 * cosSigma - sinU1 * sinSigma * cosAlpha1)
-      var C = f / 16 * cosSqAlpha * (4 + f * (4 - 3 * cosSqAlpha))
-      var L = lambda - (1 - C) * f * sinAlpha * (sigma + C * sinSigma * (cos2SigmaM + C * cosSigma * (-1 + 2 * cos2SigmaM * cos2SigmaM)))
-      var revAz = Math.atan2(sinAlpha, -tmp) // final bearing
-      var lonLatObj = { lon: lon1 + this.numberToDegree(L), lat: this.numberToDegree(lat2) }
-      return lonLatObj
     }
   }
 }
 </script>
 
 <style scoped>
-  @import 'https://js.arcgis.com/4.13/esri/css/main.css';
   .baseMap {
-    height:60vh;
+    height: 65vh;
     width: 100%;
-    margin-top: 25px;
+    margin-top: 10px;
     border: 1px solid #DCDCDC;
     border-radius: 4px;
   }
-  .leaflet-container {
-    background: #fff0;
+</style>
+
+<style>
+  .leaflet-container a.leaflet-popup-close-button {
+    top: 5px; /* 修改弹窗关闭按钮样式 */
+    right: 10px; /* 修改弹窗关闭按钮样式 */
+  }
+
+  .leaflet-popup-content .popup-div {
+    font-size: 15px;
+    padding: 6px;
+  }
+
+  .leaflet-popup-content .popup-title {
+    font-weight: bold;
+  }
+
+  .leaflet-popup-content .dashed-line {
+    border-bottom: 1px dashed #dddddd;
+    margin: 10px -10px;
+  }
+
+  .leaflet-popup-content .popup-item {
+    padding-bottom: 6px;
+  }
+
+  .leaflet-popup-content .popup-item label {
+    font-weight: bold;
+    padding-right: 15px;
+  }
+
+  .leaflet-popup-content .popup-subitem {
+    padding-bottom: 6px;
+    font-size: 12px;
   }
 </style>
diff --git a/src/components/Map/leafletMapRead.vue b/src/components/Map/leafletMapRead.vue
index dd22198..edcd37d 100644
--- a/src/components/Map/leafletMapRead.vue
+++ b/src/components/Map/leafletMapRead.vue
@@ -7,7 +7,7 @@
 <script>
 import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import { mapConfig, serverConfig } from './ArcGISConfig'
+import { mapGetters } from 'vuex'
 const esri = require('esri-leaflet')
 export default {
   name: 'LeafletMapRead',
@@ -23,10 +23,20 @@
   },
   data() {
     return {
+      baseLayer: [],
       mapLoading: false,
       map: null
     }
   },
+  computed: {
+    ...mapGetters([
+      'baseUrl',
+      'partsUrl',
+      'mapUrl',
+      'gridUrl',
+      'partsAllUrl'
+    ])
+  },
   mounted() {
     this.initMap()
     this.addMarker()
@@ -36,9 +46,9 @@
       this.mapLoading = true
       const map = L.map('map', {
         minZoom: 13,
-        // maxZoom: 18,
-        center: [27.755, 116.08],
-        zoom: 16,
+        maxZoom: 24,
+        center: this.baseConfig.center,
+        zoom: this.baseConfig.zoom,
         zoomControl: false,
         attributionControl: false,
         crs: L.CRS.EPSG3857
@@ -47,45 +57,30 @@
       this.map = map // data上需要挂载
       window.map = map
 
+      // 加载天地图底图和标注
+      this.baseLayer.push(L.tileLayer(this.baseConfig.mapUrl).addTo(map))
+      this.baseLayer.push(L.tileLayer(this.baseConfig.labelUrl).addTo(map))
+
       esri.dynamicMapLayer({
-        url: serverConfig.mapUrlBase,
+        url: `${this.baseUrl}${this.mapUrl}`,
         opacity: 1,
         f: 'image'
       }).addTo(map)
 
-      // esri.tiledMapLayer({
-      //   url: serverConfig.mapUrlBase,
-      //   maxZoom: 15,
-      //   f: 'image'
-      // }).addTo(map)
-
-      // for (let i = 0; i < 24; i++) {
-      //   esri.featureLayer({
-      //     url: serverConfig.mapUrlBase + '/' + i
-      //     // minZoom: 4, // 最小缩放等级
-      //     // maxZoom: 21// 最大缩放等级
-      //   }).addTo(map)
-      // }
-
-      esri.featureLayer({
-        url: serverConfig.mapUrlBj + '/0'
-      }).addTo(map)
-      esri.featureLayer({
-        url: serverConfig.mapUrlBase + '/16'
-      }).addTo(map)
       this.mapLoading = false
     },
 
     addMarker() {
       const icon = L.icon({
-        iconUrl: require('../../assets/icons/icon-position.png'),
-        iconSize: [35, 35],
-        iconAnchor: [17.5, 35]
+        iconUrl: require('@/assets/icons/icon-position.png'),
+        iconSize: [32, 32],
+        iconAnchor: [16, 32],
+        popupAnchor: [0, -32]
       })
       const latlng = L.latLng([this.latitude, this.longitude])
       const feat = L.marker(latlng, { icon: icon })
       feat.addTo(this.map)
-      this.map.setView({ lat: this.latitude, lng: this.longitude }, 16)
+      this.map.setView({ lat: this.latitude, lng: this.longitude }, 18)
     }
   }
 }

diff --git a/src/assets/icons/icon-poi.png b/src/assets/icons/icon-poi.png
new file mode 100644
index 0000000..364f2f6
--- /dev/null
+++ b/src/assets/icons/icon-poi.png
Binary files differ
diff --git a/src/components/Map/leafletMap.vue b/src/components/Map/leafletMap.vue
index c8b0b6f..e1150e9 100644
--- a/src/components/Map/leafletMap.vue
+++ b/src/components/Map/leafletMap.vue
@@ -1,25 +1,21 @@
 <template>
-  <div style="margin-top: -10px">
+  <div style="margin-top: -30px; margin-bottom: -10px;">
     <el-row :gutter="20">
-      <div v-show="showpoi">
-        <el-col :span="3">
-          <el-input v-model="keywords" size="small" type="text" placeholder="兴趣点关键字" clearable />
-        </el-col>
-        <el-col :span="5">
-          <el-button type="primary" size="small" @click="queryOnMap">查询</el-button>
-          <el-button type="info" size="small" @click="clearMap"> 清除地图 </el-button>
-        </el-col>
-      </div>
+      <el-col v-show="showpoi" :span="8">
+        <el-input v-model="keywords" size="small" type="text" placeholder="兴趣点关键字" clearable style="width: 50%" />
+        <el-button type="primary" size="small" @click="queryOnMap">查询</el-button>
+        <el-button type="info" size="small" @click="clearMap"> 清除地图 </el-button>
+      </el-col>
 
-      <el-col :span="6" :offset="8" style="text-align: right;">
+      <el-col :span="8" style="text-align: right">
         <el-radio-group v-model="queryEventSwitch" size="small" @change="switchEventOrComponent">
           <el-radio-button label="1">事件定位</el-radio-button>
           <el-radio-button label="0">部件定位</el-radio-button>
-          <el-radio-button v-show="showpoi" label="2">兴趣点属性</el-radio-button>
+          <!--          <el-radio-button v-show="showpoi" label="2">兴趣点属性</el-radio-button>-->
         </el-radio-group>
       </el-col>
 
-      <el-col v-if="queryEventSwitch === '0'" :span="10" :offset="0" style="text-align: right;">
+      <el-col v-if="queryEventSwitch === '0'" :span="8" style="text-align: right;">
         <el-select v-model="form.componentId" placeholder="选择部件" clearable value="" size="small">
           <el-option
             v-for="item in compListOpts"
@@ -30,7 +26,7 @@
         <el-button type="primary" size="small" @click="checkComponentPoint"> 部件提交 </el-button>
       </el-col>
 
-      <el-col v-if="queryEventSwitch === '1'" :span="10" :offset="0" style="text-align: right;">
+      <el-col v-if="queryEventSwitch === '1'" :span="8" :offset="0" style="text-align: right;">
         <el-button type="primary" size="small" @click="checkEventPoint"> 事件提交 </el-button>
       </el-col>
     </el-row>
@@ -42,18 +38,40 @@
 <script>
 import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import { mapConfig, serverConfig } from './ArcGISConfig'
+import { mapGetters } from 'vuex'
+import { merchantListPage } from '@/api/geoCoding/geoCoding'
+
 const esri = require('esri-leaflet')
 
+const icon = L.icon({
+  iconUrl: require('@/assets/icons/icon-position.png'),
+  iconSize: [32, 32],
+  iconAnchor: [16, 32],
+  popupAnchor: [0, -32]
+})
+
+const poiIcon = L.icon({
+  iconUrl: require('@/assets/icons/icon-poi.png'),
+  iconSize: [16, 16],
+  iconAnchor: [8, 16],
+  popupAnchor: [0, -16]
+})
+
+const deltaLng10 = 0.00002536 // 10米范围经度值偏移量（大约）
+const deltaLat10 = 0.00002256 // 10米范围纬度值偏移量（大约）
+
 export default {
   name: 'LeafletMap',
   data() {
     return {
       map: null,
-      markers: [],
+      baseLayer: [],
+      markers: [], // 选点
+      pois: [], // 兴趣点结果
       layers: {
         bjPoint: '', // 部件点图层
-        grid: '' // 单元网格图层
+        grid: '', // 单元网格图层
+        shopPoint: '' // 商铺图层
       },
       form: {
         longitude: '', // 定位点经度
@@ -64,23 +82,33 @@
         componentId: '', // 部件ID
         componentName: '' // 部件名称
       }, // 主页面返回值
-      showpoi: false,
+      showpoi: true,
       keywords: '', // 查询关键字
+      limit: 100, // 兴趣点查询的最大结果数
       showEventPointPopup: true, // 是否显示事部件的popup
       queryEventSwitch: '1', // 1==查询事件；0==查询部件
       compListOpts: [] // 部件选择下拉框option
     }
   },
+  computed: {
+    ...mapGetters([
+      'baseUrl',
+      'partsUrl',
+      'mapUrl',
+      'gridUrl',
+      'partsAllUrl'
+    ])
+  },
   mounted() {
     this.initMap()
   },
   methods: {
     initMap() {
-      const map = L.map('map', {
-        minZoom: 13,
-        // maxZoom: 18,
-        center: [27.755, 116.08],
-        zoom: 16,
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: 14,
+        maxZoom: 25,
+        center: this.baseConfig.center,
+        zoom: this.baseConfig.zoom,
         zoomControl: false,
         attributionControl: false,
         crs: L.CRS.EPSG3857
@@ -89,135 +117,181 @@
       this.map = map // data上需要挂载
       window.map = map
 
-      esri.dynamicMapLayer({
-        url: serverConfig.mapUrlBase
-      }).addTo(map)
-
+      // 加载图层
       this.addLayers()
 
       const that = this
       map.on('click', function(e) {
-
-        console.log('e', e)
-        console.log('e.latlng', e.latlng)
-        console.log('queryEventSwitch', that.queryEventSwitch)
         that.clearPoints()
 
         // 加载定位点
         if (that.showEventPointPopup) {
-          const icon = L.icon({
-            iconUrl: require('../../assets/icons/icon-position.png'),
-            iconSize: [35, 35]
-          })
           const pos = L.marker(e.latlng, {
             icon: icon
           })
           that.markers.push(pos)
           that.map.addLayer(pos)
 
-          // 查询事件或者部件
-          if (that.queryEventSwitch === '1') {
-            // 事件定位
-            // 1查询底图得到所在网格与所在社区
-            const query = that.layers.grid.query()
-            query.nearby(e.latlng, 10)
-            query.run(function(error, featureCollection, response) {
-              if (error) {
-                console.log(error)
-                return
-              }
-              const result = featureCollection.features[0].properties
-              // 赋值
-              that.form.longitude = e.latlng.lng
-              that.form.latitude = e.latlng.lat
-              that.form.gridId = result.CommuId
-              that.form.communityId = result.CommuId
-              that.form.communityName = result.CommuName
-
-              pos.bindPopup('坐标：[' + that.form.longitude.toFixed(4) + ', ' + that.form.latitude.toFixed(4) + ']' + '<p>' + '所在社区：' + result.CommuName).openPopup()
-            })
-          } else if (that.queryEventSwitch === '0') {
-            var latlngs = []
-            var p1 = that.getLonAndLat(e.latlng.lng, e.latlng.lat, 0, 2.5)
-            latlngs.push([p1.lat, p1.lon])
-            var p2 = that.getLonAndLat(e.latlng.lng, e.latlng.lat, 90, 2.5)
-            latlngs.push([p2.lat, p2.lon])
-            var p3 = that.getLonAndLat(e.latlng.lng, e.latlng.lat, 180, 2.5)
-            latlngs.push([p3.lat, p3.lon])
-            var p4 = that.getLonAndLat(e.latlng.lng, e.latlng.lat, 270, 2.5)
-            latlngs.push([p4.lat, p4.lon])
-
-            var polyline = L.polygon(latlngs)
-            const bjQuery = that.layers.bjPoint.query()
-            bjQuery.within(polyline)
-            bjQuery.run(function(error, featureCollection, response) {
-              if (error) {
-                console.log(error)
-                return
-              }
-              if (featureCollection.features.length > 0) {
-                const result = featureCollection.features
-                console.log(result)
-                // 赋值
-                that.compListOpts = []
-                let content = ''
-                result.forEach((item, index) => {
-                  content += '<p>部件' + (index + 1) + '：' + item.properties.大类名称 + '-' + item.properties.小类名称 + '-' + item.properties.编码
-                  const comp = {}
-                  comp.name = '部件' + (index + 1) + '：' + item.properties.大类名称 + '-' + item.properties.小类名称 + '-' + item.properties.编码
-                  comp.value = item.properties.编码
-                  that.compListOpts.push(comp)
-                })
-
-                pos.bindPopup('坐标：[' + e.latlng.lng.toFixed(4) + ', ' + e.latlng.lat.toFixed(4) + ']，附近5米的部件有：' + content).openPopup()
-
-                const query = that.layers.grid.query()
-                query.nearby(e.latlng, 10)
-                query.run(function(error, featureCollection, response) {
-                  if (error) {
-                    console.log(error)
-                    return
-                  }
-                  const result = featureCollection.features[0].properties
-                  // 赋值
-                  that.form.longitude = e.latlng.lng
-                  that.form.latitude = e.latlng.lat
-                  that.form.gridId = result.CommuId
-                  that.form.communityId = result.CommuId
-                  that.form.communityName = result.CommuName
-                })
-              } else {
-                that.$message({
-                  message: '没有查询到部件，请重新定位',
-                  type: 'warning'
-                })
-              }
-            }
-            )
+          // 飞到定位点
+          let zoom = that.map.getZoom()
+          if (zoom < 18) {
+            zoom = 18
           }
+          that.map.flyTo(e.latlng, zoom)
+
+          // 查询所点的网格
+          const query = that.layers.grid.query()
+          query.nearby(e.latlng, 10)
+          query.run(function(error, featureCollection, response) {
+            if (error) {
+              console.log(error)
+              return
+            }
+            const result = featureCollection.features[0].properties
+            // 赋值
+            that.form.longitude = e.latlng.lng
+            that.form.latitude = e.latlng.lat
+            that.form.gridId = result.GBID
+            that.form.communityId = result.GBID.substring(0, 12)
+            that.form.communityName = result.Note
+
+            if (that.queryEventSwitch === '1') {
+              // 事件定位
+              // 弹出事件点位信息
+              const popupStr = '<div class="popup-div">' +
+                '<div class="popup-title">事件点</div>' +
+                '<div class="dashed-line"></div>' +
+                '<div class="popup-item"><label>坐标</label>' + that.form.longitude.toFixed(4) + ', ' + that.form.latitude.toFixed(4) + '</div>' +
+                '<div class="popup-item"><label>所在社区</label>' + that.form.communityName + '</div>' +
+                '<div class="popup-item"><label>网格编号</label>' + that.form.gridId + '</div>' +
+                '</div>'
+
+              pos.bindPopup(popupStr).openPopup()
+            } else if (that.queryEventSwitch === '0') {
+              // 部件定位
+              // 1构建部件查询多边形，上下左右四个点
+              const latlngs = []
+              const p1 = [e.latlng.lat + deltaLat10, e.latlng.lng] // 上方点
+              const p2 = [e.latlng.lat, e.latlng.lng + deltaLng10] // 右侧点
+              const p3 = [e.latlng.lat - deltaLat10, e.latlng.lng] // 下方点
+              const p4 = [e.latlng.lat, e.latlng.lng - deltaLng10] // 左侧点
+              latlngs.push(p1)
+              latlngs.push(p2)
+              latlngs.push(p3)
+              latlngs.push(p4)
+
+              const polyline = L.polygon(latlngs)
+              const bjQuery = that.layers.bjPoint.query()
+              bjQuery.within(polyline)
+              bjQuery.run(function(error, featureCollection, response) {
+                if (error) {
+                  console.log(error)
+                  return
+                }
+
+                // 查询到结果
+                if (featureCollection.features.length > 0) {
+                  const result = featureCollection.features
+                  // 赋值
+                  that.compListOpts = []
+
+                  // 构建弹出窗口信息
+                  let popupStr = '<div class="popup-div">' +
+                    '<div class="popup-title">部件</div>' +
+                    '<div class="dashed-line"></div>' +
+                    '<div class="popup-item">坐标[' + e.latlng.lng.toFixed(4) + ', ' + e.latlng.lat.toFixed(4) + ']附近的部件有</div>' +
+                    '<div class="popup-item"><label>所在社区</label>' + that.form.communityName + '</div>' +
+                    '<div class="popup-item"><label>网格编号</label>' + that.form.gridId + '</div>'
+
+                  result.forEach((item, index) => {
+                    popupStr += '<div class="popup-subitem"><label style="padding-right: 5px;">部件' + (index + 1) + '</label>' + item.properties.dl + '/' + item.properties.xl + '[' + item.properties.objid + ']</div>'
+                    const comp = {}
+                    comp.name = '部件' + (index + 1) + '：' + item.properties.dl + '/' + item.properties.xl + '[' + item.properties.objid + ']'
+                    comp.value = item.properties.objid
+                    that.compListOpts.push(comp)
+                  })
+
+                  popupStr += '</div>'
+                  pos.bindPopup(popupStr).openPopup()
+                } else {
+                  that.$message({ message: '没有查询到部件，请重新定位', type: 'warning' })
+                }
+              })
+            }
+          })
         }
       })
     },
     addLayers() {
+      // 加载天地图底图和标注
+      this.baseLayer.push(L.tileLayer(this.baseConfig.mapUrl).addTo(this.map))
+      this.baseLayer.push(L.tileLayer(this.baseConfig.labelUrl).addTo(this.map))
+
+      // 加载底图
+      esri.dynamicMapLayer({
+        url: `${this.baseUrl}${this.mapUrl}`,
+        zIndex: 1
+      }).addTo(this.map)
+
+      // 初始化部件图层（不分层），待切换到部件定位时加载
       this.layers.bjPoint = esri.featureLayer({
-        url: serverConfig.mapUrlBj + '/0'
+        url: `${this.baseUrl}${this.partsAllUrl}`,
+        minZoom: 19
       })
-      this.layers.grid = esri.featureLayer({
-        url: serverConfig.mapUrlBase + '/16'
-      })
-      this.map.addLayer(this.layers.bjPoint)
-      this.map.addLayer(this.layers.grid)
     },
     switchEventOrComponent: function() {
       // 如果选中的是事件定位（1）或部件定位（0），点击地图时弹出事件或者部件的popup；否则（2以上）显示兴趣点结果的属性popup
       this.showEventPointPopup = this.queryEventSwitch < 2
       this.clearPoints()
+
+      if (this.queryEventSwitch === '0') {
+        // 加载和显示部件图层
+        this.map.addLayer(this.layers.bjPoint)
+        // 清空部件选择的列表
+        this.compListOpts = []
+      } else {
+        this.map.removeLayer(this.layers.bjPoint)
+      }
     },
     clearPoints() {
       const that = this
       this.markers.forEach(marker => {
         that.map.removeLayer(marker)
       })
+      this.pois.forEach(marker => {
+        that.map.removeLayer(marker)
+      })
+    },
+    queryOnMap: function() {
+      const that = this
+      merchantListPage({
+        keyword: this.keywords,
+        limit: this.limit
+      }).then(response => {
+        if (response.code === 200) {
+          console.log(response)
+          this.clearMap()
+          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 {
+            data.rows.forEach(item => {
+              const popupStr = '<div class="popup-div">' +
+                '<div class="popup-title">兴趣点</div>' +
+                '<div class="dashed-line"></div>' +
+                '<div class="popup-item"><label>名称</label>' + item.merchantName + '</div>' +
+                '<div class="popup-item"><label>详细地址</label>' + item.address + '</div>' +
+                '</div>'
+              const poi = L.marker([item.pointY, item.pointX], { icon: poiIcon })
+              poi.bindPopup(popupStr).openPopup()
+              that.pois.push(poi)
+              that.map.addLayer(poi)
+            })
+          }
+        }
+      })
     },
     // 返回事件定位的结果
     checkEventPoint: function() {
@@ -258,72 +332,52 @@
       this.form.gridId = '' // 单元网格ID
       this.form.componentId = '' // 部件ID
       this.form.componentName = '' // 部件名称
-    },
-    numberToRadius(t) {
-      return (t * Math.PI) / 180
-    },
-    numberToDegree(t) {
-      return (180 * t) / Math.PI
-    },
-    /**
-     * 根据一个经纬度及距离角度，算出另外一个经纬度
-     * @param {*} lon 经度 113.3960698
-     * @param {*} lat 纬度 22.941386
-     * @param {*} brng 方位角 45 ---- 正北方：000°或360° 正东方：090° 正南方：180° 正西方：270°
-     * @param {*} dist 90000距离(米)
-     */
-    getLonAndLat(lon, lat, brng, dist) {
-      // 大地坐标系资料WGS-84 长半径a=6378137 短半径b=6356752.3142 扁率f=1/298.2572236
-      var a = 6378137
-      var b = 6356752.3142
-      var f = 1 / 298.257223563
-      var lon1 = lon * 1
-      var lat1 = lat * 1
-      var s = dist
-      var alpha1 = this.numberToRadius(brng)
-      var sinAlpha1 = Math.sin(alpha1)
-      var cosAlpha1 = Math.cos(alpha1)
-      var tanU1 = (1 - f) * Math.tan(this.numberToRadius(lat1))
-      var cosU1 = 1 / Math.sqrt((1 + tanU1 * tanU1)), sinU1 = tanU1 * cosU1
-      var sigma1 = Math.atan2(tanU1, cosAlpha1)
-      var sinAlpha = cosU1 * sinAlpha1
-      var cosSqAlpha = 1 - sinAlpha * sinAlpha
-      var uSq = cosSqAlpha * (a * a - b * b) / (b * b)
-      var A = 1 + uSq / 16384 * (4096 + uSq * (-768 + uSq * (320 - 175 * uSq)))
-      var B = uSq / 1024 * (256 + uSq * (-128 + uSq * (74 - 47 * uSq)))
-      var sigma = s / (b * A), sigmaP = 2 * Math.PI
-      while (Math.abs(sigma - sigmaP) > 1e-12) {
-        var cos2SigmaM = Math.cos(2 * sigma1 + sigma)
-        var sinSigma = Math.sin(sigma)
-        var cosSigma = Math.cos(sigma)
-        var deltaSigma = B * sinSigma * (cos2SigmaM + B / 4 * (cosSigma * (-1 + 2 * cos2SigmaM * cos2SigmaM) -
-          B / 6 * cos2SigmaM * (-3 + 4 * sinSigma * sinSigma) * (-3 + 4 * cos2SigmaM * cos2SigmaM)))
-        sigmaP = sigma
-        sigma = s / (b * A) + deltaSigma
-      }
-      var tmp = sinU1 * sinSigma - cosU1 * cosSigma * cosAlpha1
-      var lat2 = Math.atan2(sinU1 * cosSigma + cosU1 * sinSigma * cosAlpha1, (1 - f) * Math.sqrt(sinAlpha * sinAlpha + tmp * tmp))
-      var lambda = Math.atan2(sinSigma * sinAlpha1, cosU1 * cosSigma - sinU1 * sinSigma * cosAlpha1)
-      var C = f / 16 * cosSqAlpha * (4 + f * (4 - 3 * cosSqAlpha))
-      var L = lambda - (1 - C) * f * sinAlpha * (sigma + C * sinSigma * (cos2SigmaM + C * cosSigma * (-1 + 2 * cos2SigmaM * cos2SigmaM)))
-      var revAz = Math.atan2(sinAlpha, -tmp) // final bearing
-      var lonLatObj = { lon: lon1 + this.numberToDegree(L), lat: this.numberToDegree(lat2) }
-      return lonLatObj
     }
   }
 }
 </script>
 
 <style scoped>
-  @import 'https://js.arcgis.com/4.13/esri/css/main.css';
   .baseMap {
-    height:60vh;
+    height: 65vh;
     width: 100%;
-    margin-top: 25px;
+    margin-top: 10px;
     border: 1px solid #DCDCDC;
     border-radius: 4px;
   }
-  .leaflet-container {
-    background: #fff0;
+</style>
+
+<style>
+  .leaflet-container a.leaflet-popup-close-button {
+    top: 5px; /* 修改弹窗关闭按钮样式 */
+    right: 10px; /* 修改弹窗关闭按钮样式 */
+  }
+
+  .leaflet-popup-content .popup-div {
+    font-size: 15px;
+    padding: 6px;
+  }
+
+  .leaflet-popup-content .popup-title {
+    font-weight: bold;
+  }
+
+  .leaflet-popup-content .dashed-line {
+    border-bottom: 1px dashed #dddddd;
+    margin: 10px -10px;
+  }
+
+  .leaflet-popup-content .popup-item {
+    padding-bottom: 6px;
+  }
+
+  .leaflet-popup-content .popup-item label {
+    font-weight: bold;
+    padding-right: 15px;
+  }
+
+  .leaflet-popup-content .popup-subitem {
+    padding-bottom: 6px;
+    font-size: 12px;
   }
 </style>
diff --git a/src/components/Map/leafletMapRead.vue b/src/components/Map/leafletMapRead.vue
index dd22198..edcd37d 100644
--- a/src/components/Map/leafletMapRead.vue
+++ b/src/components/Map/leafletMapRead.vue
@@ -7,7 +7,7 @@
 <script>
 import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import { mapConfig, serverConfig } from './ArcGISConfig'
+import { mapGetters } from 'vuex'
 const esri = require('esri-leaflet')
 export default {
   name: 'LeafletMapRead',
@@ -23,10 +23,20 @@
   },
   data() {
     return {
+      baseLayer: [],
       mapLoading: false,
       map: null
     }
   },
+  computed: {
+    ...mapGetters([
+      'baseUrl',
+      'partsUrl',
+      'mapUrl',
+      'gridUrl',
+      'partsAllUrl'
+    ])
+  },
   mounted() {
     this.initMap()
     this.addMarker()
@@ -36,9 +46,9 @@
       this.mapLoading = true
       const map = L.map('map', {
         minZoom: 13,
-        // maxZoom: 18,
-        center: [27.755, 116.08],
-        zoom: 16,
+        maxZoom: 24,
+        center: this.baseConfig.center,
+        zoom: this.baseConfig.zoom,
         zoomControl: false,
         attributionControl: false,
         crs: L.CRS.EPSG3857
@@ -47,45 +57,30 @@
       this.map = map // data上需要挂载
       window.map = map
 
+      // 加载天地图底图和标注
+      this.baseLayer.push(L.tileLayer(this.baseConfig.mapUrl).addTo(map))
+      this.baseLayer.push(L.tileLayer(this.baseConfig.labelUrl).addTo(map))
+
       esri.dynamicMapLayer({
-        url: serverConfig.mapUrlBase,
+        url: `${this.baseUrl}${this.mapUrl}`,
         opacity: 1,
         f: 'image'
       }).addTo(map)
 
-      // esri.tiledMapLayer({
-      //   url: serverConfig.mapUrlBase,
-      //   maxZoom: 15,
-      //   f: 'image'
-      // }).addTo(map)
-
-      // for (let i = 0; i < 24; i++) {
-      //   esri.featureLayer({
-      //     url: serverConfig.mapUrlBase + '/' + i
-      //     // minZoom: 4, // 最小缩放等级
-      //     // maxZoom: 21// 最大缩放等级
-      //   }).addTo(map)
-      // }
-
-      esri.featureLayer({
-        url: serverConfig.mapUrlBj + '/0'
-      }).addTo(map)
-      esri.featureLayer({
-        url: serverConfig.mapUrlBase + '/16'
-      }).addTo(map)
       this.mapLoading = false
     },
 
     addMarker() {
       const icon = L.icon({
-        iconUrl: require('../../assets/icons/icon-position.png'),
-        iconSize: [35, 35],
-        iconAnchor: [17.5, 35]
+        iconUrl: require('@/assets/icons/icon-position.png'),
+        iconSize: [32, 32],
+        iconAnchor: [16, 32],
+        popupAnchor: [0, -32]
       })
       const latlng = L.latLng([this.latitude, this.longitude])
       const feat = L.marker(latlng, { icon: icon })
       feat.addTo(this.map)
-      this.map.setView({ lat: this.latitude, lng: this.longitude }, 16)
+      this.map.setView({ lat: this.latitude, lng: this.longitude }, 18)
     }
   }
 }
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 2f77b38..134cb1e 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -31,12 +31,12 @@
         name: 'TimeLimit',
         meta: { title: '阶段时限', icon: '', permission: ['/timeLimit'] }
       },
-      {
-        path: '/caseList',
-        component: () => import('@/views/seo/seo'),
-        name: 'CaseList',
-        meta: { title: '综合查询', icon: '', permission: ['/caseList'] }
-      },
+      // {
+      //   path: '/caseList',
+      //   component: () => import('@/views/seo/seo'),
+      //   name: 'CaseList',
+      //   meta: { title: '综合查询', icon: '', permission: ['/caseList'] }
+      // },
       {
         path: '/caseType',
         component: () => import('@/views/busAdmin/caseType/listCaseType.vue'),

diff --git a/src/assets/icons/icon-poi.png b/src/assets/icons/icon-poi.png
new file mode 100644
index 0000000..364f2f6
--- /dev/null
+++ b/src/assets/icons/icon-poi.png
Binary files differ
diff --git a/src/components/Map/leafletMap.vue b/src/components/Map/leafletMap.vue
index c8b0b6f..e1150e9 100644
--- a/src/components/Map/leafletMap.vue
+++ b/src/components/Map/leafletMap.vue
@@ -1,25 +1,21 @@
 <template>
-  <div style="margin-top: -10px">
+  <div style="margin-top: -30px; margin-bottom: -10px;">
     <el-row :gutter="20">
-      <div v-show="showpoi">
-        <el-col :span="3">
-          <el-input v-model="keywords" size="small" type="text" placeholder="兴趣点关键字" clearable />
-        </el-col>
-        <el-col :span="5">
-          <el-button type="primary" size="small" @click="queryOnMap">查询</el-button>
-          <el-button type="info" size="small" @click="clearMap"> 清除地图 </el-button>
-        </el-col>
-      </div>
+      <el-col v-show="showpoi" :span="8">
+        <el-input v-model="keywords" size="small" type="text" placeholder="兴趣点关键字" clearable style="width: 50%" />
+        <el-button type="primary" size="small" @click="queryOnMap">查询</el-button>
+        <el-button type="info" size="small" @click="clearMap"> 清除地图 </el-button>
+      </el-col>
 
-      <el-col :span="6" :offset="8" style="text-align: right;">
+      <el-col :span="8" style="text-align: right">
         <el-radio-group v-model="queryEventSwitch" size="small" @change="switchEventOrComponent">
           <el-radio-button label="1">事件定位</el-radio-button>
           <el-radio-button label="0">部件定位</el-radio-button>
-          <el-radio-button v-show="showpoi" label="2">兴趣点属性</el-radio-button>
+          <!--          <el-radio-button v-show="showpoi" label="2">兴趣点属性</el-radio-button>-->
         </el-radio-group>
       </el-col>
 
-      <el-col v-if="queryEventSwitch === '0'" :span="10" :offset="0" style="text-align: right;">
+      <el-col v-if="queryEventSwitch === '0'" :span="8" style="text-align: right;">
         <el-select v-model="form.componentId" placeholder="选择部件" clearable value="" size="small">
           <el-option
             v-for="item in compListOpts"
@@ -30,7 +26,7 @@
         <el-button type="primary" size="small" @click="checkComponentPoint"> 部件提交 </el-button>
       </el-col>
 
-      <el-col v-if="queryEventSwitch === '1'" :span="10" :offset="0" style="text-align: right;">
+      <el-col v-if="queryEventSwitch === '1'" :span="8" :offset="0" style="text-align: right;">
         <el-button type="primary" size="small" @click="checkEventPoint"> 事件提交 </el-button>
       </el-col>
     </el-row>
@@ -42,18 +38,40 @@
 <script>
 import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import { mapConfig, serverConfig } from './ArcGISConfig'
+import { mapGetters } from 'vuex'
+import { merchantListPage } from '@/api/geoCoding/geoCoding'
+
 const esri = require('esri-leaflet')
 
+const icon = L.icon({
+  iconUrl: require('@/assets/icons/icon-position.png'),
+  iconSize: [32, 32],
+  iconAnchor: [16, 32],
+  popupAnchor: [0, -32]
+})
+
+const poiIcon = L.icon({
+  iconUrl: require('@/assets/icons/icon-poi.png'),
+  iconSize: [16, 16],
+  iconAnchor: [8, 16],
+  popupAnchor: [0, -16]
+})
+
+const deltaLng10 = 0.00002536 // 10米范围经度值偏移量（大约）
+const deltaLat10 = 0.00002256 // 10米范围纬度值偏移量（大约）
+
 export default {
   name: 'LeafletMap',
   data() {
     return {
       map: null,
-      markers: [],
+      baseLayer: [],
+      markers: [], // 选点
+      pois: [], // 兴趣点结果
       layers: {
         bjPoint: '', // 部件点图层
-        grid: '' // 单元网格图层
+        grid: '', // 单元网格图层
+        shopPoint: '' // 商铺图层
       },
       form: {
         longitude: '', // 定位点经度
@@ -64,23 +82,33 @@
         componentId: '', // 部件ID
         componentName: '' // 部件名称
       }, // 主页面返回值
-      showpoi: false,
+      showpoi: true,
       keywords: '', // 查询关键字
+      limit: 100, // 兴趣点查询的最大结果数
       showEventPointPopup: true, // 是否显示事部件的popup
       queryEventSwitch: '1', // 1==查询事件；0==查询部件
       compListOpts: [] // 部件选择下拉框option
     }
   },
+  computed: {
+    ...mapGetters([
+      'baseUrl',
+      'partsUrl',
+      'mapUrl',
+      'gridUrl',
+      'partsAllUrl'
+    ])
+  },
   mounted() {
     this.initMap()
   },
   methods: {
     initMap() {
-      const map = L.map('map', {
-        minZoom: 13,
-        // maxZoom: 18,
-        center: [27.755, 116.08],
-        zoom: 16,
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: 14,
+        maxZoom: 25,
+        center: this.baseConfig.center,
+        zoom: this.baseConfig.zoom,
         zoomControl: false,
         attributionControl: false,
         crs: L.CRS.EPSG3857
@@ -89,135 +117,181 @@
       this.map = map // data上需要挂载
       window.map = map
 
-      esri.dynamicMapLayer({
-        url: serverConfig.mapUrlBase
-      }).addTo(map)
-
+      // 加载图层
       this.addLayers()
 
       const that = this
       map.on('click', function(e) {
-
-        console.log('e', e)
-        console.log('e.latlng', e.latlng)
-        console.log('queryEventSwitch', that.queryEventSwitch)
         that.clearPoints()
 
         // 加载定位点
         if (that.showEventPointPopup) {
-          const icon = L.icon({
-            iconUrl: require('../../assets/icons/icon-position.png'),
-            iconSize: [35, 35]
-          })
           const pos = L.marker(e.latlng, {
             icon: icon
           })
           that.markers.push(pos)
           that.map.addLayer(pos)
 
-          // 查询事件或者部件
-          if (that.queryEventSwitch === '1') {
-            // 事件定位
-            // 1查询底图得到所在网格与所在社区
-            const query = that.layers.grid.query()
-            query.nearby(e.latlng, 10)
-            query.run(function(error, featureCollection, response) {
-              if (error) {
-                console.log(error)
-                return
-              }
-              const result = featureCollection.features[0].properties
-              // 赋值
-              that.form.longitude = e.latlng.lng
-              that.form.latitude = e.latlng.lat
-              that.form.gridId = result.CommuId
-              that.form.communityId = result.CommuId
-              that.form.communityName = result.CommuName
-
-              pos.bindPopup('坐标：[' + that.form.longitude.toFixed(4) + ', ' + that.form.latitude.toFixed(4) + ']' + '<p>' + '所在社区：' + result.CommuName).openPopup()
-            })
-          } else if (that.queryEventSwitch === '0') {
-            var latlngs = []
-            var p1 = that.getLonAndLat(e.latlng.lng, e.latlng.lat, 0, 2.5)
-            latlngs.push([p1.lat, p1.lon])
-            var p2 = that.getLonAndLat(e.latlng.lng, e.latlng.lat, 90, 2.5)
-            latlngs.push([p2.lat, p2.lon])
-            var p3 = that.getLonAndLat(e.latlng.lng, e.latlng.lat, 180, 2.5)
-            latlngs.push([p3.lat, p3.lon])
-            var p4 = that.getLonAndLat(e.latlng.lng, e.latlng.lat, 270, 2.5)
-            latlngs.push([p4.lat, p4.lon])
-
-            var polyline = L.polygon(latlngs)
-            const bjQuery = that.layers.bjPoint.query()
-            bjQuery.within(polyline)
-            bjQuery.run(function(error, featureCollection, response) {
-              if (error) {
-                console.log(error)
-                return
-              }
-              if (featureCollection.features.length > 0) {
-                const result = featureCollection.features
-                console.log(result)
-                // 赋值
-                that.compListOpts = []
-                let content = ''
-                result.forEach((item, index) => {
-                  content += '<p>部件' + (index + 1) + '：' + item.properties.大类名称 + '-' + item.properties.小类名称 + '-' + item.properties.编码
-                  const comp = {}
-                  comp.name = '部件' + (index + 1) + '：' + item.properties.大类名称 + '-' + item.properties.小类名称 + '-' + item.properties.编码
-                  comp.value = item.properties.编码
-                  that.compListOpts.push(comp)
-                })
-
-                pos.bindPopup('坐标：[' + e.latlng.lng.toFixed(4) + ', ' + e.latlng.lat.toFixed(4) + ']，附近5米的部件有：' + content).openPopup()
-
-                const query = that.layers.grid.query()
-                query.nearby(e.latlng, 10)
-                query.run(function(error, featureCollection, response) {
-                  if (error) {
-                    console.log(error)
-                    return
-                  }
-                  const result = featureCollection.features[0].properties
-                  // 赋值
-                  that.form.longitude = e.latlng.lng
-                  that.form.latitude = e.latlng.lat
-                  that.form.gridId = result.CommuId
-                  that.form.communityId = result.CommuId
-                  that.form.communityName = result.CommuName
-                })
-              } else {
-                that.$message({
-                  message: '没有查询到部件，请重新定位',
-                  type: 'warning'
-                })
-              }
-            }
-            )
+          // 飞到定位点
+          let zoom = that.map.getZoom()
+          if (zoom < 18) {
+            zoom = 18
           }
+          that.map.flyTo(e.latlng, zoom)
+
+          // 查询所点的网格
+          const query = that.layers.grid.query()
+          query.nearby(e.latlng, 10)
+          query.run(function(error, featureCollection, response) {
+            if (error) {
+              console.log(error)
+              return
+            }
+            const result = featureCollection.features[0].properties
+            // 赋值
+            that.form.longitude = e.latlng.lng
+            that.form.latitude = e.latlng.lat
+            that.form.gridId = result.GBID
+            that.form.communityId = result.GBID.substring(0, 12)
+            that.form.communityName = result.Note
+
+            if (that.queryEventSwitch === '1') {
+              // 事件定位
+              // 弹出事件点位信息
+              const popupStr = '<div class="popup-div">' +
+                '<div class="popup-title">事件点</div>' +
+                '<div class="dashed-line"></div>' +
+                '<div class="popup-item"><label>坐标</label>' + that.form.longitude.toFixed(4) + ', ' + that.form.latitude.toFixed(4) + '</div>' +
+                '<div class="popup-item"><label>所在社区</label>' + that.form.communityName + '</div>' +
+                '<div class="popup-item"><label>网格编号</label>' + that.form.gridId + '</div>' +
+                '</div>'
+
+              pos.bindPopup(popupStr).openPopup()
+            } else if (that.queryEventSwitch === '0') {
+              // 部件定位
+              // 1构建部件查询多边形，上下左右四个点
+              const latlngs = []
+              const p1 = [e.latlng.lat + deltaLat10, e.latlng.lng] // 上方点
+              const p2 = [e.latlng.lat, e.latlng.lng + deltaLng10] // 右侧点
+              const p3 = [e.latlng.lat - deltaLat10, e.latlng.lng] // 下方点
+              const p4 = [e.latlng.lat, e.latlng.lng - deltaLng10] // 左侧点
+              latlngs.push(p1)
+              latlngs.push(p2)
+              latlngs.push(p3)
+              latlngs.push(p4)
+
+              const polyline = L.polygon(latlngs)
+              const bjQuery = that.layers.bjPoint.query()
+              bjQuery.within(polyline)
+              bjQuery.run(function(error, featureCollection, response) {
+                if (error) {
+                  console.log(error)
+                  return
+                }
+
+                // 查询到结果
+                if (featureCollection.features.length > 0) {
+                  const result = featureCollection.features
+                  // 赋值
+                  that.compListOpts = []
+
+                  // 构建弹出窗口信息
+                  let popupStr = '<div class="popup-div">' +
+                    '<div class="popup-title">部件</div>' +
+                    '<div class="dashed-line"></div>' +
+                    '<div class="popup-item">坐标[' + e.latlng.lng.toFixed(4) + ', ' + e.latlng.lat.toFixed(4) + ']附近的部件有</div>' +
+                    '<div class="popup-item"><label>所在社区</label>' + that.form.communityName + '</div>' +
+                    '<div class="popup-item"><label>网格编号</label>' + that.form.gridId + '</div>'
+
+                  result.forEach((item, index) => {
+                    popupStr += '<div class="popup-subitem"><label style="padding-right: 5px;">部件' + (index + 1) + '</label>' + item.properties.dl + '/' + item.properties.xl + '[' + item.properties.objid + ']</div>'
+                    const comp = {}
+                    comp.name = '部件' + (index + 1) + '：' + item.properties.dl + '/' + item.properties.xl + '[' + item.properties.objid + ']'
+                    comp.value = item.properties.objid
+                    that.compListOpts.push(comp)
+                  })
+
+                  popupStr += '</div>'
+                  pos.bindPopup(popupStr).openPopup()
+                } else {
+                  that.$message({ message: '没有查询到部件，请重新定位', type: 'warning' })
+                }
+              })
+            }
+          })
         }
       })
     },
     addLayers() {
+      // 加载天地图底图和标注
+      this.baseLayer.push(L.tileLayer(this.baseConfig.mapUrl).addTo(this.map))
+      this.baseLayer.push(L.tileLayer(this.baseConfig.labelUrl).addTo(this.map))
+
+      // 加载底图
+      esri.dynamicMapLayer({
+        url: `${this.baseUrl}${this.mapUrl}`,
+        zIndex: 1
+      }).addTo(this.map)
+
+      // 初始化部件图层（不分层），待切换到部件定位时加载
       this.layers.bjPoint = esri.featureLayer({
-        url: serverConfig.mapUrlBj + '/0'
+        url: `${this.baseUrl}${this.partsAllUrl}`,
+        minZoom: 19
       })
-      this.layers.grid = esri.featureLayer({
-        url: serverConfig.mapUrlBase + '/16'
-      })
-      this.map.addLayer(this.layers.bjPoint)
-      this.map.addLayer(this.layers.grid)
     },
     switchEventOrComponent: function() {
       // 如果选中的是事件定位（1）或部件定位（0），点击地图时弹出事件或者部件的popup；否则（2以上）显示兴趣点结果的属性popup
       this.showEventPointPopup = this.queryEventSwitch < 2
       this.clearPoints()
+
+      if (this.queryEventSwitch === '0') {
+        // 加载和显示部件图层
+        this.map.addLayer(this.layers.bjPoint)
+        // 清空部件选择的列表
+        this.compListOpts = []
+      } else {
+        this.map.removeLayer(this.layers.bjPoint)
+      }
     },
     clearPoints() {
       const that = this
       this.markers.forEach(marker => {
         that.map.removeLayer(marker)
       })
+      this.pois.forEach(marker => {
+        that.map.removeLayer(marker)
+      })
+    },
+    queryOnMap: function() {
+      const that = this
+      merchantListPage({
+        keyword: this.keywords,
+        limit: this.limit
+      }).then(response => {
+        if (response.code === 200) {
+          console.log(response)
+          this.clearMap()
+          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 {
+            data.rows.forEach(item => {
+              const popupStr = '<div class="popup-div">' +
+                '<div class="popup-title">兴趣点</div>' +
+                '<div class="dashed-line"></div>' +
+                '<div class="popup-item"><label>名称</label>' + item.merchantName + '</div>' +
+                '<div class="popup-item"><label>详细地址</label>' + item.address + '</div>' +
+                '</div>'
+              const poi = L.marker([item.pointY, item.pointX], { icon: poiIcon })
+              poi.bindPopup(popupStr).openPopup()
+              that.pois.push(poi)
+              that.map.addLayer(poi)
+            })
+          }
+        }
+      })
     },
     // 返回事件定位的结果
     checkEventPoint: function() {
@@ -258,72 +332,52 @@
       this.form.gridId = '' // 单元网格ID
       this.form.componentId = '' // 部件ID
       this.form.componentName = '' // 部件名称
-    },
-    numberToRadius(t) {
-      return (t * Math.PI) / 180
-    },
-    numberToDegree(t) {
-      return (180 * t) / Math.PI
-    },
-    /**
-     * 根据一个经纬度及距离角度，算出另外一个经纬度
-     * @param {*} lon 经度 113.3960698
-     * @param {*} lat 纬度 22.941386
-     * @param {*} brng 方位角 45 ---- 正北方：000°或360° 正东方：090° 正南方：180° 正西方：270°
-     * @param {*} dist 90000距离(米)
-     */
-    getLonAndLat(lon, lat, brng, dist) {
-      // 大地坐标系资料WGS-84 长半径a=6378137 短半径b=6356752.3142 扁率f=1/298.2572236
-      var a = 6378137
-      var b = 6356752.3142
-      var f = 1 / 298.257223563
-      var lon1 = lon * 1
-      var lat1 = lat * 1
-      var s = dist
-      var alpha1 = this.numberToRadius(brng)
-      var sinAlpha1 = Math.sin(alpha1)
-      var cosAlpha1 = Math.cos(alpha1)
-      var tanU1 = (1 - f) * Math.tan(this.numberToRadius(lat1))
-      var cosU1 = 1 / Math.sqrt((1 + tanU1 * tanU1)), sinU1 = tanU1 * cosU1
-      var sigma1 = Math.atan2(tanU1, cosAlpha1)
-      var sinAlpha = cosU1 * sinAlpha1
-      var cosSqAlpha = 1 - sinAlpha * sinAlpha
-      var uSq = cosSqAlpha * (a * a - b * b) / (b * b)
-      var A = 1 + uSq / 16384 * (4096 + uSq * (-768 + uSq * (320 - 175 * uSq)))
-      var B = uSq / 1024 * (256 + uSq * (-128 + uSq * (74 - 47 * uSq)))
-      var sigma = s / (b * A), sigmaP = 2 * Math.PI
-      while (Math.abs(sigma - sigmaP) > 1e-12) {
-        var cos2SigmaM = Math.cos(2 * sigma1 + sigma)
-        var sinSigma = Math.sin(sigma)
-        var cosSigma = Math.cos(sigma)
-        var deltaSigma = B * sinSigma * (cos2SigmaM + B / 4 * (cosSigma * (-1 + 2 * cos2SigmaM * cos2SigmaM) -
-          B / 6 * cos2SigmaM * (-3 + 4 * sinSigma * sinSigma) * (-3 + 4 * cos2SigmaM * cos2SigmaM)))
-        sigmaP = sigma
-        sigma = s / (b * A) + deltaSigma
-      }
-      var tmp = sinU1 * sinSigma - cosU1 * cosSigma * cosAlpha1
-      var lat2 = Math.atan2(sinU1 * cosSigma + cosU1 * sinSigma * cosAlpha1, (1 - f) * Math.sqrt(sinAlpha * sinAlpha + tmp * tmp))
-      var lambda = Math.atan2(sinSigma * sinAlpha1, cosU1 * cosSigma - sinU1 * sinSigma * cosAlpha1)
-      var C = f / 16 * cosSqAlpha * (4 + f * (4 - 3 * cosSqAlpha))
-      var L = lambda - (1 - C) * f * sinAlpha * (sigma + C * sinSigma * (cos2SigmaM + C * cosSigma * (-1 + 2 * cos2SigmaM * cos2SigmaM)))
-      var revAz = Math.atan2(sinAlpha, -tmp) // final bearing
-      var lonLatObj = { lon: lon1 + this.numberToDegree(L), lat: this.numberToDegree(lat2) }
-      return lonLatObj
     }
   }
 }
 </script>
 
 <style scoped>
-  @import 'https://js.arcgis.com/4.13/esri/css/main.css';
   .baseMap {
-    height:60vh;
+    height: 65vh;
     width: 100%;
-    margin-top: 25px;
+    margin-top: 10px;
     border: 1px solid #DCDCDC;
     border-radius: 4px;
   }
-  .leaflet-container {
-    background: #fff0;
+</style>
+
+<style>
+  .leaflet-container a.leaflet-popup-close-button {
+    top: 5px; /* 修改弹窗关闭按钮样式 */
+    right: 10px; /* 修改弹窗关闭按钮样式 */
+  }
+
+  .leaflet-popup-content .popup-div {
+    font-size: 15px;
+    padding: 6px;
+  }
+
+  .leaflet-popup-content .popup-title {
+    font-weight: bold;
+  }
+
+  .leaflet-popup-content .dashed-line {
+    border-bottom: 1px dashed #dddddd;
+    margin: 10px -10px;
+  }
+
+  .leaflet-popup-content .popup-item {
+    padding-bottom: 6px;
+  }
+
+  .leaflet-popup-content .popup-item label {
+    font-weight: bold;
+    padding-right: 15px;
+  }
+
+  .leaflet-popup-content .popup-subitem {
+    padding-bottom: 6px;
+    font-size: 12px;
   }
 </style>
diff --git a/src/components/Map/leafletMapRead.vue b/src/components/Map/leafletMapRead.vue
index dd22198..edcd37d 100644
--- a/src/components/Map/leafletMapRead.vue
+++ b/src/components/Map/leafletMapRead.vue
@@ -7,7 +7,7 @@
 <script>
 import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import { mapConfig, serverConfig } from './ArcGISConfig'
+import { mapGetters } from 'vuex'
 const esri = require('esri-leaflet')
 export default {
   name: 'LeafletMapRead',
@@ -23,10 +23,20 @@
   },
   data() {
     return {
+      baseLayer: [],
       mapLoading: false,
       map: null
     }
   },
+  computed: {
+    ...mapGetters([
+      'baseUrl',
+      'partsUrl',
+      'mapUrl',
+      'gridUrl',
+      'partsAllUrl'
+    ])
+  },
   mounted() {
     this.initMap()
     this.addMarker()
@@ -36,9 +46,9 @@
       this.mapLoading = true
       const map = L.map('map', {
         minZoom: 13,
-        // maxZoom: 18,
-        center: [27.755, 116.08],
-        zoom: 16,
+        maxZoom: 24,
+        center: this.baseConfig.center,
+        zoom: this.baseConfig.zoom,
         zoomControl: false,
         attributionControl: false,
         crs: L.CRS.EPSG3857
@@ -47,45 +57,30 @@
       this.map = map // data上需要挂载
       window.map = map
 
+      // 加载天地图底图和标注
+      this.baseLayer.push(L.tileLayer(this.baseConfig.mapUrl).addTo(map))
+      this.baseLayer.push(L.tileLayer(this.baseConfig.labelUrl).addTo(map))
+
       esri.dynamicMapLayer({
-        url: serverConfig.mapUrlBase,
+        url: `${this.baseUrl}${this.mapUrl}`,
         opacity: 1,
         f: 'image'
       }).addTo(map)
 
-      // esri.tiledMapLayer({
-      //   url: serverConfig.mapUrlBase,
-      //   maxZoom: 15,
-      //   f: 'image'
-      // }).addTo(map)
-
-      // for (let i = 0; i < 24; i++) {
-      //   esri.featureLayer({
-      //     url: serverConfig.mapUrlBase + '/' + i
-      //     // minZoom: 4, // 最小缩放等级
-      //     // maxZoom: 21// 最大缩放等级
-      //   }).addTo(map)
-      // }
-
-      esri.featureLayer({
-        url: serverConfig.mapUrlBj + '/0'
-      }).addTo(map)
-      esri.featureLayer({
-        url: serverConfig.mapUrlBase + '/16'
-      }).addTo(map)
       this.mapLoading = false
     },
 
     addMarker() {
       const icon = L.icon({
-        iconUrl: require('../../assets/icons/icon-position.png'),
-        iconSize: [35, 35],
-        iconAnchor: [17.5, 35]
+        iconUrl: require('@/assets/icons/icon-position.png'),
+        iconSize: [32, 32],
+        iconAnchor: [16, 32],
+        popupAnchor: [0, -32]
       })
       const latlng = L.latLng([this.latitude, this.longitude])
       const feat = L.marker(latlng, { icon: icon })
       feat.addTo(this.map)
-      this.map.setView({ lat: this.latitude, lng: this.longitude }, 16)
+      this.map.setView({ lat: this.latitude, lng: this.longitude }, 18)
     }
   }
 }
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 2f77b38..134cb1e 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -31,12 +31,12 @@
         name: 'TimeLimit',
         meta: { title: '阶段时限', icon: '', permission: ['/timeLimit'] }
       },
-      {
-        path: '/caseList',
-        component: () => import('@/views/seo/seo'),
-        name: 'CaseList',
-        meta: { title: '综合查询', icon: '', permission: ['/caseList'] }
-      },
+      // {
+      //   path: '/caseList',
+      //   component: () => import('@/views/seo/seo'),
+      //   name: 'CaseList',
+      //   meta: { title: '综合查询', icon: '', permission: ['/caseList'] }
+      // },
       {
         path: '/caseType',
         component: () => import('@/views/busAdmin/caseType/listCaseType.vue'),
diff --git a/src/store/getters.js b/src/store/getters.js
index 57e8aac..d28b64f 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -30,7 +30,10 @@
   partsUrl: state => state.map.partsUrl, // 部件分层地址
   partsEditUrl: state => state.map.partsEditUrl, // 部件分层地址
   partsAllUrl: state => state.map.partsAllUrl, // 部件不分层地址
+  shopUrl: state => state.map.shopUrl, // 部件不分层地址
   mapUrl: state => state.map.mapUrl, // 底图地址
+  mapDtUrl: state => state.map.mapDtUrl, // 无网格底图地址
+  gridUrl: state => state.map.gridUrl, // 网格图层
   editUrl: state => state.map.editUrl // 编辑地图地址
 }
 export default getters

diff --git a/src/assets/icons/icon-poi.png b/src/assets/icons/icon-poi.png
new file mode 100644
index 0000000..364f2f6
--- /dev/null
+++ b/src/assets/icons/icon-poi.png
Binary files differ
diff --git a/src/components/Map/leafletMap.vue b/src/components/Map/leafletMap.vue
index c8b0b6f..e1150e9 100644
--- a/src/components/Map/leafletMap.vue
+++ b/src/components/Map/leafletMap.vue
@@ -1,25 +1,21 @@
 <template>
-  <div style="margin-top: -10px">
+  <div style="margin-top: -30px; margin-bottom: -10px;">
     <el-row :gutter="20">
-      <div v-show="showpoi">
-        <el-col :span="3">
-          <el-input v-model="keywords" size="small" type="text" placeholder="兴趣点关键字" clearable />
-        </el-col>
-        <el-col :span="5">
-          <el-button type="primary" size="small" @click="queryOnMap">查询</el-button>
-          <el-button type="info" size="small" @click="clearMap"> 清除地图 </el-button>
-        </el-col>
-      </div>
+      <el-col v-show="showpoi" :span="8">
+        <el-input v-model="keywords" size="small" type="text" placeholder="兴趣点关键字" clearable style="width: 50%" />
+        <el-button type="primary" size="small" @click="queryOnMap">查询</el-button>
+        <el-button type="info" size="small" @click="clearMap"> 清除地图 </el-button>
+      </el-col>
 
-      <el-col :span="6" :offset="8" style="text-align: right;">
+      <el-col :span="8" style="text-align: right">
         <el-radio-group v-model="queryEventSwitch" size="small" @change="switchEventOrComponent">
           <el-radio-button label="1">事件定位</el-radio-button>
           <el-radio-button label="0">部件定位</el-radio-button>
-          <el-radio-button v-show="showpoi" label="2">兴趣点属性</el-radio-button>
+          <!--          <el-radio-button v-show="showpoi" label="2">兴趣点属性</el-radio-button>-->
         </el-radio-group>
       </el-col>
 
-      <el-col v-if="queryEventSwitch === '0'" :span="10" :offset="0" style="text-align: right;">
+      <el-col v-if="queryEventSwitch === '0'" :span="8" style="text-align: right;">
         <el-select v-model="form.componentId" placeholder="选择部件" clearable value="" size="small">
           <el-option
             v-for="item in compListOpts"
@@ -30,7 +26,7 @@
         <el-button type="primary" size="small" @click="checkComponentPoint"> 部件提交 </el-button>
       </el-col>
 
-      <el-col v-if="queryEventSwitch === '1'" :span="10" :offset="0" style="text-align: right;">
+      <el-col v-if="queryEventSwitch === '1'" :span="8" :offset="0" style="text-align: right;">
         <el-button type="primary" size="small" @click="checkEventPoint"> 事件提交 </el-button>
       </el-col>
     </el-row>
@@ -42,18 +38,40 @@
 <script>
 import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import { mapConfig, serverConfig } from './ArcGISConfig'
+import { mapGetters } from 'vuex'
+import { merchantListPage } from '@/api/geoCoding/geoCoding'
+
 const esri = require('esri-leaflet')
 
+const icon = L.icon({
+  iconUrl: require('@/assets/icons/icon-position.png'),
+  iconSize: [32, 32],
+  iconAnchor: [16, 32],
+  popupAnchor: [0, -32]
+})
+
+const poiIcon = L.icon({
+  iconUrl: require('@/assets/icons/icon-poi.png'),
+  iconSize: [16, 16],
+  iconAnchor: [8, 16],
+  popupAnchor: [0, -16]
+})
+
+const deltaLng10 = 0.00002536 // 10米范围经度值偏移量（大约）
+const deltaLat10 = 0.00002256 // 10米范围纬度值偏移量（大约）
+
 export default {
   name: 'LeafletMap',
   data() {
     return {
       map: null,
-      markers: [],
+      baseLayer: [],
+      markers: [], // 选点
+      pois: [], // 兴趣点结果
       layers: {
         bjPoint: '', // 部件点图层
-        grid: '' // 单元网格图层
+        grid: '', // 单元网格图层
+        shopPoint: '' // 商铺图层
       },
       form: {
         longitude: '', // 定位点经度
@@ -64,23 +82,33 @@
         componentId: '', // 部件ID
         componentName: '' // 部件名称
       }, // 主页面返回值
-      showpoi: false,
+      showpoi: true,
       keywords: '', // 查询关键字
+      limit: 100, // 兴趣点查询的最大结果数
       showEventPointPopup: true, // 是否显示事部件的popup
       queryEventSwitch: '1', // 1==查询事件；0==查询部件
       compListOpts: [] // 部件选择下拉框option
     }
   },
+  computed: {
+    ...mapGetters([
+      'baseUrl',
+      'partsUrl',
+      'mapUrl',
+      'gridUrl',
+      'partsAllUrl'
+    ])
+  },
   mounted() {
     this.initMap()
   },
   methods: {
     initMap() {
-      const map = L.map('map', {
-        minZoom: 13,
-        // maxZoom: 18,
-        center: [27.755, 116.08],
-        zoom: 16,
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: 14,
+        maxZoom: 25,
+        center: this.baseConfig.center,
+        zoom: this.baseConfig.zoom,
         zoomControl: false,
         attributionControl: false,
         crs: L.CRS.EPSG3857
@@ -89,135 +117,181 @@
       this.map = map // data上需要挂载
       window.map = map
 
-      esri.dynamicMapLayer({
-        url: serverConfig.mapUrlBase
-      }).addTo(map)
-
+      // 加载图层
       this.addLayers()
 
       const that = this
       map.on('click', function(e) {
-
-        console.log('e', e)
-        console.log('e.latlng', e.latlng)
-        console.log('queryEventSwitch', that.queryEventSwitch)
         that.clearPoints()
 
         // 加载定位点
         if (that.showEventPointPopup) {
-          const icon = L.icon({
-            iconUrl: require('../../assets/icons/icon-position.png'),
-            iconSize: [35, 35]
-          })
           const pos = L.marker(e.latlng, {
             icon: icon
           })
           that.markers.push(pos)
           that.map.addLayer(pos)
 
-          // 查询事件或者部件
-          if (that.queryEventSwitch === '1') {
-            // 事件定位
-            // 1查询底图得到所在网格与所在社区
-            const query = that.layers.grid.query()
-            query.nearby(e.latlng, 10)
-            query.run(function(error, featureCollection, response) {
-              if (error) {
-                console.log(error)
-                return
-              }
-              const result = featureCollection.features[0].properties
-              // 赋值
-              that.form.longitude = e.latlng.lng
-              that.form.latitude = e.latlng.lat
-              that.form.gridId = result.CommuId
-              that.form.communityId = result.CommuId
-              that.form.communityName = result.CommuName
-
-              pos.bindPopup('坐标：[' + that.form.longitude.toFixed(4) + ', ' + that.form.latitude.toFixed(4) + ']' + '<p>' + '所在社区：' + result.CommuName).openPopup()
-            })
-          } else if (that.queryEventSwitch === '0') {
-            var latlngs = []
-            var p1 = that.getLonAndLat(e.latlng.lng, e.latlng.lat, 0, 2.5)
-            latlngs.push([p1.lat, p1.lon])
-            var p2 = that.getLonAndLat(e.latlng.lng, e.latlng.lat, 90, 2.5)
-            latlngs.push([p2.lat, p2.lon])
-            var p3 = that.getLonAndLat(e.latlng.lng, e.latlng.lat, 180, 2.5)
-            latlngs.push([p3.lat, p3.lon])
-            var p4 = that.getLonAndLat(e.latlng.lng, e.latlng.lat, 270, 2.5)
-            latlngs.push([p4.lat, p4.lon])
-
-            var polyline = L.polygon(latlngs)
-            const bjQuery = that.layers.bjPoint.query()
-            bjQuery.within(polyline)
-            bjQuery.run(function(error, featureCollection, response) {
-              if (error) {
-                console.log(error)
-                return
-              }
-              if (featureCollection.features.length > 0) {
-                const result = featureCollection.features
-                console.log(result)
-                // 赋值
-                that.compListOpts = []
-                let content = ''
-                result.forEach((item, index) => {
-                  content += '<p>部件' + (index + 1) + '：' + item.properties.大类名称 + '-' + item.properties.小类名称 + '-' + item.properties.编码
-                  const comp = {}
-                  comp.name = '部件' + (index + 1) + '：' + item.properties.大类名称 + '-' + item.properties.小类名称 + '-' + item.properties.编码
-                  comp.value = item.properties.编码
-                  that.compListOpts.push(comp)
-                })
-
-                pos.bindPopup('坐标：[' + e.latlng.lng.toFixed(4) + ', ' + e.latlng.lat.toFixed(4) + ']，附近5米的部件有：' + content).openPopup()
-
-                const query = that.layers.grid.query()
-                query.nearby(e.latlng, 10)
-                query.run(function(error, featureCollection, response) {
-                  if (error) {
-                    console.log(error)
-                    return
-                  }
-                  const result = featureCollection.features[0].properties
-                  // 赋值
-                  that.form.longitude = e.latlng.lng
-                  that.form.latitude = e.latlng.lat
-                  that.form.gridId = result.CommuId
-                  that.form.communityId = result.CommuId
-                  that.form.communityName = result.CommuName
-                })
-              } else {
-                that.$message({
-                  message: '没有查询到部件，请重新定位',
-                  type: 'warning'
-                })
-              }
-            }
-            )
+          // 飞到定位点
+          let zoom = that.map.getZoom()
+          if (zoom < 18) {
+            zoom = 18
           }
+          that.map.flyTo(e.latlng, zoom)
+
+          // 查询所点的网格
+          const query = that.layers.grid.query()
+          query.nearby(e.latlng, 10)
+          query.run(function(error, featureCollection, response) {
+            if (error) {
+              console.log(error)
+              return
+            }
+            const result = featureCollection.features[0].properties
+            // 赋值
+            that.form.longitude = e.latlng.lng
+            that.form.latitude = e.latlng.lat
+            that.form.gridId = result.GBID
+            that.form.communityId = result.GBID.substring(0, 12)
+            that.form.communityName = result.Note
+
+            if (that.queryEventSwitch === '1') {
+              // 事件定位
+              // 弹出事件点位信息
+              const popupStr = '<div class="popup-div">' +
+                '<div class="popup-title">事件点</div>' +
+                '<div class="dashed-line"></div>' +
+                '<div class="popup-item"><label>坐标</label>' + that.form.longitude.toFixed(4) + ', ' + that.form.latitude.toFixed(4) + '</div>' +
+                '<div class="popup-item"><label>所在社区</label>' + that.form.communityName + '</div>' +
+                '<div class="popup-item"><label>网格编号</label>' + that.form.gridId + '</div>' +
+                '</div>'
+
+              pos.bindPopup(popupStr).openPopup()
+            } else if (that.queryEventSwitch === '0') {
+              // 部件定位
+              // 1构建部件查询多边形，上下左右四个点
+              const latlngs = []
+              const p1 = [e.latlng.lat + deltaLat10, e.latlng.lng] // 上方点
+              const p2 = [e.latlng.lat, e.latlng.lng + deltaLng10] // 右侧点
+              const p3 = [e.latlng.lat - deltaLat10, e.latlng.lng] // 下方点
+              const p4 = [e.latlng.lat, e.latlng.lng - deltaLng10] // 左侧点
+              latlngs.push(p1)
+              latlngs.push(p2)
+              latlngs.push(p3)
+              latlngs.push(p4)
+
+              const polyline = L.polygon(latlngs)
+              const bjQuery = that.layers.bjPoint.query()
+              bjQuery.within(polyline)
+              bjQuery.run(function(error, featureCollection, response) {
+                if (error) {
+                  console.log(error)
+                  return
+                }
+
+                // 查询到结果
+                if (featureCollection.features.length > 0) {
+                  const result = featureCollection.features
+                  // 赋值
+                  that.compListOpts = []
+
+                  // 构建弹出窗口信息
+                  let popupStr = '<div class="popup-div">' +
+                    '<div class="popup-title">部件</div>' +
+                    '<div class="dashed-line"></div>' +
+                    '<div class="popup-item">坐标[' + e.latlng.lng.toFixed(4) + ', ' + e.latlng.lat.toFixed(4) + ']附近的部件有</div>' +
+                    '<div class="popup-item"><label>所在社区</label>' + that.form.communityName + '</div>' +
+                    '<div class="popup-item"><label>网格编号</label>' + that.form.gridId + '</div>'
+
+                  result.forEach((item, index) => {
+                    popupStr += '<div class="popup-subitem"><label style="padding-right: 5px;">部件' + (index + 1) + '</label>' + item.properties.dl + '/' + item.properties.xl + '[' + item.properties.objid + ']</div>'
+                    const comp = {}
+                    comp.name = '部件' + (index + 1) + '：' + item.properties.dl + '/' + item.properties.xl + '[' + item.properties.objid + ']'
+                    comp.value = item.properties.objid
+                    that.compListOpts.push(comp)
+                  })
+
+                  popupStr += '</div>'
+                  pos.bindPopup(popupStr).openPopup()
+                } else {
+                  that.$message({ message: '没有查询到部件，请重新定位', type: 'warning' })
+                }
+              })
+            }
+          })
         }
       })
     },
     addLayers() {
+      // 加载天地图底图和标注
+      this.baseLayer.push(L.tileLayer(this.baseConfig.mapUrl).addTo(this.map))
+      this.baseLayer.push(L.tileLayer(this.baseConfig.labelUrl).addTo(this.map))
+
+      // 加载底图
+      esri.dynamicMapLayer({
+        url: `${this.baseUrl}${this.mapUrl}`,
+        zIndex: 1
+      }).addTo(this.map)
+
+      // 初始化部件图层（不分层），待切换到部件定位时加载
       this.layers.bjPoint = esri.featureLayer({
-        url: serverConfig.mapUrlBj + '/0'
+        url: `${this.baseUrl}${this.partsAllUrl}`,
+        minZoom: 19
       })
-      this.layers.grid = esri.featureLayer({
-        url: serverConfig.mapUrlBase + '/16'
-      })
-      this.map.addLayer(this.layers.bjPoint)
-      this.map.addLayer(this.layers.grid)
     },
     switchEventOrComponent: function() {
       // 如果选中的是事件定位（1）或部件定位（0），点击地图时弹出事件或者部件的popup；否则（2以上）显示兴趣点结果的属性popup
       this.showEventPointPopup = this.queryEventSwitch < 2
       this.clearPoints()
+
+      if (this.queryEventSwitch === '0') {
+        // 加载和显示部件图层
+        this.map.addLayer(this.layers.bjPoint)
+        // 清空部件选择的列表
+        this.compListOpts = []
+      } else {
+        this.map.removeLayer(this.layers.bjPoint)
+      }
     },
     clearPoints() {
       const that = this
       this.markers.forEach(marker => {
         that.map.removeLayer(marker)
       })
+      this.pois.forEach(marker => {
+        that.map.removeLayer(marker)
+      })
+    },
+    queryOnMap: function() {
+      const that = this
+      merchantListPage({
+        keyword: this.keywords,
+        limit: this.limit
+      }).then(response => {
+        if (response.code === 200) {
+          console.log(response)
+          this.clearMap()
+          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 {
+            data.rows.forEach(item => {
+              const popupStr = '<div class="popup-div">' +
+                '<div class="popup-title">兴趣点</div>' +
+                '<div class="dashed-line"></div>' +
+                '<div class="popup-item"><label>名称</label>' + item.merchantName + '</div>' +
+                '<div class="popup-item"><label>详细地址</label>' + item.address + '</div>' +
+                '</div>'
+              const poi = L.marker([item.pointY, item.pointX], { icon: poiIcon })
+              poi.bindPopup(popupStr).openPopup()
+              that.pois.push(poi)
+              that.map.addLayer(poi)
+            })
+          }
+        }
+      })
     },
     // 返回事件定位的结果
     checkEventPoint: function() {
@@ -258,72 +332,52 @@
       this.form.gridId = '' // 单元网格ID
       this.form.componentId = '' // 部件ID
       this.form.componentName = '' // 部件名称
-    },
-    numberToRadius(t) {
-      return (t * Math.PI) / 180
-    },
-    numberToDegree(t) {
-      return (180 * t) / Math.PI
-    },
-    /**
-     * 根据一个经纬度及距离角度，算出另外一个经纬度
-     * @param {*} lon 经度 113.3960698
-     * @param {*} lat 纬度 22.941386
-     * @param {*} brng 方位角 45 ---- 正北方：000°或360° 正东方：090° 正南方：180° 正西方：270°
-     * @param {*} dist 90000距离(米)
-     */
-    getLonAndLat(lon, lat, brng, dist) {
-      // 大地坐标系资料WGS-84 长半径a=6378137 短半径b=6356752.3142 扁率f=1/298.2572236
-      var a = 6378137
-      var b = 6356752.3142
-      var f = 1 / 298.257223563
-      var lon1 = lon * 1
-      var lat1 = lat * 1
-      var s = dist
-      var alpha1 = this.numberToRadius(brng)
-      var sinAlpha1 = Math.sin(alpha1)
-      var cosAlpha1 = Math.cos(alpha1)
-      var tanU1 = (1 - f) * Math.tan(this.numberToRadius(lat1))
-      var cosU1 = 1 / Math.sqrt((1 + tanU1 * tanU1)), sinU1 = tanU1 * cosU1
-      var sigma1 = Math.atan2(tanU1, cosAlpha1)
-      var sinAlpha = cosU1 * sinAlpha1
-      var cosSqAlpha = 1 - sinAlpha * sinAlpha
-      var uSq = cosSqAlpha * (a * a - b * b) / (b * b)
-      var A = 1 + uSq / 16384 * (4096 + uSq * (-768 + uSq * (320 - 175 * uSq)))
-      var B = uSq / 1024 * (256 + uSq * (-128 + uSq * (74 - 47 * uSq)))
-      var sigma = s / (b * A), sigmaP = 2 * Math.PI
-      while (Math.abs(sigma - sigmaP) > 1e-12) {
-        var cos2SigmaM = Math.cos(2 * sigma1 + sigma)
-        var sinSigma = Math.sin(sigma)
-        var cosSigma = Math.cos(sigma)
-        var deltaSigma = B * sinSigma * (cos2SigmaM + B / 4 * (cosSigma * (-1 + 2 * cos2SigmaM * cos2SigmaM) -
-          B / 6 * cos2SigmaM * (-3 + 4 * sinSigma * sinSigma) * (-3 + 4 * cos2SigmaM * cos2SigmaM)))
-        sigmaP = sigma
-        sigma = s / (b * A) + deltaSigma
-      }
-      var tmp = sinU1 * sinSigma - cosU1 * cosSigma * cosAlpha1
-      var lat2 = Math.atan2(sinU1 * cosSigma + cosU1 * sinSigma * cosAlpha1, (1 - f) * Math.sqrt(sinAlpha * sinAlpha + tmp * tmp))
-      var lambda = Math.atan2(sinSigma * sinAlpha1, cosU1 * cosSigma - sinU1 * sinSigma * cosAlpha1)
-      var C = f / 16 * cosSqAlpha * (4 + f * (4 - 3 * cosSqAlpha))
-      var L = lambda - (1 - C) * f * sinAlpha * (sigma + C * sinSigma * (cos2SigmaM + C * cosSigma * (-1 + 2 * cos2SigmaM * cos2SigmaM)))
-      var revAz = Math.atan2(sinAlpha, -tmp) // final bearing
-      var lonLatObj = { lon: lon1 + this.numberToDegree(L), lat: this.numberToDegree(lat2) }
-      return lonLatObj
     }
   }
 }
 </script>
 
 <style scoped>
-  @import 'https://js.arcgis.com/4.13/esri/css/main.css';
   .baseMap {
-    height:60vh;
+    height: 65vh;
     width: 100%;
-    margin-top: 25px;
+    margin-top: 10px;
     border: 1px solid #DCDCDC;
     border-radius: 4px;
   }
-  .leaflet-container {
-    background: #fff0;
+</style>
+
+<style>
+  .leaflet-container a.leaflet-popup-close-button {
+    top: 5px; /* 修改弹窗关闭按钮样式 */
+    right: 10px; /* 修改弹窗关闭按钮样式 */
+  }
+
+  .leaflet-popup-content .popup-div {
+    font-size: 15px;
+    padding: 6px;
+  }
+
+  .leaflet-popup-content .popup-title {
+    font-weight: bold;
+  }
+
+  .leaflet-popup-content .dashed-line {
+    border-bottom: 1px dashed #dddddd;
+    margin: 10px -10px;
+  }
+
+  .leaflet-popup-content .popup-item {
+    padding-bottom: 6px;
+  }
+
+  .leaflet-popup-content .popup-item label {
+    font-weight: bold;
+    padding-right: 15px;
+  }
+
+  .leaflet-popup-content .popup-subitem {
+    padding-bottom: 6px;
+    font-size: 12px;
   }
 </style>
diff --git a/src/components/Map/leafletMapRead.vue b/src/components/Map/leafletMapRead.vue
index dd22198..edcd37d 100644
--- a/src/components/Map/leafletMapRead.vue
+++ b/src/components/Map/leafletMapRead.vue
@@ -7,7 +7,7 @@
 <script>
 import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import { mapConfig, serverConfig } from './ArcGISConfig'
+import { mapGetters } from 'vuex'
 const esri = require('esri-leaflet')
 export default {
   name: 'LeafletMapRead',
@@ -23,10 +23,20 @@
   },
   data() {
     return {
+      baseLayer: [],
       mapLoading: false,
       map: null
     }
   },
+  computed: {
+    ...mapGetters([
+      'baseUrl',
+      'partsUrl',
+      'mapUrl',
+      'gridUrl',
+      'partsAllUrl'
+    ])
+  },
   mounted() {
     this.initMap()
     this.addMarker()
@@ -36,9 +46,9 @@
       this.mapLoading = true
       const map = L.map('map', {
         minZoom: 13,
-        // maxZoom: 18,
-        center: [27.755, 116.08],
-        zoom: 16,
+        maxZoom: 24,
+        center: this.baseConfig.center,
+        zoom: this.baseConfig.zoom,
         zoomControl: false,
         attributionControl: false,
         crs: L.CRS.EPSG3857
@@ -47,45 +57,30 @@
       this.map = map // data上需要挂载
       window.map = map
 
+      // 加载天地图底图和标注
+      this.baseLayer.push(L.tileLayer(this.baseConfig.mapUrl).addTo(map))
+      this.baseLayer.push(L.tileLayer(this.baseConfig.labelUrl).addTo(map))
+
       esri.dynamicMapLayer({
-        url: serverConfig.mapUrlBase,
+        url: `${this.baseUrl}${this.mapUrl}`,
         opacity: 1,
         f: 'image'
       }).addTo(map)
 
-      // esri.tiledMapLayer({
-      //   url: serverConfig.mapUrlBase,
-      //   maxZoom: 15,
-      //   f: 'image'
-      // }).addTo(map)
-
-      // for (let i = 0; i < 24; i++) {
-      //   esri.featureLayer({
-      //     url: serverConfig.mapUrlBase + '/' + i
-      //     // minZoom: 4, // 最小缩放等级
-      //     // maxZoom: 21// 最大缩放等级
-      //   }).addTo(map)
-      // }
-
-      esri.featureLayer({
-        url: serverConfig.mapUrlBj + '/0'
-      }).addTo(map)
-      esri.featureLayer({
-        url: serverConfig.mapUrlBase + '/16'
-      }).addTo(map)
       this.mapLoading = false
     },
 
     addMarker() {
       const icon = L.icon({
-        iconUrl: require('../../assets/icons/icon-position.png'),
-        iconSize: [35, 35],
-        iconAnchor: [17.5, 35]
+        iconUrl: require('@/assets/icons/icon-position.png'),
+        iconSize: [32, 32],
+        iconAnchor: [16, 32],
+        popupAnchor: [0, -32]
       })
       const latlng = L.latLng([this.latitude, this.longitude])
       const feat = L.marker(latlng, { icon: icon })
       feat.addTo(this.map)
-      this.map.setView({ lat: this.latitude, lng: this.longitude }, 16)
+      this.map.setView({ lat: this.latitude, lng: this.longitude }, 18)
     }
   }
 }
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 2f77b38..134cb1e 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -31,12 +31,12 @@
         name: 'TimeLimit',
         meta: { title: '阶段时限', icon: '', permission: ['/timeLimit'] }
       },
-      {
-        path: '/caseList',
-        component: () => import('@/views/seo/seo'),
-        name: 'CaseList',
-        meta: { title: '综合查询', icon: '', permission: ['/caseList'] }
-      },
+      // {
+      //   path: '/caseList',
+      //   component: () => import('@/views/seo/seo'),
+      //   name: 'CaseList',
+      //   meta: { title: '综合查询', icon: '', permission: ['/caseList'] }
+      // },
       {
         path: '/caseType',
         component: () => import('@/views/busAdmin/caseType/listCaseType.vue'),
diff --git a/src/store/getters.js b/src/store/getters.js
index 57e8aac..d28b64f 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -30,7 +30,10 @@
   partsUrl: state => state.map.partsUrl, // 部件分层地址
   partsEditUrl: state => state.map.partsEditUrl, // 部件分层地址
   partsAllUrl: state => state.map.partsAllUrl, // 部件不分层地址
+  shopUrl: state => state.map.shopUrl, // 部件不分层地址
   mapUrl: state => state.map.mapUrl, // 底图地址
+  mapDtUrl: state => state.map.mapDtUrl, // 无网格底图地址
+  gridUrl: state => state.map.gridUrl, // 网格图层
   editUrl: state => state.map.editUrl // 编辑地图地址
 }
 export default getters
diff --git a/src/store/modules/map.js b/src/store/modules/map.js
index aa2c6f8..13f5313 100644
--- a/src/store/modules/map.js
+++ b/src/store/modules/map.js
@@ -5,7 +5,10 @@
   baseUrl: '', // 服务基础地址
   partsUrl: '', // 部件分层地址
   partsAllUrl: '', // 部件不分层地址
+  shopUrl: '', // 商户图层
   mapUrl: '', // 二维底图地址
+  mapDtUrl: '', // 无网格地图
+  gridUrl: '', // 网格图层
   editUrl: '' // 编辑地图URL
 }
 const mutations = {
@@ -24,9 +27,18 @@
   SET_PARTS_ALL_URL: (state, url) => {
     state.partsAllUrl = url
   },
+  SET_SHOP_URL: (state, url) => {
+    state.shopUrl = url
+  },
   SET_MAP_URL: (state, url) => {
     state.mapUrl = url
   },
+  SET_MAPDT_URL: (state, url) => {
+    state.mapDtUrl = url
+  },
+  SET_GRID_URL: (state, url) => {
+    state.gridUrl = url
+  },
   SET_EDIT_URL: (state, url) => {
     state.editUrl = url
   }
@@ -52,8 +64,14 @@
               commit('SET_PARTS_EDIT_URL', editUrl)
             } else if (item.name === '部件地图URL') {
               commit('SET_PARTS_ALL_URL', item.url)
+            } else if (item.name === '商户图层URL') {
+              commit('SET_SHOP_URL', item.url)
             } else if (item.name === '二维地图URL') {
               commit('SET_MAP_URL', item.url)
+            } else if (item.name === '无网格地图URL') {
+              commit('SET_MAPDT_URL', item.url)
+            } else if (item.name === '网格图层URL') {
+              commit('SET_GRID_URL', item.url)
             } else if (item.name === '编辑地图URL') {
               commit('SET_EDIT_URL', item.url)
             }

diff --git a/src/assets/icons/icon-poi.png b/src/assets/icons/icon-poi.png
new file mode 100644
index 0000000..364f2f6
--- /dev/null
+++ b/src/assets/icons/icon-poi.png
Binary files differ
diff --git a/src/components/Map/leafletMap.vue b/src/components/Map/leafletMap.vue
index c8b0b6f..e1150e9 100644
--- a/src/components/Map/leafletMap.vue
+++ b/src/components/Map/leafletMap.vue
@@ -1,25 +1,21 @@
 <template>
-  <div style="margin-top: -10px">
+  <div style="margin-top: -30px; margin-bottom: -10px;">
     <el-row :gutter="20">
-      <div v-show="showpoi">
-        <el-col :span="3">
-          <el-input v-model="keywords" size="small" type="text" placeholder="兴趣点关键字" clearable />
-        </el-col>
-        <el-col :span="5">
-          <el-button type="primary" size="small" @click="queryOnMap">查询</el-button>
-          <el-button type="info" size="small" @click="clearMap"> 清除地图 </el-button>
-        </el-col>
-      </div>
+      <el-col v-show="showpoi" :span="8">
+        <el-input v-model="keywords" size="small" type="text" placeholder="兴趣点关键字" clearable style="width: 50%" />
+        <el-button type="primary" size="small" @click="queryOnMap">查询</el-button>
+        <el-button type="info" size="small" @click="clearMap"> 清除地图 </el-button>
+      </el-col>
 
-      <el-col :span="6" :offset="8" style="text-align: right;">
+      <el-col :span="8" style="text-align: right">
         <el-radio-group v-model="queryEventSwitch" size="small" @change="switchEventOrComponent">
           <el-radio-button label="1">事件定位</el-radio-button>
           <el-radio-button label="0">部件定位</el-radio-button>
-          <el-radio-button v-show="showpoi" label="2">兴趣点属性</el-radio-button>
+          <!--          <el-radio-button v-show="showpoi" label="2">兴趣点属性</el-radio-button>-->
         </el-radio-group>
       </el-col>
 
-      <el-col v-if="queryEventSwitch === '0'" :span="10" :offset="0" style="text-align: right;">
+      <el-col v-if="queryEventSwitch === '0'" :span="8" style="text-align: right;">
         <el-select v-model="form.componentId" placeholder="选择部件" clearable value="" size="small">
           <el-option
             v-for="item in compListOpts"
@@ -30,7 +26,7 @@
         <el-button type="primary" size="small" @click="checkComponentPoint"> 部件提交 </el-button>
       </el-col>
 
-      <el-col v-if="queryEventSwitch === '1'" :span="10" :offset="0" style="text-align: right;">
+      <el-col v-if="queryEventSwitch === '1'" :span="8" :offset="0" style="text-align: right;">
         <el-button type="primary" size="small" @click="checkEventPoint"> 事件提交 </el-button>
       </el-col>
     </el-row>
@@ -42,18 +38,40 @@
 <script>
 import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import { mapConfig, serverConfig } from './ArcGISConfig'
+import { mapGetters } from 'vuex'
+import { merchantListPage } from '@/api/geoCoding/geoCoding'
+
 const esri = require('esri-leaflet')
 
+const icon = L.icon({
+  iconUrl: require('@/assets/icons/icon-position.png'),
+  iconSize: [32, 32],
+  iconAnchor: [16, 32],
+  popupAnchor: [0, -32]
+})
+
+const poiIcon = L.icon({
+  iconUrl: require('@/assets/icons/icon-poi.png'),
+  iconSize: [16, 16],
+  iconAnchor: [8, 16],
+  popupAnchor: [0, -16]
+})
+
+const deltaLng10 = 0.00002536 // 10米范围经度值偏移量（大约）
+const deltaLat10 = 0.00002256 // 10米范围纬度值偏移量（大约）
+
 export default {
   name: 'LeafletMap',
   data() {
     return {
       map: null,
-      markers: [],
+      baseLayer: [],
+      markers: [], // 选点
+      pois: [], // 兴趣点结果
       layers: {
         bjPoint: '', // 部件点图层
-        grid: '' // 单元网格图层
+        grid: '', // 单元网格图层
+        shopPoint: '' // 商铺图层
       },
       form: {
         longitude: '', // 定位点经度
@@ -64,23 +82,33 @@
         componentId: '', // 部件ID
         componentName: '' // 部件名称
       }, // 主页面返回值
-      showpoi: false,
+      showpoi: true,
       keywords: '', // 查询关键字
+      limit: 100, // 兴趣点查询的最大结果数
       showEventPointPopup: true, // 是否显示事部件的popup
       queryEventSwitch: '1', // 1==查询事件；0==查询部件
       compListOpts: [] // 部件选择下拉框option
     }
   },
+  computed: {
+    ...mapGetters([
+      'baseUrl',
+      'partsUrl',
+      'mapUrl',
+      'gridUrl',
+      'partsAllUrl'
+    ])
+  },
   mounted() {
     this.initMap()
   },
   methods: {
     initMap() {
-      const map = L.map('map', {
-        minZoom: 13,
-        // maxZoom: 18,
-        center: [27.755, 116.08],
-        zoom: 16,
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: 14,
+        maxZoom: 25,
+        center: this.baseConfig.center,
+        zoom: this.baseConfig.zoom,
         zoomControl: false,
         attributionControl: false,
         crs: L.CRS.EPSG3857
@@ -89,135 +117,181 @@
       this.map = map // data上需要挂载
       window.map = map
 
-      esri.dynamicMapLayer({
-        url: serverConfig.mapUrlBase
-      }).addTo(map)
-
+      // 加载图层
       this.addLayers()
 
       const that = this
       map.on('click', function(e) {
-
-        console.log('e', e)
-        console.log('e.latlng', e.latlng)
-        console.log('queryEventSwitch', that.queryEventSwitch)
         that.clearPoints()
 
         // 加载定位点
         if (that.showEventPointPopup) {
-          const icon = L.icon({
-            iconUrl: require('../../assets/icons/icon-position.png'),
-            iconSize: [35, 35]
-          })
           const pos = L.marker(e.latlng, {
             icon: icon
           })
           that.markers.push(pos)
           that.map.addLayer(pos)
 
-          // 查询事件或者部件
-          if (that.queryEventSwitch === '1') {
-            // 事件定位
-            // 1查询底图得到所在网格与所在社区
-            const query = that.layers.grid.query()
-            query.nearby(e.latlng, 10)
-            query.run(function(error, featureCollection, response) {
-              if (error) {
-                console.log(error)
-                return
-              }
-              const result = featureCollection.features[0].properties
-              // 赋值
-              that.form.longitude = e.latlng.lng
-              that.form.latitude = e.latlng.lat
-              that.form.gridId = result.CommuId
-              that.form.communityId = result.CommuId
-              that.form.communityName = result.CommuName
-
-              pos.bindPopup('坐标：[' + that.form.longitude.toFixed(4) + ', ' + that.form.latitude.toFixed(4) + ']' + '<p>' + '所在社区：' + result.CommuName).openPopup()
-            })
-          } else if (that.queryEventSwitch === '0') {
-            var latlngs = []
-            var p1 = that.getLonAndLat(e.latlng.lng, e.latlng.lat, 0, 2.5)
-            latlngs.push([p1.lat, p1.lon])
-            var p2 = that.getLonAndLat(e.latlng.lng, e.latlng.lat, 90, 2.5)
-            latlngs.push([p2.lat, p2.lon])
-            var p3 = that.getLonAndLat(e.latlng.lng, e.latlng.lat, 180, 2.5)
-            latlngs.push([p3.lat, p3.lon])
-            var p4 = that.getLonAndLat(e.latlng.lng, e.latlng.lat, 270, 2.5)
-            latlngs.push([p4.lat, p4.lon])
-
-            var polyline = L.polygon(latlngs)
-            const bjQuery = that.layers.bjPoint.query()
-            bjQuery.within(polyline)
-            bjQuery.run(function(error, featureCollection, response) {
-              if (error) {
-                console.log(error)
-                return
-              }
-              if (featureCollection.features.length > 0) {
-                const result = featureCollection.features
-                console.log(result)
-                // 赋值
-                that.compListOpts = []
-                let content = ''
-                result.forEach((item, index) => {
-                  content += '<p>部件' + (index + 1) + '：' + item.properties.大类名称 + '-' + item.properties.小类名称 + '-' + item.properties.编码
-                  const comp = {}
-                  comp.name = '部件' + (index + 1) + '：' + item.properties.大类名称 + '-' + item.properties.小类名称 + '-' + item.properties.编码
-                  comp.value = item.properties.编码
-                  that.compListOpts.push(comp)
-                })
-
-                pos.bindPopup('坐标：[' + e.latlng.lng.toFixed(4) + ', ' + e.latlng.lat.toFixed(4) + ']，附近5米的部件有：' + content).openPopup()
-
-                const query = that.layers.grid.query()
-                query.nearby(e.latlng, 10)
-                query.run(function(error, featureCollection, response) {
-                  if (error) {
-                    console.log(error)
-                    return
-                  }
-                  const result = featureCollection.features[0].properties
-                  // 赋值
-                  that.form.longitude = e.latlng.lng
-                  that.form.latitude = e.latlng.lat
-                  that.form.gridId = result.CommuId
-                  that.form.communityId = result.CommuId
-                  that.form.communityName = result.CommuName
-                })
-              } else {
-                that.$message({
-                  message: '没有查询到部件，请重新定位',
-                  type: 'warning'
-                })
-              }
-            }
-            )
+          // 飞到定位点
+          let zoom = that.map.getZoom()
+          if (zoom < 18) {
+            zoom = 18
           }
+          that.map.flyTo(e.latlng, zoom)
+
+          // 查询所点的网格
+          const query = that.layers.grid.query()
+          query.nearby(e.latlng, 10)
+          query.run(function(error, featureCollection, response) {
+            if (error) {
+              console.log(error)
+              return
+            }
+            const result = featureCollection.features[0].properties
+            // 赋值
+            that.form.longitude = e.latlng.lng
+            that.form.latitude = e.latlng.lat
+            that.form.gridId = result.GBID
+            that.form.communityId = result.GBID.substring(0, 12)
+            that.form.communityName = result.Note
+
+            if (that.queryEventSwitch === '1') {
+              // 事件定位
+              // 弹出事件点位信息
+              const popupStr = '<div class="popup-div">' +
+                '<div class="popup-title">事件点</div>' +
+                '<div class="dashed-line"></div>' +
+                '<div class="popup-item"><label>坐标</label>' + that.form.longitude.toFixed(4) + ', ' + that.form.latitude.toFixed(4) + '</div>' +
+                '<div class="popup-item"><label>所在社区</label>' + that.form.communityName + '</div>' +
+                '<div class="popup-item"><label>网格编号</label>' + that.form.gridId + '</div>' +
+                '</div>'
+
+              pos.bindPopup(popupStr).openPopup()
+            } else if (that.queryEventSwitch === '0') {
+              // 部件定位
+              // 1构建部件查询多边形，上下左右四个点
+              const latlngs = []
+              const p1 = [e.latlng.lat + deltaLat10, e.latlng.lng] // 上方点
+              const p2 = [e.latlng.lat, e.latlng.lng + deltaLng10] // 右侧点
+              const p3 = [e.latlng.lat - deltaLat10, e.latlng.lng] // 下方点
+              const p4 = [e.latlng.lat, e.latlng.lng - deltaLng10] // 左侧点
+              latlngs.push(p1)
+              latlngs.push(p2)
+              latlngs.push(p3)
+              latlngs.push(p4)
+
+              const polyline = L.polygon(latlngs)
+              const bjQuery = that.layers.bjPoint.query()
+              bjQuery.within(polyline)
+              bjQuery.run(function(error, featureCollection, response) {
+                if (error) {
+                  console.log(error)
+                  return
+                }
+
+                // 查询到结果
+                if (featureCollection.features.length > 0) {
+                  const result = featureCollection.features
+                  // 赋值
+                  that.compListOpts = []
+
+                  // 构建弹出窗口信息
+                  let popupStr = '<div class="popup-div">' +
+                    '<div class="popup-title">部件</div>' +
+                    '<div class="dashed-line"></div>' +
+                    '<div class="popup-item">坐标[' + e.latlng.lng.toFixed(4) + ', ' + e.latlng.lat.toFixed(4) + ']附近的部件有</div>' +
+                    '<div class="popup-item"><label>所在社区</label>' + that.form.communityName + '</div>' +
+                    '<div class="popup-item"><label>网格编号</label>' + that.form.gridId + '</div>'
+
+                  result.forEach((item, index) => {
+                    popupStr += '<div class="popup-subitem"><label style="padding-right: 5px;">部件' + (index + 1) + '</label>' + item.properties.dl + '/' + item.properties.xl + '[' + item.properties.objid + ']</div>'
+                    const comp = {}
+                    comp.name = '部件' + (index + 1) + '：' + item.properties.dl + '/' + item.properties.xl + '[' + item.properties.objid + ']'
+                    comp.value = item.properties.objid
+                    that.compListOpts.push(comp)
+                  })
+
+                  popupStr += '</div>'
+                  pos.bindPopup(popupStr).openPopup()
+                } else {
+                  that.$message({ message: '没有查询到部件，请重新定位', type: 'warning' })
+                }
+              })
+            }
+          })
         }
       })
     },
     addLayers() {
+      // 加载天地图底图和标注
+      this.baseLayer.push(L.tileLayer(this.baseConfig.mapUrl).addTo(this.map))
+      this.baseLayer.push(L.tileLayer(this.baseConfig.labelUrl).addTo(this.map))
+
+      // 加载底图
+      esri.dynamicMapLayer({
+        url: `${this.baseUrl}${this.mapUrl}`,
+        zIndex: 1
+      }).addTo(this.map)
+
+      // 初始化部件图层（不分层），待切换到部件定位时加载
       this.layers.bjPoint = esri.featureLayer({
-        url: serverConfig.mapUrlBj + '/0'
+        url: `${this.baseUrl}${this.partsAllUrl}`,
+        minZoom: 19
       })
-      this.layers.grid = esri.featureLayer({
-        url: serverConfig.mapUrlBase + '/16'
-      })
-      this.map.addLayer(this.layers.bjPoint)
-      this.map.addLayer(this.layers.grid)
     },
     switchEventOrComponent: function() {
       // 如果选中的是事件定位（1）或部件定位（0），点击地图时弹出事件或者部件的popup；否则（2以上）显示兴趣点结果的属性popup
       this.showEventPointPopup = this.queryEventSwitch < 2
       this.clearPoints()
+
+      if (this.queryEventSwitch === '0') {
+        // 加载和显示部件图层
+        this.map.addLayer(this.layers.bjPoint)
+        // 清空部件选择的列表
+        this.compListOpts = []
+      } else {
+        this.map.removeLayer(this.layers.bjPoint)
+      }
     },
     clearPoints() {
       const that = this
       this.markers.forEach(marker => {
         that.map.removeLayer(marker)
       })
+      this.pois.forEach(marker => {
+        that.map.removeLayer(marker)
+      })
+    },
+    queryOnMap: function() {
+      const that = this
+      merchantListPage({
+        keyword: this.keywords,
+        limit: this.limit
+      }).then(response => {
+        if (response.code === 200) {
+          console.log(response)
+          this.clearMap()
+          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 {
+            data.rows.forEach(item => {
+              const popupStr = '<div class="popup-div">' +
+                '<div class="popup-title">兴趣点</div>' +
+                '<div class="dashed-line"></div>' +
+                '<div class="popup-item"><label>名称</label>' + item.merchantName + '</div>' +
+                '<div class="popup-item"><label>详细地址</label>' + item.address + '</div>' +
+                '</div>'
+              const poi = L.marker([item.pointY, item.pointX], { icon: poiIcon })
+              poi.bindPopup(popupStr).openPopup()
+              that.pois.push(poi)
+              that.map.addLayer(poi)
+            })
+          }
+        }
+      })
     },
     // 返回事件定位的结果
     checkEventPoint: function() {
@@ -258,72 +332,52 @@
       this.form.gridId = '' // 单元网格ID
       this.form.componentId = '' // 部件ID
       this.form.componentName = '' // 部件名称
-    },
-    numberToRadius(t) {
-      return (t * Math.PI) / 180
-    },
-    numberToDegree(t) {
-      return (180 * t) / Math.PI
-    },
-    /**
-     * 根据一个经纬度及距离角度，算出另外一个经纬度
-     * @param {*} lon 经度 113.3960698
-     * @param {*} lat 纬度 22.941386
-     * @param {*} brng 方位角 45 ---- 正北方：000°或360° 正东方：090° 正南方：180° 正西方：270°
-     * @param {*} dist 90000距离(米)
-     */
-    getLonAndLat(lon, lat, brng, dist) {
-      // 大地坐标系资料WGS-84 长半径a=6378137 短半径b=6356752.3142 扁率f=1/298.2572236
-      var a = 6378137
-      var b = 6356752.3142
-      var f = 1 / 298.257223563
-      var lon1 = lon * 1
-      var lat1 = lat * 1
-      var s = dist
-      var alpha1 = this.numberToRadius(brng)
-      var sinAlpha1 = Math.sin(alpha1)
-      var cosAlpha1 = Math.cos(alpha1)
-      var tanU1 = (1 - f) * Math.tan(this.numberToRadius(lat1))
-      var cosU1 = 1 / Math.sqrt((1 + tanU1 * tanU1)), sinU1 = tanU1 * cosU1
-      var sigma1 = Math.atan2(tanU1, cosAlpha1)
-      var sinAlpha = cosU1 * sinAlpha1
-      var cosSqAlpha = 1 - sinAlpha * sinAlpha
-      var uSq = cosSqAlpha * (a * a - b * b) / (b * b)
-      var A = 1 + uSq / 16384 * (4096 + uSq * (-768 + uSq * (320 - 175 * uSq)))
-      var B = uSq / 1024 * (256 + uSq * (-128 + uSq * (74 - 47 * uSq)))
-      var sigma = s / (b * A), sigmaP = 2 * Math.PI
-      while (Math.abs(sigma - sigmaP) > 1e-12) {
-        var cos2SigmaM = Math.cos(2 * sigma1 + sigma)
-        var sinSigma = Math.sin(sigma)
-        var cosSigma = Math.cos(sigma)
-        var deltaSigma = B * sinSigma * (cos2SigmaM + B / 4 * (cosSigma * (-1 + 2 * cos2SigmaM * cos2SigmaM) -
-          B / 6 * cos2SigmaM * (-3 + 4 * sinSigma * sinSigma) * (-3 + 4 * cos2SigmaM * cos2SigmaM)))
-        sigmaP = sigma
-        sigma = s / (b * A) + deltaSigma
-      }
-      var tmp = sinU1 * sinSigma - cosU1 * cosSigma * cosAlpha1
-      var lat2 = Math.atan2(sinU1 * cosSigma + cosU1 * sinSigma * cosAlpha1, (1 - f) * Math.sqrt(sinAlpha * sinAlpha + tmp * tmp))
-      var lambda = Math.atan2(sinSigma * sinAlpha1, cosU1 * cosSigma - sinU1 * sinSigma * cosAlpha1)
-      var C = f / 16 * cosSqAlpha * (4 + f * (4 - 3 * cosSqAlpha))
-      var L = lambda - (1 - C) * f * sinAlpha * (sigma + C * sinSigma * (cos2SigmaM + C * cosSigma * (-1 + 2 * cos2SigmaM * cos2SigmaM)))
-      var revAz = Math.atan2(sinAlpha, -tmp) // final bearing
-      var lonLatObj = { lon: lon1 + this.numberToDegree(L), lat: this.numberToDegree(lat2) }
-      return lonLatObj
     }
   }
 }
 </script>
 
 <style scoped>
-  @import 'https://js.arcgis.com/4.13/esri/css/main.css';
   .baseMap {
-    height:60vh;
+    height: 65vh;
     width: 100%;
-    margin-top: 25px;
+    margin-top: 10px;
     border: 1px solid #DCDCDC;
     border-radius: 4px;
   }
-  .leaflet-container {
-    background: #fff0;
+</style>
+
+<style>
+  .leaflet-container a.leaflet-popup-close-button {
+    top: 5px; /* 修改弹窗关闭按钮样式 */
+    right: 10px; /* 修改弹窗关闭按钮样式 */
+  }
+
+  .leaflet-popup-content .popup-div {
+    font-size: 15px;
+    padding: 6px;
+  }
+
+  .leaflet-popup-content .popup-title {
+    font-weight: bold;
+  }
+
+  .leaflet-popup-content .dashed-line {
+    border-bottom: 1px dashed #dddddd;
+    margin: 10px -10px;
+  }
+
+  .leaflet-popup-content .popup-item {
+    padding-bottom: 6px;
+  }
+
+  .leaflet-popup-content .popup-item label {
+    font-weight: bold;
+    padding-right: 15px;
+  }
+
+  .leaflet-popup-content .popup-subitem {
+    padding-bottom: 6px;
+    font-size: 12px;
   }
 </style>
diff --git a/src/components/Map/leafletMapRead.vue b/src/components/Map/leafletMapRead.vue
index dd22198..edcd37d 100644
--- a/src/components/Map/leafletMapRead.vue
+++ b/src/components/Map/leafletMapRead.vue
@@ -7,7 +7,7 @@
 <script>
 import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import { mapConfig, serverConfig } from './ArcGISConfig'
+import { mapGetters } from 'vuex'
 const esri = require('esri-leaflet')
 export default {
   name: 'LeafletMapRead',
@@ -23,10 +23,20 @@
   },
   data() {
     return {
+      baseLayer: [],
       mapLoading: false,
       map: null
     }
   },
+  computed: {
+    ...mapGetters([
+      'baseUrl',
+      'partsUrl',
+      'mapUrl',
+      'gridUrl',
+      'partsAllUrl'
+    ])
+  },
   mounted() {
     this.initMap()
     this.addMarker()
@@ -36,9 +46,9 @@
       this.mapLoading = true
       const map = L.map('map', {
         minZoom: 13,
-        // maxZoom: 18,
-        center: [27.755, 116.08],
-        zoom: 16,
+        maxZoom: 24,
+        center: this.baseConfig.center,
+        zoom: this.baseConfig.zoom,
         zoomControl: false,
         attributionControl: false,
         crs: L.CRS.EPSG3857
@@ -47,45 +57,30 @@
       this.map = map // data上需要挂载
       window.map = map
 
+      // 加载天地图底图和标注
+      this.baseLayer.push(L.tileLayer(this.baseConfig.mapUrl).addTo(map))
+      this.baseLayer.push(L.tileLayer(this.baseConfig.labelUrl).addTo(map))
+
       esri.dynamicMapLayer({
-        url: serverConfig.mapUrlBase,
+        url: `${this.baseUrl}${this.mapUrl}`,
         opacity: 1,
         f: 'image'
       }).addTo(map)
 
-      // esri.tiledMapLayer({
-      //   url: serverConfig.mapUrlBase,
-      //   maxZoom: 15,
-      //   f: 'image'
-      // }).addTo(map)
-
-      // for (let i = 0; i < 24; i++) {
-      //   esri.featureLayer({
-      //     url: serverConfig.mapUrlBase + '/' + i
-      //     // minZoom: 4, // 最小缩放等级
-      //     // maxZoom: 21// 最大缩放等级
-      //   }).addTo(map)
-      // }
-
-      esri.featureLayer({
-        url: serverConfig.mapUrlBj + '/0'
-      }).addTo(map)
-      esri.featureLayer({
-        url: serverConfig.mapUrlBase + '/16'
-      }).addTo(map)
       this.mapLoading = false
     },
 
     addMarker() {
       const icon = L.icon({
-        iconUrl: require('../../assets/icons/icon-position.png'),
-        iconSize: [35, 35],
-        iconAnchor: [17.5, 35]
+        iconUrl: require('@/assets/icons/icon-position.png'),
+        iconSize: [32, 32],
+        iconAnchor: [16, 32],
+        popupAnchor: [0, -32]
       })
       const latlng = L.latLng([this.latitude, this.longitude])
       const feat = L.marker(latlng, { icon: icon })
       feat.addTo(this.map)
-      this.map.setView({ lat: this.latitude, lng: this.longitude }, 16)
+      this.map.setView({ lat: this.latitude, lng: this.longitude }, 18)
     }
   }
 }
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 2f77b38..134cb1e 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -31,12 +31,12 @@
         name: 'TimeLimit',
         meta: { title: '阶段时限', icon: '', permission: ['/timeLimit'] }
       },
-      {
-        path: '/caseList',
-        component: () => import('@/views/seo/seo'),
-        name: 'CaseList',
-        meta: { title: '综合查询', icon: '', permission: ['/caseList'] }
-      },
+      // {
+      //   path: '/caseList',
+      //   component: () => import('@/views/seo/seo'),
+      //   name: 'CaseList',
+      //   meta: { title: '综合查询', icon: '', permission: ['/caseList'] }
+      // },
       {
         path: '/caseType',
         component: () => import('@/views/busAdmin/caseType/listCaseType.vue'),
diff --git a/src/store/getters.js b/src/store/getters.js
index 57e8aac..d28b64f 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -30,7 +30,10 @@
   partsUrl: state => state.map.partsUrl, // 部件分层地址
   partsEditUrl: state => state.map.partsEditUrl, // 部件分层地址
   partsAllUrl: state => state.map.partsAllUrl, // 部件不分层地址
+  shopUrl: state => state.map.shopUrl, // 部件不分层地址
   mapUrl: state => state.map.mapUrl, // 底图地址
+  mapDtUrl: state => state.map.mapDtUrl, // 无网格底图地址
+  gridUrl: state => state.map.gridUrl, // 网格图层
   editUrl: state => state.map.editUrl // 编辑地图地址
 }
 export default getters
diff --git a/src/store/modules/map.js b/src/store/modules/map.js
index aa2c6f8..13f5313 100644
--- a/src/store/modules/map.js
+++ b/src/store/modules/map.js
@@ -5,7 +5,10 @@
   baseUrl: '', // 服务基础地址
   partsUrl: '', // 部件分层地址
   partsAllUrl: '', // 部件不分层地址
+  shopUrl: '', // 商户图层
   mapUrl: '', // 二维底图地址
+  mapDtUrl: '', // 无网格地图
+  gridUrl: '', // 网格图层
   editUrl: '' // 编辑地图URL
 }
 const mutations = {
@@ -24,9 +27,18 @@
   SET_PARTS_ALL_URL: (state, url) => {
     state.partsAllUrl = url
   },
+  SET_SHOP_URL: (state, url) => {
+    state.shopUrl = url
+  },
   SET_MAP_URL: (state, url) => {
     state.mapUrl = url
   },
+  SET_MAPDT_URL: (state, url) => {
+    state.mapDtUrl = url
+  },
+  SET_GRID_URL: (state, url) => {
+    state.gridUrl = url
+  },
   SET_EDIT_URL: (state, url) => {
     state.editUrl = url
   }
@@ -52,8 +64,14 @@
               commit('SET_PARTS_EDIT_URL', editUrl)
             } else if (item.name === '部件地图URL') {
               commit('SET_PARTS_ALL_URL', item.url)
+            } else if (item.name === '商户图层URL') {
+              commit('SET_SHOP_URL', item.url)
             } else if (item.name === '二维地图URL') {
               commit('SET_MAP_URL', item.url)
+            } else if (item.name === '无网格地图URL') {
+              commit('SET_MAPDT_URL', item.url)
+            } else if (item.name === '网格图层URL') {
+              commit('SET_GRID_URL', item.url)
             } else if (item.name === '编辑地图URL') {
               commit('SET_EDIT_URL', item.url)
             }
diff --git a/src/views/assessPost/receiverAccessChart.vue b/src/views/assessPost/receiverAccessChart.vue
index 6cc18f8..4e3523d 100644
--- a/src/views/assessPost/receiverAccessChart.vue
+++ b/src/views/assessPost/receiverAccessChart.vue
@@ -97,7 +97,8 @@
         xAxis: {
           data: this.x,
           axisLabel: {
-            fontSize: 14
+            fontSize: 14,
+            interval: 0
           }
         },
         yAxis: {
@@ -115,6 +116,18 @@
           tooltip: {
             position: 'right'
           }
+        }],
+        dataZoom: [{
+          type: 'slider',
+          show: true,
+          start: 0,
+          end: 50,
+          handleSize: 8
+        },
+        {
+          type: 'inside',
+          start: 0,
+          end: 50
         }]
       })
       this.chart.resize()

diff --git a/src/assets/icons/icon-poi.png b/src/assets/icons/icon-poi.png
new file mode 100644
index 0000000..364f2f6
--- /dev/null
+++ b/src/assets/icons/icon-poi.png
Binary files differ
diff --git a/src/components/Map/leafletMap.vue b/src/components/Map/leafletMap.vue
index c8b0b6f..e1150e9 100644
--- a/src/components/Map/leafletMap.vue
+++ b/src/components/Map/leafletMap.vue
@@ -1,25 +1,21 @@
 <template>
-  <div style="margin-top: -10px">
+  <div style="margin-top: -30px; margin-bottom: -10px;">
     <el-row :gutter="20">
-      <div v-show="showpoi">
-        <el-col :span="3">
-          <el-input v-model="keywords" size="small" type="text" placeholder="兴趣点关键字" clearable />
-        </el-col>
-        <el-col :span="5">
-          <el-button type="primary" size="small" @click="queryOnMap">查询</el-button>
-          <el-button type="info" size="small" @click="clearMap"> 清除地图 </el-button>
-        </el-col>
-      </div>
+      <el-col v-show="showpoi" :span="8">
+        <el-input v-model="keywords" size="small" type="text" placeholder="兴趣点关键字" clearable style="width: 50%" />
+        <el-button type="primary" size="small" @click="queryOnMap">查询</el-button>
+        <el-button type="info" size="small" @click="clearMap"> 清除地图 </el-button>
+      </el-col>
 
-      <el-col :span="6" :offset="8" style="text-align: right;">
+      <el-col :span="8" style="text-align: right">
         <el-radio-group v-model="queryEventSwitch" size="small" @change="switchEventOrComponent">
           <el-radio-button label="1">事件定位</el-radio-button>
           <el-radio-button label="0">部件定位</el-radio-button>
-          <el-radio-button v-show="showpoi" label="2">兴趣点属性</el-radio-button>
+          <!--          <el-radio-button v-show="showpoi" label="2">兴趣点属性</el-radio-button>-->
         </el-radio-group>
       </el-col>
 
-      <el-col v-if="queryEventSwitch === '0'" :span="10" :offset="0" style="text-align: right;">
+      <el-col v-if="queryEventSwitch === '0'" :span="8" style="text-align: right;">
         <el-select v-model="form.componentId" placeholder="选择部件" clearable value="" size="small">
           <el-option
             v-for="item in compListOpts"
@@ -30,7 +26,7 @@
         <el-button type="primary" size="small" @click="checkComponentPoint"> 部件提交 </el-button>
       </el-col>
 
-      <el-col v-if="queryEventSwitch === '1'" :span="10" :offset="0" style="text-align: right;">
+      <el-col v-if="queryEventSwitch === '1'" :span="8" :offset="0" style="text-align: right;">
         <el-button type="primary" size="small" @click="checkEventPoint"> 事件提交 </el-button>
       </el-col>
     </el-row>
@@ -42,18 +38,40 @@
 <script>
 import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import { mapConfig, serverConfig } from './ArcGISConfig'
+import { mapGetters } from 'vuex'
+import { merchantListPage } from '@/api/geoCoding/geoCoding'
+
 const esri = require('esri-leaflet')
 
+const icon = L.icon({
+  iconUrl: require('@/assets/icons/icon-position.png'),
+  iconSize: [32, 32],
+  iconAnchor: [16, 32],
+  popupAnchor: [0, -32]
+})
+
+const poiIcon = L.icon({
+  iconUrl: require('@/assets/icons/icon-poi.png'),
+  iconSize: [16, 16],
+  iconAnchor: [8, 16],
+  popupAnchor: [0, -16]
+})
+
+const deltaLng10 = 0.00002536 // 10米范围经度值偏移量（大约）
+const deltaLat10 = 0.00002256 // 10米范围纬度值偏移量（大约）
+
 export default {
   name: 'LeafletMap',
   data() {
     return {
       map: null,
-      markers: [],
+      baseLayer: [],
+      markers: [], // 选点
+      pois: [], // 兴趣点结果
       layers: {
         bjPoint: '', // 部件点图层
-        grid: '' // 单元网格图层
+        grid: '', // 单元网格图层
+        shopPoint: '' // 商铺图层
       },
       form: {
         longitude: '', // 定位点经度
@@ -64,23 +82,33 @@
         componentId: '', // 部件ID
         componentName: '' // 部件名称
       }, // 主页面返回值
-      showpoi: false,
+      showpoi: true,
       keywords: '', // 查询关键字
+      limit: 100, // 兴趣点查询的最大结果数
       showEventPointPopup: true, // 是否显示事部件的popup
       queryEventSwitch: '1', // 1==查询事件；0==查询部件
       compListOpts: [] // 部件选择下拉框option
     }
   },
+  computed: {
+    ...mapGetters([
+      'baseUrl',
+      'partsUrl',
+      'mapUrl',
+      'gridUrl',
+      'partsAllUrl'
+    ])
+  },
   mounted() {
     this.initMap()
   },
   methods: {
     initMap() {
-      const map = L.map('map', {
-        minZoom: 13,
-        // maxZoom: 18,
-        center: [27.755, 116.08],
-        zoom: 16,
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: 14,
+        maxZoom: 25,
+        center: this.baseConfig.center,
+        zoom: this.baseConfig.zoom,
         zoomControl: false,
         attributionControl: false,
         crs: L.CRS.EPSG3857
@@ -89,135 +117,181 @@
       this.map = map // data上需要挂载
       window.map = map
 
-      esri.dynamicMapLayer({
-        url: serverConfig.mapUrlBase
-      }).addTo(map)
-
+      // 加载图层
       this.addLayers()
 
       const that = this
       map.on('click', function(e) {
-
-        console.log('e', e)
-        console.log('e.latlng', e.latlng)
-        console.log('queryEventSwitch', that.queryEventSwitch)
         that.clearPoints()
 
         // 加载定位点
         if (that.showEventPointPopup) {
-          const icon = L.icon({
-            iconUrl: require('../../assets/icons/icon-position.png'),
-            iconSize: [35, 35]
-          })
           const pos = L.marker(e.latlng, {
             icon: icon
           })
           that.markers.push(pos)
           that.map.addLayer(pos)
 
-          // 查询事件或者部件
-          if (that.queryEventSwitch === '1') {
-            // 事件定位
-            // 1查询底图得到所在网格与所在社区
-            const query = that.layers.grid.query()
-            query.nearby(e.latlng, 10)
-            query.run(function(error, featureCollection, response) {
-              if (error) {
-                console.log(error)
-                return
-              }
-              const result = featureCollection.features[0].properties
-              // 赋值
-              that.form.longitude = e.latlng.lng
-              that.form.latitude = e.latlng.lat
-              that.form.gridId = result.CommuId
-              that.form.communityId = result.CommuId
-              that.form.communityName = result.CommuName
-
-              pos.bindPopup('坐标：[' + that.form.longitude.toFixed(4) + ', ' + that.form.latitude.toFixed(4) + ']' + '<p>' + '所在社区：' + result.CommuName).openPopup()
-            })
-          } else if (that.queryEventSwitch === '0') {
-            var latlngs = []
-            var p1 = that.getLonAndLat(e.latlng.lng, e.latlng.lat, 0, 2.5)
-            latlngs.push([p1.lat, p1.lon])
-            var p2 = that.getLonAndLat(e.latlng.lng, e.latlng.lat, 90, 2.5)
-            latlngs.push([p2.lat, p2.lon])
-            var p3 = that.getLonAndLat(e.latlng.lng, e.latlng.lat, 180, 2.5)
-            latlngs.push([p3.lat, p3.lon])
-            var p4 = that.getLonAndLat(e.latlng.lng, e.latlng.lat, 270, 2.5)
-            latlngs.push([p4.lat, p4.lon])
-
-            var polyline = L.polygon(latlngs)
-            const bjQuery = that.layers.bjPoint.query()
-            bjQuery.within(polyline)
-            bjQuery.run(function(error, featureCollection, response) {
-              if (error) {
-                console.log(error)
-                return
-              }
-              if (featureCollection.features.length > 0) {
-                const result = featureCollection.features
-                console.log(result)
-                // 赋值
-                that.compListOpts = []
-                let content = ''
-                result.forEach((item, index) => {
-                  content += '<p>部件' + (index + 1) + '：' + item.properties.大类名称 + '-' + item.properties.小类名称 + '-' + item.properties.编码
-                  const comp = {}
-                  comp.name = '部件' + (index + 1) + '：' + item.properties.大类名称 + '-' + item.properties.小类名称 + '-' + item.properties.编码
-                  comp.value = item.properties.编码
-                  that.compListOpts.push(comp)
-                })
-
-                pos.bindPopup('坐标：[' + e.latlng.lng.toFixed(4) + ', ' + e.latlng.lat.toFixed(4) + ']，附近5米的部件有：' + content).openPopup()
-
-                const query = that.layers.grid.query()
-                query.nearby(e.latlng, 10)
-                query.run(function(error, featureCollection, response) {
-                  if (error) {
-                    console.log(error)
-                    return
-                  }
-                  const result = featureCollection.features[0].properties
-                  // 赋值
-                  that.form.longitude = e.latlng.lng
-                  that.form.latitude = e.latlng.lat
-                  that.form.gridId = result.CommuId
-                  that.form.communityId = result.CommuId
-                  that.form.communityName = result.CommuName
-                })
-              } else {
-                that.$message({
-                  message: '没有查询到部件，请重新定位',
-                  type: 'warning'
-                })
-              }
-            }
-            )
+          // 飞到定位点
+          let zoom = that.map.getZoom()
+          if (zoom < 18) {
+            zoom = 18
           }
+          that.map.flyTo(e.latlng, zoom)
+
+          // 查询所点的网格
+          const query = that.layers.grid.query()
+          query.nearby(e.latlng, 10)
+          query.run(function(error, featureCollection, response) {
+            if (error) {
+              console.log(error)
+              return
+            }
+            const result = featureCollection.features[0].properties
+            // 赋值
+            that.form.longitude = e.latlng.lng
+            that.form.latitude = e.latlng.lat
+            that.form.gridId = result.GBID
+            that.form.communityId = result.GBID.substring(0, 12)
+            that.form.communityName = result.Note
+
+            if (that.queryEventSwitch === '1') {
+              // 事件定位
+              // 弹出事件点位信息
+              const popupStr = '<div class="popup-div">' +
+                '<div class="popup-title">事件点</div>' +
+                '<div class="dashed-line"></div>' +
+                '<div class="popup-item"><label>坐标</label>' + that.form.longitude.toFixed(4) + ', ' + that.form.latitude.toFixed(4) + '</div>' +
+                '<div class="popup-item"><label>所在社区</label>' + that.form.communityName + '</div>' +
+                '<div class="popup-item"><label>网格编号</label>' + that.form.gridId + '</div>' +
+                '</div>'
+
+              pos.bindPopup(popupStr).openPopup()
+            } else if (that.queryEventSwitch === '0') {
+              // 部件定位
+              // 1构建部件查询多边形，上下左右四个点
+              const latlngs = []
+              const p1 = [e.latlng.lat + deltaLat10, e.latlng.lng] // 上方点
+              const p2 = [e.latlng.lat, e.latlng.lng + deltaLng10] // 右侧点
+              const p3 = [e.latlng.lat - deltaLat10, e.latlng.lng] // 下方点
+              const p4 = [e.latlng.lat, e.latlng.lng - deltaLng10] // 左侧点
+              latlngs.push(p1)
+              latlngs.push(p2)
+              latlngs.push(p3)
+              latlngs.push(p4)
+
+              const polyline = L.polygon(latlngs)
+              const bjQuery = that.layers.bjPoint.query()
+              bjQuery.within(polyline)
+              bjQuery.run(function(error, featureCollection, response) {
+                if (error) {
+                  console.log(error)
+                  return
+                }
+
+                // 查询到结果
+                if (featureCollection.features.length > 0) {
+                  const result = featureCollection.features
+                  // 赋值
+                  that.compListOpts = []
+
+                  // 构建弹出窗口信息
+                  let popupStr = '<div class="popup-div">' +
+                    '<div class="popup-title">部件</div>' +
+                    '<div class="dashed-line"></div>' +
+                    '<div class="popup-item">坐标[' + e.latlng.lng.toFixed(4) + ', ' + e.latlng.lat.toFixed(4) + ']附近的部件有</div>' +
+                    '<div class="popup-item"><label>所在社区</label>' + that.form.communityName + '</div>' +
+                    '<div class="popup-item"><label>网格编号</label>' + that.form.gridId + '</div>'
+
+                  result.forEach((item, index) => {
+                    popupStr += '<div class="popup-subitem"><label style="padding-right: 5px;">部件' + (index + 1) + '</label>' + item.properties.dl + '/' + item.properties.xl + '[' + item.properties.objid + ']</div>'
+                    const comp = {}
+                    comp.name = '部件' + (index + 1) + '：' + item.properties.dl + '/' + item.properties.xl + '[' + item.properties.objid + ']'
+                    comp.value = item.properties.objid
+                    that.compListOpts.push(comp)
+                  })
+
+                  popupStr += '</div>'
+                  pos.bindPopup(popupStr).openPopup()
+                } else {
+                  that.$message({ message: '没有查询到部件，请重新定位', type: 'warning' })
+                }
+              })
+            }
+          })
         }
       })
     },
     addLayers() {
+      // 加载天地图底图和标注
+      this.baseLayer.push(L.tileLayer(this.baseConfig.mapUrl).addTo(this.map))
+      this.baseLayer.push(L.tileLayer(this.baseConfig.labelUrl).addTo(this.map))
+
+      // 加载底图
+      esri.dynamicMapLayer({
+        url: `${this.baseUrl}${this.mapUrl}`,
+        zIndex: 1
+      }).addTo(this.map)
+
+      // 初始化部件图层（不分层），待切换到部件定位时加载
       this.layers.bjPoint = esri.featureLayer({
-        url: serverConfig.mapUrlBj + '/0'
+        url: `${this.baseUrl}${this.partsAllUrl}`,
+        minZoom: 19
       })
-      this.layers.grid = esri.featureLayer({
-        url: serverConfig.mapUrlBase + '/16'
-      })
-      this.map.addLayer(this.layers.bjPoint)
-      this.map.addLayer(this.layers.grid)
     },
     switchEventOrComponent: function() {
       // 如果选中的是事件定位（1）或部件定位（0），点击地图时弹出事件或者部件的popup；否则（2以上）显示兴趣点结果的属性popup
       this.showEventPointPopup = this.queryEventSwitch < 2
       this.clearPoints()
+
+      if (this.queryEventSwitch === '0') {
+        // 加载和显示部件图层
+        this.map.addLayer(this.layers.bjPoint)
+        // 清空部件选择的列表
+        this.compListOpts = []
+      } else {
+        this.map.removeLayer(this.layers.bjPoint)
+      }
     },
     clearPoints() {
       const that = this
       this.markers.forEach(marker => {
         that.map.removeLayer(marker)
       })
+      this.pois.forEach(marker => {
+        that.map.removeLayer(marker)
+      })
+    },
+    queryOnMap: function() {
+      const that = this
+      merchantListPage({
+        keyword: this.keywords,
+        limit: this.limit
+      }).then(response => {
+        if (response.code === 200) {
+          console.log(response)
+          this.clearMap()
+          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 {
+            data.rows.forEach(item => {
+              const popupStr = '<div class="popup-div">' +
+                '<div class="popup-title">兴趣点</div>' +
+                '<div class="dashed-line"></div>' +
+                '<div class="popup-item"><label>名称</label>' + item.merchantName + '</div>' +
+                '<div class="popup-item"><label>详细地址</label>' + item.address + '</div>' +
+                '</div>'
+              const poi = L.marker([item.pointY, item.pointX], { icon: poiIcon })
+              poi.bindPopup(popupStr).openPopup()
+              that.pois.push(poi)
+              that.map.addLayer(poi)
+            })
+          }
+        }
+      })
     },
     // 返回事件定位的结果
     checkEventPoint: function() {
@@ -258,72 +332,52 @@
       this.form.gridId = '' // 单元网格ID
       this.form.componentId = '' // 部件ID
       this.form.componentName = '' // 部件名称
-    },
-    numberToRadius(t) {
-      return (t * Math.PI) / 180
-    },
-    numberToDegree(t) {
-      return (180 * t) / Math.PI
-    },
-    /**
-     * 根据一个经纬度及距离角度，算出另外一个经纬度
-     * @param {*} lon 经度 113.3960698
-     * @param {*} lat 纬度 22.941386
-     * @param {*} brng 方位角 45 ---- 正北方：000°或360° 正东方：090° 正南方：180° 正西方：270°
-     * @param {*} dist 90000距离(米)
-     */
-    getLonAndLat(lon, lat, brng, dist) {
-      // 大地坐标系资料WGS-84 长半径a=6378137 短半径b=6356752.3142 扁率f=1/298.2572236
-      var a = 6378137
-      var b = 6356752.3142
-      var f = 1 / 298.257223563
-      var lon1 = lon * 1
-      var lat1 = lat * 1
-      var s = dist
-      var alpha1 = this.numberToRadius(brng)
-      var sinAlpha1 = Math.sin(alpha1)
-      var cosAlpha1 = Math.cos(alpha1)
-      var tanU1 = (1 - f) * Math.tan(this.numberToRadius(lat1))
-      var cosU1 = 1 / Math.sqrt((1 + tanU1 * tanU1)), sinU1 = tanU1 * cosU1
-      var sigma1 = Math.atan2(tanU1, cosAlpha1)
-      var sinAlpha = cosU1 * sinAlpha1
-      var cosSqAlpha = 1 - sinAlpha * sinAlpha
-      var uSq = cosSqAlpha * (a * a - b * b) / (b * b)
-      var A = 1 + uSq / 16384 * (4096 + uSq * (-768 + uSq * (320 - 175 * uSq)))
-      var B = uSq / 1024 * (256 + uSq * (-128 + uSq * (74 - 47 * uSq)))
-      var sigma = s / (b * A), sigmaP = 2 * Math.PI
-      while (Math.abs(sigma - sigmaP) > 1e-12) {
-        var cos2SigmaM = Math.cos(2 * sigma1 + sigma)
-        var sinSigma = Math.sin(sigma)
-        var cosSigma = Math.cos(sigma)
-        var deltaSigma = B * sinSigma * (cos2SigmaM + B / 4 * (cosSigma * (-1 + 2 * cos2SigmaM * cos2SigmaM) -
-          B / 6 * cos2SigmaM * (-3 + 4 * sinSigma * sinSigma) * (-3 + 4 * cos2SigmaM * cos2SigmaM)))
-        sigmaP = sigma
-        sigma = s / (b * A) + deltaSigma
-      }
-      var tmp = sinU1 * sinSigma - cosU1 * cosSigma * cosAlpha1
-      var lat2 = Math.atan2(sinU1 * cosSigma + cosU1 * sinSigma * cosAlpha1, (1 - f) * Math.sqrt(sinAlpha * sinAlpha + tmp * tmp))
-      var lambda = Math.atan2(sinSigma * sinAlpha1, cosU1 * cosSigma - sinU1 * sinSigma * cosAlpha1)
-      var C = f / 16 * cosSqAlpha * (4 + f * (4 - 3 * cosSqAlpha))
-      var L = lambda - (1 - C) * f * sinAlpha * (sigma + C * sinSigma * (cos2SigmaM + C * cosSigma * (-1 + 2 * cos2SigmaM * cos2SigmaM)))
-      var revAz = Math.atan2(sinAlpha, -tmp) // final bearing
-      var lonLatObj = { lon: lon1 + this.numberToDegree(L), lat: this.numberToDegree(lat2) }
-      return lonLatObj
     }
   }
 }
 </script>
 
 <style scoped>
-  @import 'https://js.arcgis.com/4.13/esri/css/main.css';
   .baseMap {
-    height:60vh;
+    height: 65vh;
     width: 100%;
-    margin-top: 25px;
+    margin-top: 10px;
     border: 1px solid #DCDCDC;
     border-radius: 4px;
   }
-  .leaflet-container {
-    background: #fff0;
+</style>
+
+<style>
+  .leaflet-container a.leaflet-popup-close-button {
+    top: 5px; /* 修改弹窗关闭按钮样式 */
+    right: 10px; /* 修改弹窗关闭按钮样式 */
+  }
+
+  .leaflet-popup-content .popup-div {
+    font-size: 15px;
+    padding: 6px;
+  }
+
+  .leaflet-popup-content .popup-title {
+    font-weight: bold;
+  }
+
+  .leaflet-popup-content .dashed-line {
+    border-bottom: 1px dashed #dddddd;
+    margin: 10px -10px;
+  }
+
+  .leaflet-popup-content .popup-item {
+    padding-bottom: 6px;
+  }
+
+  .leaflet-popup-content .popup-item label {
+    font-weight: bold;
+    padding-right: 15px;
+  }
+
+  .leaflet-popup-content .popup-subitem {
+    padding-bottom: 6px;
+    font-size: 12px;
   }
 </style>
diff --git a/src/components/Map/leafletMapRead.vue b/src/components/Map/leafletMapRead.vue
index dd22198..edcd37d 100644
--- a/src/components/Map/leafletMapRead.vue
+++ b/src/components/Map/leafletMapRead.vue
@@ -7,7 +7,7 @@
 <script>
 import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import { mapConfig, serverConfig } from './ArcGISConfig'
+import { mapGetters } from 'vuex'
 const esri = require('esri-leaflet')
 export default {
   name: 'LeafletMapRead',
@@ -23,10 +23,20 @@
   },
   data() {
     return {
+      baseLayer: [],
       mapLoading: false,
       map: null
     }
   },
+  computed: {
+    ...mapGetters([
+      'baseUrl',
+      'partsUrl',
+      'mapUrl',
+      'gridUrl',
+      'partsAllUrl'
+    ])
+  },
   mounted() {
     this.initMap()
     this.addMarker()
@@ -36,9 +46,9 @@
       this.mapLoading = true
       const map = L.map('map', {
         minZoom: 13,
-        // maxZoom: 18,
-        center: [27.755, 116.08],
-        zoom: 16,
+        maxZoom: 24,
+        center: this.baseConfig.center,
+        zoom: this.baseConfig.zoom,
         zoomControl: false,
         attributionControl: false,
         crs: L.CRS.EPSG3857
@@ -47,45 +57,30 @@
       this.map = map // data上需要挂载
       window.map = map
 
+      // 加载天地图底图和标注
+      this.baseLayer.push(L.tileLayer(this.baseConfig.mapUrl).addTo(map))
+      this.baseLayer.push(L.tileLayer(this.baseConfig.labelUrl).addTo(map))
+
       esri.dynamicMapLayer({
-        url: serverConfig.mapUrlBase,
+        url: `${this.baseUrl}${this.mapUrl}`,
         opacity: 1,
         f: 'image'
       }).addTo(map)
 
-      // esri.tiledMapLayer({
-      //   url: serverConfig.mapUrlBase,
-      //   maxZoom: 15,
-      //   f: 'image'
-      // }).addTo(map)
-
-      // for (let i = 0; i < 24; i++) {
-      //   esri.featureLayer({
-      //     url: serverConfig.mapUrlBase + '/' + i
-      //     // minZoom: 4, // 最小缩放等级
-      //     // maxZoom: 21// 最大缩放等级
-      //   }).addTo(map)
-      // }
-
-      esri.featureLayer({
-        url: serverConfig.mapUrlBj + '/0'
-      }).addTo(map)
-      esri.featureLayer({
-        url: serverConfig.mapUrlBase + '/16'
-      }).addTo(map)
       this.mapLoading = false
     },
 
     addMarker() {
       const icon = L.icon({
-        iconUrl: require('../../assets/icons/icon-position.png'),
-        iconSize: [35, 35],
-        iconAnchor: [17.5, 35]
+        iconUrl: require('@/assets/icons/icon-position.png'),
+        iconSize: [32, 32],
+        iconAnchor: [16, 32],
+        popupAnchor: [0, -32]
       })
       const latlng = L.latLng([this.latitude, this.longitude])
       const feat = L.marker(latlng, { icon: icon })
       feat.addTo(this.map)
-      this.map.setView({ lat: this.latitude, lng: this.longitude }, 16)
+      this.map.setView({ lat: this.latitude, lng: this.longitude }, 18)
     }
   }
 }
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 2f77b38..134cb1e 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -31,12 +31,12 @@
         name: 'TimeLimit',
         meta: { title: '阶段时限', icon: '', permission: ['/timeLimit'] }
       },
-      {
-        path: '/caseList',
-        component: () => import('@/views/seo/seo'),
-        name: 'CaseList',
-        meta: { title: '综合查询', icon: '', permission: ['/caseList'] }
-      },
+      // {
+      //   path: '/caseList',
+      //   component: () => import('@/views/seo/seo'),
+      //   name: 'CaseList',
+      //   meta: { title: '综合查询', icon: '', permission: ['/caseList'] }
+      // },
       {
         path: '/caseType',
         component: () => import('@/views/busAdmin/caseType/listCaseType.vue'),
diff --git a/src/store/getters.js b/src/store/getters.js
index 57e8aac..d28b64f 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -30,7 +30,10 @@
   partsUrl: state => state.map.partsUrl, // 部件分层地址
   partsEditUrl: state => state.map.partsEditUrl, // 部件分层地址
   partsAllUrl: state => state.map.partsAllUrl, // 部件不分层地址
+  shopUrl: state => state.map.shopUrl, // 部件不分层地址
   mapUrl: state => state.map.mapUrl, // 底图地址
+  mapDtUrl: state => state.map.mapDtUrl, // 无网格底图地址
+  gridUrl: state => state.map.gridUrl, // 网格图层
   editUrl: state => state.map.editUrl // 编辑地图地址
 }
 export default getters
diff --git a/src/store/modules/map.js b/src/store/modules/map.js
index aa2c6f8..13f5313 100644
--- a/src/store/modules/map.js
+++ b/src/store/modules/map.js
@@ -5,7 +5,10 @@
   baseUrl: '', // 服务基础地址
   partsUrl: '', // 部件分层地址
   partsAllUrl: '', // 部件不分层地址
+  shopUrl: '', // 商户图层
   mapUrl: '', // 二维底图地址
+  mapDtUrl: '', // 无网格地图
+  gridUrl: '', // 网格图层
   editUrl: '' // 编辑地图URL
 }
 const mutations = {
@@ -24,9 +27,18 @@
   SET_PARTS_ALL_URL: (state, url) => {
     state.partsAllUrl = url
   },
+  SET_SHOP_URL: (state, url) => {
+    state.shopUrl = url
+  },
   SET_MAP_URL: (state, url) => {
     state.mapUrl = url
   },
+  SET_MAPDT_URL: (state, url) => {
+    state.mapDtUrl = url
+  },
+  SET_GRID_URL: (state, url) => {
+    state.gridUrl = url
+  },
   SET_EDIT_URL: (state, url) => {
     state.editUrl = url
   }
@@ -52,8 +64,14 @@
               commit('SET_PARTS_EDIT_URL', editUrl)
             } else if (item.name === '部件地图URL') {
               commit('SET_PARTS_ALL_URL', item.url)
+            } else if (item.name === '商户图层URL') {
+              commit('SET_SHOP_URL', item.url)
             } else if (item.name === '二维地图URL') {
               commit('SET_MAP_URL', item.url)
+            } else if (item.name === '无网格地图URL') {
+              commit('SET_MAPDT_URL', item.url)
+            } else if (item.name === '网格图层URL') {
+              commit('SET_GRID_URL', item.url)
             } else if (item.name === '编辑地图URL') {
               commit('SET_EDIT_URL', item.url)
             }
diff --git a/src/views/assessPost/receiverAccessChart.vue b/src/views/assessPost/receiverAccessChart.vue
index 6cc18f8..4e3523d 100644
--- a/src/views/assessPost/receiverAccessChart.vue
+++ b/src/views/assessPost/receiverAccessChart.vue
@@ -97,7 +97,8 @@
         xAxis: {
           data: this.x,
           axisLabel: {
-            fontSize: 14
+            fontSize: 14,
+            interval: 0
           }
         },
         yAxis: {
@@ -115,6 +116,18 @@
           tooltip: {
             position: 'right'
           }
+        }],
+        dataZoom: [{
+          type: 'slider',
+          show: true,
+          start: 0,
+          end: 50,
+          handleSize: 8
+        },
+        {
+          type: 'inside',
+          start: 0,
+          end: 50
         }]
       })
       this.chart.resize()
diff --git a/src/views/assessRegion/accessAreaChart.vue b/src/views/assessRegion/accessAreaChart.vue
index 3424aec..9745b4a 100644
--- a/src/views/assessRegion/accessAreaChart.vue
+++ b/src/views/assessRegion/accessAreaChart.vue
@@ -107,6 +107,18 @@
           tooltip: {
             position: 'right'
           }
+        }],
+        dataZoom: [{
+          type: 'slider',
+          show: true,
+          start: 0,
+          end: 50,
+          handleSize: 8
+        },
+        {
+          type: 'inside',
+          start: 0,
+          end: 50
         }]
       })
       this.chart.resize()

diff --git a/src/assets/icons/icon-poi.png b/src/assets/icons/icon-poi.png
new file mode 100644
index 0000000..364f2f6
--- /dev/null
+++ b/src/assets/icons/icon-poi.png
Binary files differ
diff --git a/src/components/Map/leafletMap.vue b/src/components/Map/leafletMap.vue
index c8b0b6f..e1150e9 100644
--- a/src/components/Map/leafletMap.vue
+++ b/src/components/Map/leafletMap.vue
@@ -1,25 +1,21 @@
 <template>
-  <div style="margin-top: -10px">
+  <div style="margin-top: -30px; margin-bottom: -10px;">
     <el-row :gutter="20">
-      <div v-show="showpoi">
-        <el-col :span="3">
-          <el-input v-model="keywords" size="small" type="text" placeholder="兴趣点关键字" clearable />
-        </el-col>
-        <el-col :span="5">
-          <el-button type="primary" size="small" @click="queryOnMap">查询</el-button>
-          <el-button type="info" size="small" @click="clearMap"> 清除地图 </el-button>
-        </el-col>
-      </div>
+      <el-col v-show="showpoi" :span="8">
+        <el-input v-model="keywords" size="small" type="text" placeholder="兴趣点关键字" clearable style="width: 50%" />
+        <el-button type="primary" size="small" @click="queryOnMap">查询</el-button>
+        <el-button type="info" size="small" @click="clearMap"> 清除地图 </el-button>
+      </el-col>
 
-      <el-col :span="6" :offset="8" style="text-align: right;">
+      <el-col :span="8" style="text-align: right">
         <el-radio-group v-model="queryEventSwitch" size="small" @change="switchEventOrComponent">
           <el-radio-button label="1">事件定位</el-radio-button>
           <el-radio-button label="0">部件定位</el-radio-button>
-          <el-radio-button v-show="showpoi" label="2">兴趣点属性</el-radio-button>
+          <!--          <el-radio-button v-show="showpoi" label="2">兴趣点属性</el-radio-button>-->
         </el-radio-group>
       </el-col>
 
-      <el-col v-if="queryEventSwitch === '0'" :span="10" :offset="0" style="text-align: right;">
+      <el-col v-if="queryEventSwitch === '0'" :span="8" style="text-align: right;">
         <el-select v-model="form.componentId" placeholder="选择部件" clearable value="" size="small">
           <el-option
             v-for="item in compListOpts"
@@ -30,7 +26,7 @@
         <el-button type="primary" size="small" @click="checkComponentPoint"> 部件提交 </el-button>
       </el-col>
 
-      <el-col v-if="queryEventSwitch === '1'" :span="10" :offset="0" style="text-align: right;">
+      <el-col v-if="queryEventSwitch === '1'" :span="8" :offset="0" style="text-align: right;">
         <el-button type="primary" size="small" @click="checkEventPoint"> 事件提交 </el-button>
       </el-col>
     </el-row>
@@ -42,18 +38,40 @@
 <script>
 import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import { mapConfig, serverConfig } from './ArcGISConfig'
+import { mapGetters } from 'vuex'
+import { merchantListPage } from '@/api/geoCoding/geoCoding'
+
 const esri = require('esri-leaflet')
 
+const icon = L.icon({
+  iconUrl: require('@/assets/icons/icon-position.png'),
+  iconSize: [32, 32],
+  iconAnchor: [16, 32],
+  popupAnchor: [0, -32]
+})
+
+const poiIcon = L.icon({
+  iconUrl: require('@/assets/icons/icon-poi.png'),
+  iconSize: [16, 16],
+  iconAnchor: [8, 16],
+  popupAnchor: [0, -16]
+})
+
+const deltaLng10 = 0.00002536 // 10米范围经度值偏移量（大约）
+const deltaLat10 = 0.00002256 // 10米范围纬度值偏移量（大约）
+
 export default {
   name: 'LeafletMap',
   data() {
     return {
       map: null,
-      markers: [],
+      baseLayer: [],
+      markers: [], // 选点
+      pois: [], // 兴趣点结果
       layers: {
         bjPoint: '', // 部件点图层
-        grid: '' // 单元网格图层
+        grid: '', // 单元网格图层
+        shopPoint: '' // 商铺图层
       },
       form: {
         longitude: '', // 定位点经度
@@ -64,23 +82,33 @@
         componentId: '', // 部件ID
         componentName: '' // 部件名称
       }, // 主页面返回值
-      showpoi: false,
+      showpoi: true,
       keywords: '', // 查询关键字
+      limit: 100, // 兴趣点查询的最大结果数
       showEventPointPopup: true, // 是否显示事部件的popup
       queryEventSwitch: '1', // 1==查询事件；0==查询部件
       compListOpts: [] // 部件选择下拉框option
     }
   },
+  computed: {
+    ...mapGetters([
+      'baseUrl',
+      'partsUrl',
+      'mapUrl',
+      'gridUrl',
+      'partsAllUrl'
+    ])
+  },
   mounted() {
     this.initMap()
   },
   methods: {
     initMap() {
-      const map = L.map('map', {
-        minZoom: 13,
-        // maxZoom: 18,
-        center: [27.755, 116.08],
-        zoom: 16,
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: 14,
+        maxZoom: 25,
+        center: this.baseConfig.center,
+        zoom: this.baseConfig.zoom,
         zoomControl: false,
         attributionControl: false,
         crs: L.CRS.EPSG3857
@@ -89,135 +117,181 @@
       this.map = map // data上需要挂载
       window.map = map
 
-      esri.dynamicMapLayer({
-        url: serverConfig.mapUrlBase
-      }).addTo(map)
-
+      // 加载图层
       this.addLayers()
 
       const that = this
       map.on('click', function(e) {
-
-        console.log('e', e)
-        console.log('e.latlng', e.latlng)
-        console.log('queryEventSwitch', that.queryEventSwitch)
         that.clearPoints()
 
         // 加载定位点
         if (that.showEventPointPopup) {
-          const icon = L.icon({
-            iconUrl: require('../../assets/icons/icon-position.png'),
-            iconSize: [35, 35]
-          })
           const pos = L.marker(e.latlng, {
             icon: icon
           })
           that.markers.push(pos)
           that.map.addLayer(pos)
 
-          // 查询事件或者部件
-          if (that.queryEventSwitch === '1') {
-            // 事件定位
-            // 1查询底图得到所在网格与所在社区
-            const query = that.layers.grid.query()
-            query.nearby(e.latlng, 10)
-            query.run(function(error, featureCollection, response) {
-              if (error) {
-                console.log(error)
-                return
-              }
-              const result = featureCollection.features[0].properties
-              // 赋值
-              that.form.longitude = e.latlng.lng
-              that.form.latitude = e.latlng.lat
-              that.form.gridId = result.CommuId
-              that.form.communityId = result.CommuId
-              that.form.communityName = result.CommuName
-
-              pos.bindPopup('坐标：[' + that.form.longitude.toFixed(4) + ', ' + that.form.latitude.toFixed(4) + ']' + '<p>' + '所在社区：' + result.CommuName).openPopup()
-            })
-          } else if (that.queryEventSwitch === '0') {
-            var latlngs = []
-            var p1 = that.getLonAndLat(e.latlng.lng, e.latlng.lat, 0, 2.5)
-            latlngs.push([p1.lat, p1.lon])
-            var p2 = that.getLonAndLat(e.latlng.lng, e.latlng.lat, 90, 2.5)
-            latlngs.push([p2.lat, p2.lon])
-            var p3 = that.getLonAndLat(e.latlng.lng, e.latlng.lat, 180, 2.5)
-            latlngs.push([p3.lat, p3.lon])
-            var p4 = that.getLonAndLat(e.latlng.lng, e.latlng.lat, 270, 2.5)
-            latlngs.push([p4.lat, p4.lon])
-
-            var polyline = L.polygon(latlngs)
-            const bjQuery = that.layers.bjPoint.query()
-            bjQuery.within(polyline)
-            bjQuery.run(function(error, featureCollection, response) {
-              if (error) {
-                console.log(error)
-                return
-              }
-              if (featureCollection.features.length > 0) {
-                const result = featureCollection.features
-                console.log(result)
-                // 赋值
-                that.compListOpts = []
-                let content = ''
-                result.forEach((item, index) => {
-                  content += '<p>部件' + (index + 1) + '：' + item.properties.大类名称 + '-' + item.properties.小类名称 + '-' + item.properties.编码
-                  const comp = {}
-                  comp.name = '部件' + (index + 1) + '：' + item.properties.大类名称 + '-' + item.properties.小类名称 + '-' + item.properties.编码
-                  comp.value = item.properties.编码
-                  that.compListOpts.push(comp)
-                })
-
-                pos.bindPopup('坐标：[' + e.latlng.lng.toFixed(4) + ', ' + e.latlng.lat.toFixed(4) + ']，附近5米的部件有：' + content).openPopup()
-
-                const query = that.layers.grid.query()
-                query.nearby(e.latlng, 10)
-                query.run(function(error, featureCollection, response) {
-                  if (error) {
-                    console.log(error)
-                    return
-                  }
-                  const result = featureCollection.features[0].properties
-                  // 赋值
-                  that.form.longitude = e.latlng.lng
-                  that.form.latitude = e.latlng.lat
-                  that.form.gridId = result.CommuId
-                  that.form.communityId = result.CommuId
-                  that.form.communityName = result.CommuName
-                })
-              } else {
-                that.$message({
-                  message: '没有查询到部件，请重新定位',
-                  type: 'warning'
-                })
-              }
-            }
-            )
+          // 飞到定位点
+          let zoom = that.map.getZoom()
+          if (zoom < 18) {
+            zoom = 18
           }
+          that.map.flyTo(e.latlng, zoom)
+
+          // 查询所点的网格
+          const query = that.layers.grid.query()
+          query.nearby(e.latlng, 10)
+          query.run(function(error, featureCollection, response) {
+            if (error) {
+              console.log(error)
+              return
+            }
+            const result = featureCollection.features[0].properties
+            // 赋值
+            that.form.longitude = e.latlng.lng
+            that.form.latitude = e.latlng.lat
+            that.form.gridId = result.GBID
+            that.form.communityId = result.GBID.substring(0, 12)
+            that.form.communityName = result.Note
+
+            if (that.queryEventSwitch === '1') {
+              // 事件定位
+              // 弹出事件点位信息
+              const popupStr = '<div class="popup-div">' +
+                '<div class="popup-title">事件点</div>' +
+                '<div class="dashed-line"></div>' +
+                '<div class="popup-item"><label>坐标</label>' + that.form.longitude.toFixed(4) + ', ' + that.form.latitude.toFixed(4) + '</div>' +
+                '<div class="popup-item"><label>所在社区</label>' + that.form.communityName + '</div>' +
+                '<div class="popup-item"><label>网格编号</label>' + that.form.gridId + '</div>' +
+                '</div>'
+
+              pos.bindPopup(popupStr).openPopup()
+            } else if (that.queryEventSwitch === '0') {
+              // 部件定位
+              // 1构建部件查询多边形，上下左右四个点
+              const latlngs = []
+              const p1 = [e.latlng.lat + deltaLat10, e.latlng.lng] // 上方点
+              const p2 = [e.latlng.lat, e.latlng.lng + deltaLng10] // 右侧点
+              const p3 = [e.latlng.lat - deltaLat10, e.latlng.lng] // 下方点
+              const p4 = [e.latlng.lat, e.latlng.lng - deltaLng10] // 左侧点
+              latlngs.push(p1)
+              latlngs.push(p2)
+              latlngs.push(p3)
+              latlngs.push(p4)
+
+              const polyline = L.polygon(latlngs)
+              const bjQuery = that.layers.bjPoint.query()
+              bjQuery.within(polyline)
+              bjQuery.run(function(error, featureCollection, response) {
+                if (error) {
+                  console.log(error)
+                  return
+                }
+
+                // 查询到结果
+                if (featureCollection.features.length > 0) {
+                  const result = featureCollection.features
+                  // 赋值
+                  that.compListOpts = []
+
+                  // 构建弹出窗口信息
+                  let popupStr = '<div class="popup-div">' +
+                    '<div class="popup-title">部件</div>' +
+                    '<div class="dashed-line"></div>' +
+                    '<div class="popup-item">坐标[' + e.latlng.lng.toFixed(4) + ', ' + e.latlng.lat.toFixed(4) + ']附近的部件有</div>' +
+                    '<div class="popup-item"><label>所在社区</label>' + that.form.communityName + '</div>' +
+                    '<div class="popup-item"><label>网格编号</label>' + that.form.gridId + '</div>'
+
+                  result.forEach((item, index) => {
+                    popupStr += '<div class="popup-subitem"><label style="padding-right: 5px;">部件' + (index + 1) + '</label>' + item.properties.dl + '/' + item.properties.xl + '[' + item.properties.objid + ']</div>'
+                    const comp = {}
+                    comp.name = '部件' + (index + 1) + '：' + item.properties.dl + '/' + item.properties.xl + '[' + item.properties.objid + ']'
+                    comp.value = item.properties.objid
+                    that.compListOpts.push(comp)
+                  })
+
+                  popupStr += '</div>'
+                  pos.bindPopup(popupStr).openPopup()
+                } else {
+                  that.$message({ message: '没有查询到部件，请重新定位', type: 'warning' })
+                }
+              })
+            }
+          })
         }
       })
     },
     addLayers() {
+      // 加载天地图底图和标注
+      this.baseLayer.push(L.tileLayer(this.baseConfig.mapUrl).addTo(this.map))
+      this.baseLayer.push(L.tileLayer(this.baseConfig.labelUrl).addTo(this.map))
+
+      // 加载底图
+      esri.dynamicMapLayer({
+        url: `${this.baseUrl}${this.mapUrl}`,
+        zIndex: 1
+      }).addTo(this.map)
+
+      // 初始化部件图层（不分层），待切换到部件定位时加载
       this.layers.bjPoint = esri.featureLayer({
-        url: serverConfig.mapUrlBj + '/0'
+        url: `${this.baseUrl}${this.partsAllUrl}`,
+        minZoom: 19
       })
-      this.layers.grid = esri.featureLayer({
-        url: serverConfig.mapUrlBase + '/16'
-      })
-      this.map.addLayer(this.layers.bjPoint)
-      this.map.addLayer(this.layers.grid)
     },
     switchEventOrComponent: function() {
       // 如果选中的是事件定位（1）或部件定位（0），点击地图时弹出事件或者部件的popup；否则（2以上）显示兴趣点结果的属性popup
       this.showEventPointPopup = this.queryEventSwitch < 2
       this.clearPoints()
+
+      if (this.queryEventSwitch === '0') {
+        // 加载和显示部件图层
+        this.map.addLayer(this.layers.bjPoint)
+        // 清空部件选择的列表
+        this.compListOpts = []
+      } else {
+        this.map.removeLayer(this.layers.bjPoint)
+      }
     },
     clearPoints() {
       const that = this
       this.markers.forEach(marker => {
         that.map.removeLayer(marker)
       })
+      this.pois.forEach(marker => {
+        that.map.removeLayer(marker)
+      })
+    },
+    queryOnMap: function() {
+      const that = this
+      merchantListPage({
+        keyword: this.keywords,
+        limit: this.limit
+      }).then(response => {
+        if (response.code === 200) {
+          console.log(response)
+          this.clearMap()
+          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 {
+            data.rows.forEach(item => {
+              const popupStr = '<div class="popup-div">' +
+                '<div class="popup-title">兴趣点</div>' +
+                '<div class="dashed-line"></div>' +
+                '<div class="popup-item"><label>名称</label>' + item.merchantName + '</div>' +
+                '<div class="popup-item"><label>详细地址</label>' + item.address + '</div>' +
+                '</div>'
+              const poi = L.marker([item.pointY, item.pointX], { icon: poiIcon })
+              poi.bindPopup(popupStr).openPopup()
+              that.pois.push(poi)
+              that.map.addLayer(poi)
+            })
+          }
+        }
+      })
     },
     // 返回事件定位的结果
     checkEventPoint: function() {
@@ -258,72 +332,52 @@
       this.form.gridId = '' // 单元网格ID
       this.form.componentId = '' // 部件ID
       this.form.componentName = '' // 部件名称
-    },
-    numberToRadius(t) {
-      return (t * Math.PI) / 180
-    },
-    numberToDegree(t) {
-      return (180 * t) / Math.PI
-    },
-    /**
-     * 根据一个经纬度及距离角度，算出另外一个经纬度
-     * @param {*} lon 经度 113.3960698
-     * @param {*} lat 纬度 22.941386
-     * @param {*} brng 方位角 45 ---- 正北方：000°或360° 正东方：090° 正南方：180° 正西方：270°
-     * @param {*} dist 90000距离(米)
-     */
-    getLonAndLat(lon, lat, brng, dist) {
-      // 大地坐标系资料WGS-84 长半径a=6378137 短半径b=6356752.3142 扁率f=1/298.2572236
-      var a = 6378137
-      var b = 6356752.3142
-      var f = 1 / 298.257223563
-      var lon1 = lon * 1
-      var lat1 = lat * 1
-      var s = dist
-      var alpha1 = this.numberToRadius(brng)
-      var sinAlpha1 = Math.sin(alpha1)
-      var cosAlpha1 = Math.cos(alpha1)
-      var tanU1 = (1 - f) * Math.tan(this.numberToRadius(lat1))
-      var cosU1 = 1 / Math.sqrt((1 + tanU1 * tanU1)), sinU1 = tanU1 * cosU1
-      var sigma1 = Math.atan2(tanU1, cosAlpha1)
-      var sinAlpha = cosU1 * sinAlpha1
-      var cosSqAlpha = 1 - sinAlpha * sinAlpha
-      var uSq = cosSqAlpha * (a * a - b * b) / (b * b)
-      var A = 1 + uSq / 16384 * (4096 + uSq * (-768 + uSq * (320 - 175 * uSq)))
-      var B = uSq / 1024 * (256 + uSq * (-128 + uSq * (74 - 47 * uSq)))
-      var sigma = s / (b * A), sigmaP = 2 * Math.PI
-      while (Math.abs(sigma - sigmaP) > 1e-12) {
-        var cos2SigmaM = Math.cos(2 * sigma1 + sigma)
-        var sinSigma = Math.sin(sigma)
-        var cosSigma = Math.cos(sigma)
-        var deltaSigma = B * sinSigma * (cos2SigmaM + B / 4 * (cosSigma * (-1 + 2 * cos2SigmaM * cos2SigmaM) -
-          B / 6 * cos2SigmaM * (-3 + 4 * sinSigma * sinSigma) * (-3 + 4 * cos2SigmaM * cos2SigmaM)))
-        sigmaP = sigma
-        sigma = s / (b * A) + deltaSigma
-      }
-      var tmp = sinU1 * sinSigma - cosU1 * cosSigma * cosAlpha1
-      var lat2 = Math.atan2(sinU1 * cosSigma + cosU1 * sinSigma * cosAlpha1, (1 - f) * Math.sqrt(sinAlpha * sinAlpha + tmp * tmp))
-      var lambda = Math.atan2(sinSigma * sinAlpha1, cosU1 * cosSigma - sinU1 * sinSigma * cosAlpha1)
-      var C = f / 16 * cosSqAlpha * (4 + f * (4 - 3 * cosSqAlpha))
-      var L = lambda - (1 - C) * f * sinAlpha * (sigma + C * sinSigma * (cos2SigmaM + C * cosSigma * (-1 + 2 * cos2SigmaM * cos2SigmaM)))
-      var revAz = Math.atan2(sinAlpha, -tmp) // final bearing
-      var lonLatObj = { lon: lon1 + this.numberToDegree(L), lat: this.numberToDegree(lat2) }
-      return lonLatObj
     }
   }
 }
 </script>
 
 <style scoped>
-  @import 'https://js.arcgis.com/4.13/esri/css/main.css';
   .baseMap {
-    height:60vh;
+    height: 65vh;
     width: 100%;
-    margin-top: 25px;
+    margin-top: 10px;
     border: 1px solid #DCDCDC;
     border-radius: 4px;
   }
-  .leaflet-container {
-    background: #fff0;
+</style>
+
+<style>
+  .leaflet-container a.leaflet-popup-close-button {
+    top: 5px; /* 修改弹窗关闭按钮样式 */
+    right: 10px; /* 修改弹窗关闭按钮样式 */
+  }
+
+  .leaflet-popup-content .popup-div {
+    font-size: 15px;
+    padding: 6px;
+  }
+
+  .leaflet-popup-content .popup-title {
+    font-weight: bold;
+  }
+
+  .leaflet-popup-content .dashed-line {
+    border-bottom: 1px dashed #dddddd;
+    margin: 10px -10px;
+  }
+
+  .leaflet-popup-content .popup-item {
+    padding-bottom: 6px;
+  }
+
+  .leaflet-popup-content .popup-item label {
+    font-weight: bold;
+    padding-right: 15px;
+  }
+
+  .leaflet-popup-content .popup-subitem {
+    padding-bottom: 6px;
+    font-size: 12px;
   }
 </style>
diff --git a/src/components/Map/leafletMapRead.vue b/src/components/Map/leafletMapRead.vue
index dd22198..edcd37d 100644
--- a/src/components/Map/leafletMapRead.vue
+++ b/src/components/Map/leafletMapRead.vue
@@ -7,7 +7,7 @@
 <script>
 import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import { mapConfig, serverConfig } from './ArcGISConfig'
+import { mapGetters } from 'vuex'
 const esri = require('esri-leaflet')
 export default {
   name: 'LeafletMapRead',
@@ -23,10 +23,20 @@
   },
   data() {
     return {
+      baseLayer: [],
       mapLoading: false,
       map: null
     }
   },
+  computed: {
+    ...mapGetters([
+      'baseUrl',
+      'partsUrl',
+      'mapUrl',
+      'gridUrl',
+      'partsAllUrl'
+    ])
+  },
   mounted() {
     this.initMap()
     this.addMarker()
@@ -36,9 +46,9 @@
       this.mapLoading = true
       const map = L.map('map', {
         minZoom: 13,
-        // maxZoom: 18,
-        center: [27.755, 116.08],
-        zoom: 16,
+        maxZoom: 24,
+        center: this.baseConfig.center,
+        zoom: this.baseConfig.zoom,
         zoomControl: false,
         attributionControl: false,
         crs: L.CRS.EPSG3857
@@ -47,45 +57,30 @@
       this.map = map // data上需要挂载
       window.map = map
 
+      // 加载天地图底图和标注
+      this.baseLayer.push(L.tileLayer(this.baseConfig.mapUrl).addTo(map))
+      this.baseLayer.push(L.tileLayer(this.baseConfig.labelUrl).addTo(map))
+
       esri.dynamicMapLayer({
-        url: serverConfig.mapUrlBase,
+        url: `${this.baseUrl}${this.mapUrl}`,
         opacity: 1,
         f: 'image'
       }).addTo(map)
 
-      // esri.tiledMapLayer({
-      //   url: serverConfig.mapUrlBase,
-      //   maxZoom: 15,
-      //   f: 'image'
-      // }).addTo(map)
-
-      // for (let i = 0; i < 24; i++) {
-      //   esri.featureLayer({
-      //     url: serverConfig.mapUrlBase + '/' + i
-      //     // minZoom: 4, // 最小缩放等级
-      //     // maxZoom: 21// 最大缩放等级
-      //   }).addTo(map)
-      // }
-
-      esri.featureLayer({
-        url: serverConfig.mapUrlBj + '/0'
-      }).addTo(map)
-      esri.featureLayer({
-        url: serverConfig.mapUrlBase + '/16'
-      }).addTo(map)
       this.mapLoading = false
     },
 
     addMarker() {
       const icon = L.icon({
-        iconUrl: require('../../assets/icons/icon-position.png'),
-        iconSize: [35, 35],
-        iconAnchor: [17.5, 35]
+        iconUrl: require('@/assets/icons/icon-position.png'),
+        iconSize: [32, 32],
+        iconAnchor: [16, 32],
+        popupAnchor: [0, -32]
       })
       const latlng = L.latLng([this.latitude, this.longitude])
       const feat = L.marker(latlng, { icon: icon })
       feat.addTo(this.map)
-      this.map.setView({ lat: this.latitude, lng: this.longitude }, 16)
+      this.map.setView({ lat: this.latitude, lng: this.longitude }, 18)
     }
   }
 }
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 2f77b38..134cb1e 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -31,12 +31,12 @@
         name: 'TimeLimit',
         meta: { title: '阶段时限', icon: '', permission: ['/timeLimit'] }
       },
-      {
-        path: '/caseList',
-        component: () => import('@/views/seo/seo'),
-        name: 'CaseList',
-        meta: { title: '综合查询', icon: '', permission: ['/caseList'] }
-      },
+      // {
+      //   path: '/caseList',
+      //   component: () => import('@/views/seo/seo'),
+      //   name: 'CaseList',
+      //   meta: { title: '综合查询', icon: '', permission: ['/caseList'] }
+      // },
       {
         path: '/caseType',
         component: () => import('@/views/busAdmin/caseType/listCaseType.vue'),
diff --git a/src/store/getters.js b/src/store/getters.js
index 57e8aac..d28b64f 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -30,7 +30,10 @@
   partsUrl: state => state.map.partsUrl, // 部件分层地址
   partsEditUrl: state => state.map.partsEditUrl, // 部件分层地址
   partsAllUrl: state => state.map.partsAllUrl, // 部件不分层地址
+  shopUrl: state => state.map.shopUrl, // 部件不分层地址
   mapUrl: state => state.map.mapUrl, // 底图地址
+  mapDtUrl: state => state.map.mapDtUrl, // 无网格底图地址
+  gridUrl: state => state.map.gridUrl, // 网格图层
   editUrl: state => state.map.editUrl // 编辑地图地址
 }
 export default getters
diff --git a/src/store/modules/map.js b/src/store/modules/map.js
index aa2c6f8..13f5313 100644
--- a/src/store/modules/map.js
+++ b/src/store/modules/map.js
@@ -5,7 +5,10 @@
   baseUrl: '', // 服务基础地址
   partsUrl: '', // 部件分层地址
   partsAllUrl: '', // 部件不分层地址
+  shopUrl: '', // 商户图层
   mapUrl: '', // 二维底图地址
+  mapDtUrl: '', // 无网格地图
+  gridUrl: '', // 网格图层
   editUrl: '' // 编辑地图URL
 }
 const mutations = {
@@ -24,9 +27,18 @@
   SET_PARTS_ALL_URL: (state, url) => {
     state.partsAllUrl = url
   },
+  SET_SHOP_URL: (state, url) => {
+    state.shopUrl = url
+  },
   SET_MAP_URL: (state, url) => {
     state.mapUrl = url
   },
+  SET_MAPDT_URL: (state, url) => {
+    state.mapDtUrl = url
+  },
+  SET_GRID_URL: (state, url) => {
+    state.gridUrl = url
+  },
   SET_EDIT_URL: (state, url) => {
     state.editUrl = url
   }
@@ -52,8 +64,14 @@
               commit('SET_PARTS_EDIT_URL', editUrl)
             } else if (item.name === '部件地图URL') {
               commit('SET_PARTS_ALL_URL', item.url)
+            } else if (item.name === '商户图层URL') {
+              commit('SET_SHOP_URL', item.url)
             } else if (item.name === '二维地图URL') {
               commit('SET_MAP_URL', item.url)
+            } else if (item.name === '无网格地图URL') {
+              commit('SET_MAPDT_URL', item.url)
+            } else if (item.name === '网格图层URL') {
+              commit('SET_GRID_URL', item.url)
             } else if (item.name === '编辑地图URL') {
               commit('SET_EDIT_URL', item.url)
             }
diff --git a/src/views/assessPost/receiverAccessChart.vue b/src/views/assessPost/receiverAccessChart.vue
index 6cc18f8..4e3523d 100644
--- a/src/views/assessPost/receiverAccessChart.vue
+++ b/src/views/assessPost/receiverAccessChart.vue
@@ -97,7 +97,8 @@
         xAxis: {
           data: this.x,
           axisLabel: {
-            fontSize: 14
+            fontSize: 14,
+            interval: 0
           }
         },
         yAxis: {
@@ -115,6 +116,18 @@
           tooltip: {
             position: 'right'
           }
+        }],
+        dataZoom: [{
+          type: 'slider',
+          show: true,
+          start: 0,
+          end: 50,
+          handleSize: 8
+        },
+        {
+          type: 'inside',
+          start: 0,
+          end: 50
         }]
       })
       this.chart.resize()
diff --git a/src/views/assessRegion/accessAreaChart.vue b/src/views/assessRegion/accessAreaChart.vue
index 3424aec..9745b4a 100644
--- a/src/views/assessRegion/accessAreaChart.vue
+++ b/src/views/assessRegion/accessAreaChart.vue
@@ -107,6 +107,18 @@
           tooltip: {
             position: 'right'
           }
+        }],
+        dataZoom: [{
+          type: 'slider',
+          show: true,
+          start: 0,
+          end: 50,
+          handleSize: 8
+        },
+        {
+          type: 'inside',
+          start: 0,
+          end: 50
         }]
       })
       this.chart.resize()
diff --git a/src/views/baseSource/components/layerChoose.vue b/src/views/baseSource/components/layerChoose.vue
index c98e787..2cd75c8 100644
--- a/src/views/baseSource/components/layerChoose.vue
+++ b/src/views/baseSource/components/layerChoose.vue
@@ -13,11 +13,13 @@
     <el-collapse-transition>
       <div v-show="cardShow" class="layers-card">
         <el-tree
+          ref="layerTree"
           :data="layers"
           :default-checked-keys="selectLayers"
           :props="treeProps"
           show-checkbox
           node-key="id"
+          @check="nodeCheck"
           @check-change="checkChange"/>
       </div>
     </el-collapse-transition>
@@ -65,6 +67,9 @@
     }
   },
   methods: {
+    nodeCheck(node, checked) {
+      this.$emit('check', node, checked)
+    },
     checkChange(node, checked) {
       this.$emit('choose', node, checked)
     }

diff --git a/src/assets/icons/icon-poi.png b/src/assets/icons/icon-poi.png
new file mode 100644
index 0000000..364f2f6
--- /dev/null
+++ b/src/assets/icons/icon-poi.png
Binary files differ
diff --git a/src/components/Map/leafletMap.vue b/src/components/Map/leafletMap.vue
index c8b0b6f..e1150e9 100644
--- a/src/components/Map/leafletMap.vue
+++ b/src/components/Map/leafletMap.vue
@@ -1,25 +1,21 @@
 <template>
-  <div style="margin-top: -10px">
+  <div style="margin-top: -30px; margin-bottom: -10px;">
     <el-row :gutter="20">
-      <div v-show="showpoi">
-        <el-col :span="3">
-          <el-input v-model="keywords" size="small" type="text" placeholder="兴趣点关键字" clearable />
-        </el-col>
-        <el-col :span="5">
-          <el-button type="primary" size="small" @click="queryOnMap">查询</el-button>
-          <el-button type="info" size="small" @click="clearMap"> 清除地图 </el-button>
-        </el-col>
-      </div>
+      <el-col v-show="showpoi" :span="8">
+        <el-input v-model="keywords" size="small" type="text" placeholder="兴趣点关键字" clearable style="width: 50%" />
+        <el-button type="primary" size="small" @click="queryOnMap">查询</el-button>
+        <el-button type="info" size="small" @click="clearMap"> 清除地图 </el-button>
+      </el-col>
 
-      <el-col :span="6" :offset="8" style="text-align: right;">
+      <el-col :span="8" style="text-align: right">
         <el-radio-group v-model="queryEventSwitch" size="small" @change="switchEventOrComponent">
           <el-radio-button label="1">事件定位</el-radio-button>
           <el-radio-button label="0">部件定位</el-radio-button>
-          <el-radio-button v-show="showpoi" label="2">兴趣点属性</el-radio-button>
+          <!--          <el-radio-button v-show="showpoi" label="2">兴趣点属性</el-radio-button>-->
         </el-radio-group>
       </el-col>
 
-      <el-col v-if="queryEventSwitch === '0'" :span="10" :offset="0" style="text-align: right;">
+      <el-col v-if="queryEventSwitch === '0'" :span="8" style="text-align: right;">
         <el-select v-model="form.componentId" placeholder="选择部件" clearable value="" size="small">
           <el-option
             v-for="item in compListOpts"
@@ -30,7 +26,7 @@
         <el-button type="primary" size="small" @click="checkComponentPoint"> 部件提交 </el-button>
       </el-col>
 
-      <el-col v-if="queryEventSwitch === '1'" :span="10" :offset="0" style="text-align: right;">
+      <el-col v-if="queryEventSwitch === '1'" :span="8" :offset="0" style="text-align: right;">
         <el-button type="primary" size="small" @click="checkEventPoint"> 事件提交 </el-button>
       </el-col>
     </el-row>
@@ -42,18 +38,40 @@
 <script>
 import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import { mapConfig, serverConfig } from './ArcGISConfig'
+import { mapGetters } from 'vuex'
+import { merchantListPage } from '@/api/geoCoding/geoCoding'
+
 const esri = require('esri-leaflet')
 
+const icon = L.icon({
+  iconUrl: require('@/assets/icons/icon-position.png'),
+  iconSize: [32, 32],
+  iconAnchor: [16, 32],
+  popupAnchor: [0, -32]
+})
+
+const poiIcon = L.icon({
+  iconUrl: require('@/assets/icons/icon-poi.png'),
+  iconSize: [16, 16],
+  iconAnchor: [8, 16],
+  popupAnchor: [0, -16]
+})
+
+const deltaLng10 = 0.00002536 // 10米范围经度值偏移量（大约）
+const deltaLat10 = 0.00002256 // 10米范围纬度值偏移量（大约）
+
 export default {
   name: 'LeafletMap',
   data() {
     return {
       map: null,
-      markers: [],
+      baseLayer: [],
+      markers: [], // 选点
+      pois: [], // 兴趣点结果
       layers: {
         bjPoint: '', // 部件点图层
-        grid: '' // 单元网格图层
+        grid: '', // 单元网格图层
+        shopPoint: '' // 商铺图层
       },
       form: {
         longitude: '', // 定位点经度
@@ -64,23 +82,33 @@
         componentId: '', // 部件ID
         componentName: '' // 部件名称
       }, // 主页面返回值
-      showpoi: false,
+      showpoi: true,
       keywords: '', // 查询关键字
+      limit: 100, // 兴趣点查询的最大结果数
       showEventPointPopup: true, // 是否显示事部件的popup
       queryEventSwitch: '1', // 1==查询事件；0==查询部件
       compListOpts: [] // 部件选择下拉框option
     }
   },
+  computed: {
+    ...mapGetters([
+      'baseUrl',
+      'partsUrl',
+      'mapUrl',
+      'gridUrl',
+      'partsAllUrl'
+    ])
+  },
   mounted() {
     this.initMap()
   },
   methods: {
     initMap() {
-      const map = L.map('map', {
-        minZoom: 13,
-        // maxZoom: 18,
-        center: [27.755, 116.08],
-        zoom: 16,
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: 14,
+        maxZoom: 25,
+        center: this.baseConfig.center,
+        zoom: this.baseConfig.zoom,
         zoomControl: false,
         attributionControl: false,
         crs: L.CRS.EPSG3857
@@ -89,135 +117,181 @@
       this.map = map // data上需要挂载
       window.map = map
 
-      esri.dynamicMapLayer({
-        url: serverConfig.mapUrlBase
-      }).addTo(map)
-
+      // 加载图层
       this.addLayers()
 
       const that = this
       map.on('click', function(e) {
-
-        console.log('e', e)
-        console.log('e.latlng', e.latlng)
-        console.log('queryEventSwitch', that.queryEventSwitch)
         that.clearPoints()
 
         // 加载定位点
         if (that.showEventPointPopup) {
-          const icon = L.icon({
-            iconUrl: require('../../assets/icons/icon-position.png'),
-            iconSize: [35, 35]
-          })
           const pos = L.marker(e.latlng, {
             icon: icon
           })
           that.markers.push(pos)
           that.map.addLayer(pos)
 
-          // 查询事件或者部件
-          if (that.queryEventSwitch === '1') {
-            // 事件定位
-            // 1查询底图得到所在网格与所在社区
-            const query = that.layers.grid.query()
-            query.nearby(e.latlng, 10)
-            query.run(function(error, featureCollection, response) {
-              if (error) {
-                console.log(error)
-                return
-              }
-              const result = featureCollection.features[0].properties
-              // 赋值
-              that.form.longitude = e.latlng.lng
-              that.form.latitude = e.latlng.lat
-              that.form.gridId = result.CommuId
-              that.form.communityId = result.CommuId
-              that.form.communityName = result.CommuName
-
-              pos.bindPopup('坐标：[' + that.form.longitude.toFixed(4) + ', ' + that.form.latitude.toFixed(4) + ']' + '<p>' + '所在社区：' + result.CommuName).openPopup()
-            })
-          } else if (that.queryEventSwitch === '0') {
-            var latlngs = []
-            var p1 = that.getLonAndLat(e.latlng.lng, e.latlng.lat, 0, 2.5)
-            latlngs.push([p1.lat, p1.lon])
-            var p2 = that.getLonAndLat(e.latlng.lng, e.latlng.lat, 90, 2.5)
-            latlngs.push([p2.lat, p2.lon])
-            var p3 = that.getLonAndLat(e.latlng.lng, e.latlng.lat, 180, 2.5)
-            latlngs.push([p3.lat, p3.lon])
-            var p4 = that.getLonAndLat(e.latlng.lng, e.latlng.lat, 270, 2.5)
-            latlngs.push([p4.lat, p4.lon])
-
-            var polyline = L.polygon(latlngs)
-            const bjQuery = that.layers.bjPoint.query()
-            bjQuery.within(polyline)
-            bjQuery.run(function(error, featureCollection, response) {
-              if (error) {
-                console.log(error)
-                return
-              }
-              if (featureCollection.features.length > 0) {
-                const result = featureCollection.features
-                console.log(result)
-                // 赋值
-                that.compListOpts = []
-                let content = ''
-                result.forEach((item, index) => {
-                  content += '<p>部件' + (index + 1) + '：' + item.properties.大类名称 + '-' + item.properties.小类名称 + '-' + item.properties.编码
-                  const comp = {}
-                  comp.name = '部件' + (index + 1) + '：' + item.properties.大类名称 + '-' + item.properties.小类名称 + '-' + item.properties.编码
-                  comp.value = item.properties.编码
-                  that.compListOpts.push(comp)
-                })
-
-                pos.bindPopup('坐标：[' + e.latlng.lng.toFixed(4) + ', ' + e.latlng.lat.toFixed(4) + ']，附近5米的部件有：' + content).openPopup()
-
-                const query = that.layers.grid.query()
-                query.nearby(e.latlng, 10)
-                query.run(function(error, featureCollection, response) {
-                  if (error) {
-                    console.log(error)
-                    return
-                  }
-                  const result = featureCollection.features[0].properties
-                  // 赋值
-                  that.form.longitude = e.latlng.lng
-                  that.form.latitude = e.latlng.lat
-                  that.form.gridId = result.CommuId
-                  that.form.communityId = result.CommuId
-                  that.form.communityName = result.CommuName
-                })
-              } else {
-                that.$message({
-                  message: '没有查询到部件，请重新定位',
-                  type: 'warning'
-                })
-              }
-            }
-            )
+          // 飞到定位点
+          let zoom = that.map.getZoom()
+          if (zoom < 18) {
+            zoom = 18
           }
+          that.map.flyTo(e.latlng, zoom)
+
+          // 查询所点的网格
+          const query = that.layers.grid.query()
+          query.nearby(e.latlng, 10)
+          query.run(function(error, featureCollection, response) {
+            if (error) {
+              console.log(error)
+              return
+            }
+            const result = featureCollection.features[0].properties
+            // 赋值
+            that.form.longitude = e.latlng.lng
+            that.form.latitude = e.latlng.lat
+            that.form.gridId = result.GBID
+            that.form.communityId = result.GBID.substring(0, 12)
+            that.form.communityName = result.Note
+
+            if (that.queryEventSwitch === '1') {
+              // 事件定位
+              // 弹出事件点位信息
+              const popupStr = '<div class="popup-div">' +
+                '<div class="popup-title">事件点</div>' +
+                '<div class="dashed-line"></div>' +
+                '<div class="popup-item"><label>坐标</label>' + that.form.longitude.toFixed(4) + ', ' + that.form.latitude.toFixed(4) + '</div>' +
+                '<div class="popup-item"><label>所在社区</label>' + that.form.communityName + '</div>' +
+                '<div class="popup-item"><label>网格编号</label>' + that.form.gridId + '</div>' +
+                '</div>'
+
+              pos.bindPopup(popupStr).openPopup()
+            } else if (that.queryEventSwitch === '0') {
+              // 部件定位
+              // 1构建部件查询多边形，上下左右四个点
+              const latlngs = []
+              const p1 = [e.latlng.lat + deltaLat10, e.latlng.lng] // 上方点
+              const p2 = [e.latlng.lat, e.latlng.lng + deltaLng10] // 右侧点
+              const p3 = [e.latlng.lat - deltaLat10, e.latlng.lng] // 下方点
+              const p4 = [e.latlng.lat, e.latlng.lng - deltaLng10] // 左侧点
+              latlngs.push(p1)
+              latlngs.push(p2)
+              latlngs.push(p3)
+              latlngs.push(p4)
+
+              const polyline = L.polygon(latlngs)
+              const bjQuery = that.layers.bjPoint.query()
+              bjQuery.within(polyline)
+              bjQuery.run(function(error, featureCollection, response) {
+                if (error) {
+                  console.log(error)
+                  return
+                }
+
+                // 查询到结果
+                if (featureCollection.features.length > 0) {
+                  const result = featureCollection.features
+                  // 赋值
+                  that.compListOpts = []
+
+                  // 构建弹出窗口信息
+                  let popupStr = '<div class="popup-div">' +
+                    '<div class="popup-title">部件</div>' +
+                    '<div class="dashed-line"></div>' +
+                    '<div class="popup-item">坐标[' + e.latlng.lng.toFixed(4) + ', ' + e.latlng.lat.toFixed(4) + ']附近的部件有</div>' +
+                    '<div class="popup-item"><label>所在社区</label>' + that.form.communityName + '</div>' +
+                    '<div class="popup-item"><label>网格编号</label>' + that.form.gridId + '</div>'
+
+                  result.forEach((item, index) => {
+                    popupStr += '<div class="popup-subitem"><label style="padding-right: 5px;">部件' + (index + 1) + '</label>' + item.properties.dl + '/' + item.properties.xl + '[' + item.properties.objid + ']</div>'
+                    const comp = {}
+                    comp.name = '部件' + (index + 1) + '：' + item.properties.dl + '/' + item.properties.xl + '[' + item.properties.objid + ']'
+                    comp.value = item.properties.objid
+                    that.compListOpts.push(comp)
+                  })
+
+                  popupStr += '</div>'
+                  pos.bindPopup(popupStr).openPopup()
+                } else {
+                  that.$message({ message: '没有查询到部件，请重新定位', type: 'warning' })
+                }
+              })
+            }
+          })
         }
       })
     },
     addLayers() {
+      // 加载天地图底图和标注
+      this.baseLayer.push(L.tileLayer(this.baseConfig.mapUrl).addTo(this.map))
+      this.baseLayer.push(L.tileLayer(this.baseConfig.labelUrl).addTo(this.map))
+
+      // 加载底图
+      esri.dynamicMapLayer({
+        url: `${this.baseUrl}${this.mapUrl}`,
+        zIndex: 1
+      }).addTo(this.map)
+
+      // 初始化部件图层（不分层），待切换到部件定位时加载
       this.layers.bjPoint = esri.featureLayer({
-        url: serverConfig.mapUrlBj + '/0'
+        url: `${this.baseUrl}${this.partsAllUrl}`,
+        minZoom: 19
       })
-      this.layers.grid = esri.featureLayer({
-        url: serverConfig.mapUrlBase + '/16'
-      })
-      this.map.addLayer(this.layers.bjPoint)
-      this.map.addLayer(this.layers.grid)
     },
     switchEventOrComponent: function() {
       // 如果选中的是事件定位（1）或部件定位（0），点击地图时弹出事件或者部件的popup；否则（2以上）显示兴趣点结果的属性popup
       this.showEventPointPopup = this.queryEventSwitch < 2
       this.clearPoints()
+
+      if (this.queryEventSwitch === '0') {
+        // 加载和显示部件图层
+        this.map.addLayer(this.layers.bjPoint)
+        // 清空部件选择的列表
+        this.compListOpts = []
+      } else {
+        this.map.removeLayer(this.layers.bjPoint)
+      }
     },
     clearPoints() {
       const that = this
       this.markers.forEach(marker => {
         that.map.removeLayer(marker)
       })
+      this.pois.forEach(marker => {
+        that.map.removeLayer(marker)
+      })
+    },
+    queryOnMap: function() {
+      const that = this
+      merchantListPage({
+        keyword: this.keywords,
+        limit: this.limit
+      }).then(response => {
+        if (response.code === 200) {
+          console.log(response)
+          this.clearMap()
+          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 {
+            data.rows.forEach(item => {
+              const popupStr = '<div class="popup-div">' +
+                '<div class="popup-title">兴趣点</div>' +
+                '<div class="dashed-line"></div>' +
+                '<div class="popup-item"><label>名称</label>' + item.merchantName + '</div>' +
+                '<div class="popup-item"><label>详细地址</label>' + item.address + '</div>' +
+                '</div>'
+              const poi = L.marker([item.pointY, item.pointX], { icon: poiIcon })
+              poi.bindPopup(popupStr).openPopup()
+              that.pois.push(poi)
+              that.map.addLayer(poi)
+            })
+          }
+        }
+      })
     },
     // 返回事件定位的结果
     checkEventPoint: function() {
@@ -258,72 +332,52 @@
       this.form.gridId = '' // 单元网格ID
       this.form.componentId = '' // 部件ID
       this.form.componentName = '' // 部件名称
-    },
-    numberToRadius(t) {
-      return (t * Math.PI) / 180
-    },
-    numberToDegree(t) {
-      return (180 * t) / Math.PI
-    },
-    /**
-     * 根据一个经纬度及距离角度，算出另外一个经纬度
-     * @param {*} lon 经度 113.3960698
-     * @param {*} lat 纬度 22.941386
-     * @param {*} brng 方位角 45 ---- 正北方：000°或360° 正东方：090° 正南方：180° 正西方：270°
-     * @param {*} dist 90000距离(米)
-     */
-    getLonAndLat(lon, lat, brng, dist) {
-      // 大地坐标系资料WGS-84 长半径a=6378137 短半径b=6356752.3142 扁率f=1/298.2572236
-      var a = 6378137
-      var b = 6356752.3142
-      var f = 1 / 298.257223563
-      var lon1 = lon * 1
-      var lat1 = lat * 1
-      var s = dist
-      var alpha1 = this.numberToRadius(brng)
-      var sinAlpha1 = Math.sin(alpha1)
-      var cosAlpha1 = Math.cos(alpha1)
-      var tanU1 = (1 - f) * Math.tan(this.numberToRadius(lat1))
-      var cosU1 = 1 / Math.sqrt((1 + tanU1 * tanU1)), sinU1 = tanU1 * cosU1
-      var sigma1 = Math.atan2(tanU1, cosAlpha1)
-      var sinAlpha = cosU1 * sinAlpha1
-      var cosSqAlpha = 1 - sinAlpha * sinAlpha
-      var uSq = cosSqAlpha * (a * a - b * b) / (b * b)
-      var A = 1 + uSq / 16384 * (4096 + uSq * (-768 + uSq * (320 - 175 * uSq)))
-      var B = uSq / 1024 * (256 + uSq * (-128 + uSq * (74 - 47 * uSq)))
-      var sigma = s / (b * A), sigmaP = 2 * Math.PI
-      while (Math.abs(sigma - sigmaP) > 1e-12) {
-        var cos2SigmaM = Math.cos(2 * sigma1 + sigma)
-        var sinSigma = Math.sin(sigma)
-        var cosSigma = Math.cos(sigma)
-        var deltaSigma = B * sinSigma * (cos2SigmaM + B / 4 * (cosSigma * (-1 + 2 * cos2SigmaM * cos2SigmaM) -
-          B / 6 * cos2SigmaM * (-3 + 4 * sinSigma * sinSigma) * (-3 + 4 * cos2SigmaM * cos2SigmaM)))
-        sigmaP = sigma
-        sigma = s / (b * A) + deltaSigma
-      }
-      var tmp = sinU1 * sinSigma - cosU1 * cosSigma * cosAlpha1
-      var lat2 = Math.atan2(sinU1 * cosSigma + cosU1 * sinSigma * cosAlpha1, (1 - f) * Math.sqrt(sinAlpha * sinAlpha + tmp * tmp))
-      var lambda = Math.atan2(sinSigma * sinAlpha1, cosU1 * cosSigma - sinU1 * sinSigma * cosAlpha1)
-      var C = f / 16 * cosSqAlpha * (4 + f * (4 - 3 * cosSqAlpha))
-      var L = lambda - (1 - C) * f * sinAlpha * (sigma + C * sinSigma * (cos2SigmaM + C * cosSigma * (-1 + 2 * cos2SigmaM * cos2SigmaM)))
-      var revAz = Math.atan2(sinAlpha, -tmp) // final bearing
-      var lonLatObj = { lon: lon1 + this.numberToDegree(L), lat: this.numberToDegree(lat2) }
-      return lonLatObj
     }
   }
 }
 </script>
 
 <style scoped>
-  @import 'https://js.arcgis.com/4.13/esri/css/main.css';
   .baseMap {
-    height:60vh;
+    height: 65vh;
     width: 100%;
-    margin-top: 25px;
+    margin-top: 10px;
     border: 1px solid #DCDCDC;
     border-radius: 4px;
   }
-  .leaflet-container {
-    background: #fff0;
+</style>
+
+<style>
+  .leaflet-container a.leaflet-popup-close-button {
+    top: 5px; /* 修改弹窗关闭按钮样式 */
+    right: 10px; /* 修改弹窗关闭按钮样式 */
+  }
+
+  .leaflet-popup-content .popup-div {
+    font-size: 15px;
+    padding: 6px;
+  }
+
+  .leaflet-popup-content .popup-title {
+    font-weight: bold;
+  }
+
+  .leaflet-popup-content .dashed-line {
+    border-bottom: 1px dashed #dddddd;
+    margin: 10px -10px;
+  }
+
+  .leaflet-popup-content .popup-item {
+    padding-bottom: 6px;
+  }
+
+  .leaflet-popup-content .popup-item label {
+    font-weight: bold;
+    padding-right: 15px;
+  }
+
+  .leaflet-popup-content .popup-subitem {
+    padding-bottom: 6px;
+    font-size: 12px;
   }
 </style>
diff --git a/src/components/Map/leafletMapRead.vue b/src/components/Map/leafletMapRead.vue
index dd22198..edcd37d 100644
--- a/src/components/Map/leafletMapRead.vue
+++ b/src/components/Map/leafletMapRead.vue
@@ -7,7 +7,7 @@
 <script>
 import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import { mapConfig, serverConfig } from './ArcGISConfig'
+import { mapGetters } from 'vuex'
 const esri = require('esri-leaflet')
 export default {
   name: 'LeafletMapRead',
@@ -23,10 +23,20 @@
   },
   data() {
     return {
+      baseLayer: [],
       mapLoading: false,
       map: null
     }
   },
+  computed: {
+    ...mapGetters([
+      'baseUrl',
+      'partsUrl',
+      'mapUrl',
+      'gridUrl',
+      'partsAllUrl'
+    ])
+  },
   mounted() {
     this.initMap()
     this.addMarker()
@@ -36,9 +46,9 @@
       this.mapLoading = true
       const map = L.map('map', {
         minZoom: 13,
-        // maxZoom: 18,
-        center: [27.755, 116.08],
-        zoom: 16,
+        maxZoom: 24,
+        center: this.baseConfig.center,
+        zoom: this.baseConfig.zoom,
         zoomControl: false,
         attributionControl: false,
         crs: L.CRS.EPSG3857
@@ -47,45 +57,30 @@
       this.map = map // data上需要挂载
       window.map = map
 
+      // 加载天地图底图和标注
+      this.baseLayer.push(L.tileLayer(this.baseConfig.mapUrl).addTo(map))
+      this.baseLayer.push(L.tileLayer(this.baseConfig.labelUrl).addTo(map))
+
       esri.dynamicMapLayer({
-        url: serverConfig.mapUrlBase,
+        url: `${this.baseUrl}${this.mapUrl}`,
         opacity: 1,
         f: 'image'
       }).addTo(map)
 
-      // esri.tiledMapLayer({
-      //   url: serverConfig.mapUrlBase,
-      //   maxZoom: 15,
-      //   f: 'image'
-      // }).addTo(map)
-
-      // for (let i = 0; i < 24; i++) {
-      //   esri.featureLayer({
-      //     url: serverConfig.mapUrlBase + '/' + i
-      //     // minZoom: 4, // 最小缩放等级
-      //     // maxZoom: 21// 最大缩放等级
-      //   }).addTo(map)
-      // }
-
-      esri.featureLayer({
-        url: serverConfig.mapUrlBj + '/0'
-      }).addTo(map)
-      esri.featureLayer({
-        url: serverConfig.mapUrlBase + '/16'
-      }).addTo(map)
       this.mapLoading = false
     },
 
     addMarker() {
       const icon = L.icon({
-        iconUrl: require('../../assets/icons/icon-position.png'),
-        iconSize: [35, 35],
-        iconAnchor: [17.5, 35]
+        iconUrl: require('@/assets/icons/icon-position.png'),
+        iconSize: [32, 32],
+        iconAnchor: [16, 32],
+        popupAnchor: [0, -32]
       })
       const latlng = L.latLng([this.latitude, this.longitude])
       const feat = L.marker(latlng, { icon: icon })
       feat.addTo(this.map)
-      this.map.setView({ lat: this.latitude, lng: this.longitude }, 16)
+      this.map.setView({ lat: this.latitude, lng: this.longitude }, 18)
     }
   }
 }
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 2f77b38..134cb1e 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -31,12 +31,12 @@
         name: 'TimeLimit',
         meta: { title: '阶段时限', icon: '', permission: ['/timeLimit'] }
       },
-      {
-        path: '/caseList',
-        component: () => import('@/views/seo/seo'),
-        name: 'CaseList',
-        meta: { title: '综合查询', icon: '', permission: ['/caseList'] }
-      },
+      // {
+      //   path: '/caseList',
+      //   component: () => import('@/views/seo/seo'),
+      //   name: 'CaseList',
+      //   meta: { title: '综合查询', icon: '', permission: ['/caseList'] }
+      // },
       {
         path: '/caseType',
         component: () => import('@/views/busAdmin/caseType/listCaseType.vue'),
diff --git a/src/store/getters.js b/src/store/getters.js
index 57e8aac..d28b64f 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -30,7 +30,10 @@
   partsUrl: state => state.map.partsUrl, // 部件分层地址
   partsEditUrl: state => state.map.partsEditUrl, // 部件分层地址
   partsAllUrl: state => state.map.partsAllUrl, // 部件不分层地址
+  shopUrl: state => state.map.shopUrl, // 部件不分层地址
   mapUrl: state => state.map.mapUrl, // 底图地址
+  mapDtUrl: state => state.map.mapDtUrl, // 无网格底图地址
+  gridUrl: state => state.map.gridUrl, // 网格图层
   editUrl: state => state.map.editUrl // 编辑地图地址
 }
 export default getters
diff --git a/src/store/modules/map.js b/src/store/modules/map.js
index aa2c6f8..13f5313 100644
--- a/src/store/modules/map.js
+++ b/src/store/modules/map.js
@@ -5,7 +5,10 @@
   baseUrl: '', // 服务基础地址
   partsUrl: '', // 部件分层地址
   partsAllUrl: '', // 部件不分层地址
+  shopUrl: '', // 商户图层
   mapUrl: '', // 二维底图地址
+  mapDtUrl: '', // 无网格地图
+  gridUrl: '', // 网格图层
   editUrl: '' // 编辑地图URL
 }
 const mutations = {
@@ -24,9 +27,18 @@
   SET_PARTS_ALL_URL: (state, url) => {
     state.partsAllUrl = url
   },
+  SET_SHOP_URL: (state, url) => {
+    state.shopUrl = url
+  },
   SET_MAP_URL: (state, url) => {
     state.mapUrl = url
   },
+  SET_MAPDT_URL: (state, url) => {
+    state.mapDtUrl = url
+  },
+  SET_GRID_URL: (state, url) => {
+    state.gridUrl = url
+  },
   SET_EDIT_URL: (state, url) => {
     state.editUrl = url
   }
@@ -52,8 +64,14 @@
               commit('SET_PARTS_EDIT_URL', editUrl)
             } else if (item.name === '部件地图URL') {
               commit('SET_PARTS_ALL_URL', item.url)
+            } else if (item.name === '商户图层URL') {
+              commit('SET_SHOP_URL', item.url)
             } else if (item.name === '二维地图URL') {
               commit('SET_MAP_URL', item.url)
+            } else if (item.name === '无网格地图URL') {
+              commit('SET_MAPDT_URL', item.url)
+            } else if (item.name === '网格图层URL') {
+              commit('SET_GRID_URL', item.url)
             } else if (item.name === '编辑地图URL') {
               commit('SET_EDIT_URL', item.url)
             }
diff --git a/src/views/assessPost/receiverAccessChart.vue b/src/views/assessPost/receiverAccessChart.vue
index 6cc18f8..4e3523d 100644
--- a/src/views/assessPost/receiverAccessChart.vue
+++ b/src/views/assessPost/receiverAccessChart.vue
@@ -97,7 +97,8 @@
         xAxis: {
           data: this.x,
           axisLabel: {
-            fontSize: 14
+            fontSize: 14,
+            interval: 0
           }
         },
         yAxis: {
@@ -115,6 +116,18 @@
           tooltip: {
             position: 'right'
           }
+        }],
+        dataZoom: [{
+          type: 'slider',
+          show: true,
+          start: 0,
+          end: 50,
+          handleSize: 8
+        },
+        {
+          type: 'inside',
+          start: 0,
+          end: 50
         }]
       })
       this.chart.resize()
diff --git a/src/views/assessRegion/accessAreaChart.vue b/src/views/assessRegion/accessAreaChart.vue
index 3424aec..9745b4a 100644
--- a/src/views/assessRegion/accessAreaChart.vue
+++ b/src/views/assessRegion/accessAreaChart.vue
@@ -107,6 +107,18 @@
           tooltip: {
             position: 'right'
           }
+        }],
+        dataZoom: [{
+          type: 'slider',
+          show: true,
+          start: 0,
+          end: 50,
+          handleSize: 8
+        },
+        {
+          type: 'inside',
+          start: 0,
+          end: 50
         }]
       })
       this.chart.resize()
diff --git a/src/views/baseSource/components/layerChoose.vue b/src/views/baseSource/components/layerChoose.vue
index c98e787..2cd75c8 100644
--- a/src/views/baseSource/components/layerChoose.vue
+++ b/src/views/baseSource/components/layerChoose.vue
@@ -13,11 +13,13 @@
     <el-collapse-transition>
       <div v-show="cardShow" class="layers-card">
         <el-tree
+          ref="layerTree"
           :data="layers"
           :default-checked-keys="selectLayers"
           :props="treeProps"
           show-checkbox
           node-key="id"
+          @check="nodeCheck"
           @check-change="checkChange"/>
       </div>
     </el-collapse-transition>
@@ -65,6 +67,9 @@
     }
   },
   methods: {
+    nodeCheck(node, checked) {
+      this.$emit('check', node, checked)
+    },
     checkChange(node, checked) {
       this.$emit('choose', node, checked)
     }
diff --git a/src/views/baseSource/components/searchItem.vue b/src/views/baseSource/components/searchItem.vue
index a0c73f3..e2d52ab 100644
--- a/src/views/baseSource/components/searchItem.vue
+++ b/src/views/baseSource/components/searchItem.vue
@@ -10,9 +10,9 @@
       <img src="@/assets/global_images/point.png" class="item-icon">
     </div>
     <div class="list-item-right">
-      <div class="list-item-right-row"><div>名称：</div><div :title="data.feature.properties.小类名称" class="content">{{ data.feature.properties.小类名称 }}</div></div>
-      <div class="list-item-right-row"><div>编码：</div><div :title="data.feature.properties.编码" class="content">{{ data.feature.properties.编码 }}</div></div>
-      <div class="list-item-right-row"><div>地址：</div><div :title="data.feature.properties.编码" class="content">{{ data.feature.properties.编码 }}</div></div>
+      <div class="list-item-right-row"><div>名称：</div><div :title="data.name" class="content">{{ data.name }}</div></div>
+      <div class="list-item-right-row"><div>编码：</div><div :title="data.code" class="content">{{ data.code }}</div></div>
+      <div class="list-item-right-row"><div>{{ data.content.title }}：</div><div :title="data.content" class="content">{{ data.content.text }}</div></div>
     </div>
   </div>
 </template>
@@ -30,14 +30,9 @@
       required: true
     } // 数据
   },
-  // mounted() {
-  //   debugger
-  //   console.log(this.data.feature)
-  // },
   methods: {
     // 点击数据项
     itemClick() {
-      console.log('点击item')
       this.$emit('click', this.data)
     }
   }

diff --git a/src/assets/icons/icon-poi.png b/src/assets/icons/icon-poi.png
new file mode 100644
index 0000000..364f2f6
--- /dev/null
+++ b/src/assets/icons/icon-poi.png
Binary files differ
diff --git a/src/components/Map/leafletMap.vue b/src/components/Map/leafletMap.vue
index c8b0b6f..e1150e9 100644
--- a/src/components/Map/leafletMap.vue
+++ b/src/components/Map/leafletMap.vue
@@ -1,25 +1,21 @@
 <template>
-  <div style="margin-top: -10px">
+  <div style="margin-top: -30px; margin-bottom: -10px;">
     <el-row :gutter="20">
-      <div v-show="showpoi">
-        <el-col :span="3">
-          <el-input v-model="keywords" size="small" type="text" placeholder="兴趣点关键字" clearable />
-        </el-col>
-        <el-col :span="5">
-          <el-button type="primary" size="small" @click="queryOnMap">查询</el-button>
-          <el-button type="info" size="small" @click="clearMap"> 清除地图 </el-button>
-        </el-col>
-      </div>
+      <el-col v-show="showpoi" :span="8">
+        <el-input v-model="keywords" size="small" type="text" placeholder="兴趣点关键字" clearable style="width: 50%" />
+        <el-button type="primary" size="small" @click="queryOnMap">查询</el-button>
+        <el-button type="info" size="small" @click="clearMap"> 清除地图 </el-button>
+      </el-col>
 
-      <el-col :span="6" :offset="8" style="text-align: right;">
+      <el-col :span="8" style="text-align: right">
         <el-radio-group v-model="queryEventSwitch" size="small" @change="switchEventOrComponent">
           <el-radio-button label="1">事件定位</el-radio-button>
           <el-radio-button label="0">部件定位</el-radio-button>
-          <el-radio-button v-show="showpoi" label="2">兴趣点属性</el-radio-button>
+          <!--          <el-radio-button v-show="showpoi" label="2">兴趣点属性</el-radio-button>-->
         </el-radio-group>
       </el-col>
 
-      <el-col v-if="queryEventSwitch === '0'" :span="10" :offset="0" style="text-align: right;">
+      <el-col v-if="queryEventSwitch === '0'" :span="8" style="text-align: right;">
         <el-select v-model="form.componentId" placeholder="选择部件" clearable value="" size="small">
           <el-option
             v-for="item in compListOpts"
@@ -30,7 +26,7 @@
         <el-button type="primary" size="small" @click="checkComponentPoint"> 部件提交 </el-button>
       </el-col>
 
-      <el-col v-if="queryEventSwitch === '1'" :span="10" :offset="0" style="text-align: right;">
+      <el-col v-if="queryEventSwitch === '1'" :span="8" :offset="0" style="text-align: right;">
         <el-button type="primary" size="small" @click="checkEventPoint"> 事件提交 </el-button>
       </el-col>
     </el-row>
@@ -42,18 +38,40 @@
 <script>
 import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import { mapConfig, serverConfig } from './ArcGISConfig'
+import { mapGetters } from 'vuex'
+import { merchantListPage } from '@/api/geoCoding/geoCoding'
+
 const esri = require('esri-leaflet')
 
+const icon = L.icon({
+  iconUrl: require('@/assets/icons/icon-position.png'),
+  iconSize: [32, 32],
+  iconAnchor: [16, 32],
+  popupAnchor: [0, -32]
+})
+
+const poiIcon = L.icon({
+  iconUrl: require('@/assets/icons/icon-poi.png'),
+  iconSize: [16, 16],
+  iconAnchor: [8, 16],
+  popupAnchor: [0, -16]
+})
+
+const deltaLng10 = 0.00002536 // 10米范围经度值偏移量（大约）
+const deltaLat10 = 0.00002256 // 10米范围纬度值偏移量（大约）
+
 export default {
   name: 'LeafletMap',
   data() {
     return {
       map: null,
-      markers: [],
+      baseLayer: [],
+      markers: [], // 选点
+      pois: [], // 兴趣点结果
       layers: {
         bjPoint: '', // 部件点图层
-        grid: '' // 单元网格图层
+        grid: '', // 单元网格图层
+        shopPoint: '' // 商铺图层
       },
       form: {
         longitude: '', // 定位点经度
@@ -64,23 +82,33 @@
         componentId: '', // 部件ID
         componentName: '' // 部件名称
       }, // 主页面返回值
-      showpoi: false,
+      showpoi: true,
       keywords: '', // 查询关键字
+      limit: 100, // 兴趣点查询的最大结果数
       showEventPointPopup: true, // 是否显示事部件的popup
       queryEventSwitch: '1', // 1==查询事件；0==查询部件
       compListOpts: [] // 部件选择下拉框option
     }
   },
+  computed: {
+    ...mapGetters([
+      'baseUrl',
+      'partsUrl',
+      'mapUrl',
+      'gridUrl',
+      'partsAllUrl'
+    ])
+  },
   mounted() {
     this.initMap()
   },
   methods: {
     initMap() {
-      const map = L.map('map', {
-        minZoom: 13,
-        // maxZoom: 18,
-        center: [27.755, 116.08],
-        zoom: 16,
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: 14,
+        maxZoom: 25,
+        center: this.baseConfig.center,
+        zoom: this.baseConfig.zoom,
         zoomControl: false,
         attributionControl: false,
         crs: L.CRS.EPSG3857
@@ -89,135 +117,181 @@
       this.map = map // data上需要挂载
       window.map = map
 
-      esri.dynamicMapLayer({
-        url: serverConfig.mapUrlBase
-      }).addTo(map)
-
+      // 加载图层
       this.addLayers()
 
       const that = this
       map.on('click', function(e) {
-
-        console.log('e', e)
-        console.log('e.latlng', e.latlng)
-        console.log('queryEventSwitch', that.queryEventSwitch)
         that.clearPoints()
 
         // 加载定位点
         if (that.showEventPointPopup) {
-          const icon = L.icon({
-            iconUrl: require('../../assets/icons/icon-position.png'),
-            iconSize: [35, 35]
-          })
           const pos = L.marker(e.latlng, {
             icon: icon
           })
           that.markers.push(pos)
           that.map.addLayer(pos)
 
-          // 查询事件或者部件
-          if (that.queryEventSwitch === '1') {
-            // 事件定位
-            // 1查询底图得到所在网格与所在社区
-            const query = that.layers.grid.query()
-            query.nearby(e.latlng, 10)
-            query.run(function(error, featureCollection, response) {
-              if (error) {
-                console.log(error)
-                return
-              }
-              const result = featureCollection.features[0].properties
-              // 赋值
-              that.form.longitude = e.latlng.lng
-              that.form.latitude = e.latlng.lat
-              that.form.gridId = result.CommuId
-              that.form.communityId = result.CommuId
-              that.form.communityName = result.CommuName
-
-              pos.bindPopup('坐标：[' + that.form.longitude.toFixed(4) + ', ' + that.form.latitude.toFixed(4) + ']' + '<p>' + '所在社区：' + result.CommuName).openPopup()
-            })
-          } else if (that.queryEventSwitch === '0') {
-            var latlngs = []
-            var p1 = that.getLonAndLat(e.latlng.lng, e.latlng.lat, 0, 2.5)
-            latlngs.push([p1.lat, p1.lon])
-            var p2 = that.getLonAndLat(e.latlng.lng, e.latlng.lat, 90, 2.5)
-            latlngs.push([p2.lat, p2.lon])
-            var p3 = that.getLonAndLat(e.latlng.lng, e.latlng.lat, 180, 2.5)
-            latlngs.push([p3.lat, p3.lon])
-            var p4 = that.getLonAndLat(e.latlng.lng, e.latlng.lat, 270, 2.5)
-            latlngs.push([p4.lat, p4.lon])
-
-            var polyline = L.polygon(latlngs)
-            const bjQuery = that.layers.bjPoint.query()
-            bjQuery.within(polyline)
-            bjQuery.run(function(error, featureCollection, response) {
-              if (error) {
-                console.log(error)
-                return
-              }
-              if (featureCollection.features.length > 0) {
-                const result = featureCollection.features
-                console.log(result)
-                // 赋值
-                that.compListOpts = []
-                let content = ''
-                result.forEach((item, index) => {
-                  content += '<p>部件' + (index + 1) + '：' + item.properties.大类名称 + '-' + item.properties.小类名称 + '-' + item.properties.编码
-                  const comp = {}
-                  comp.name = '部件' + (index + 1) + '：' + item.properties.大类名称 + '-' + item.properties.小类名称 + '-' + item.properties.编码
-                  comp.value = item.properties.编码
-                  that.compListOpts.push(comp)
-                })
-
-                pos.bindPopup('坐标：[' + e.latlng.lng.toFixed(4) + ', ' + e.latlng.lat.toFixed(4) + ']，附近5米的部件有：' + content).openPopup()
-
-                const query = that.layers.grid.query()
-                query.nearby(e.latlng, 10)
-                query.run(function(error, featureCollection, response) {
-                  if (error) {
-                    console.log(error)
-                    return
-                  }
-                  const result = featureCollection.features[0].properties
-                  // 赋值
-                  that.form.longitude = e.latlng.lng
-                  that.form.latitude = e.latlng.lat
-                  that.form.gridId = result.CommuId
-                  that.form.communityId = result.CommuId
-                  that.form.communityName = result.CommuName
-                })
-              } else {
-                that.$message({
-                  message: '没有查询到部件，请重新定位',
-                  type: 'warning'
-                })
-              }
-            }
-            )
+          // 飞到定位点
+          let zoom = that.map.getZoom()
+          if (zoom < 18) {
+            zoom = 18
           }
+          that.map.flyTo(e.latlng, zoom)
+
+          // 查询所点的网格
+          const query = that.layers.grid.query()
+          query.nearby(e.latlng, 10)
+          query.run(function(error, featureCollection, response) {
+            if (error) {
+              console.log(error)
+              return
+            }
+            const result = featureCollection.features[0].properties
+            // 赋值
+            that.form.longitude = e.latlng.lng
+            that.form.latitude = e.latlng.lat
+            that.form.gridId = result.GBID
+            that.form.communityId = result.GBID.substring(0, 12)
+            that.form.communityName = result.Note
+
+            if (that.queryEventSwitch === '1') {
+              // 事件定位
+              // 弹出事件点位信息
+              const popupStr = '<div class="popup-div">' +
+                '<div class="popup-title">事件点</div>' +
+                '<div class="dashed-line"></div>' +
+                '<div class="popup-item"><label>坐标</label>' + that.form.longitude.toFixed(4) + ', ' + that.form.latitude.toFixed(4) + '</div>' +
+                '<div class="popup-item"><label>所在社区</label>' + that.form.communityName + '</div>' +
+                '<div class="popup-item"><label>网格编号</label>' + that.form.gridId + '</div>' +
+                '</div>'
+
+              pos.bindPopup(popupStr).openPopup()
+            } else if (that.queryEventSwitch === '0') {
+              // 部件定位
+              // 1构建部件查询多边形，上下左右四个点
+              const latlngs = []
+              const p1 = [e.latlng.lat + deltaLat10, e.latlng.lng] // 上方点
+              const p2 = [e.latlng.lat, e.latlng.lng + deltaLng10] // 右侧点
+              const p3 = [e.latlng.lat - deltaLat10, e.latlng.lng] // 下方点
+              const p4 = [e.latlng.lat, e.latlng.lng - deltaLng10] // 左侧点
+              latlngs.push(p1)
+              latlngs.push(p2)
+              latlngs.push(p3)
+              latlngs.push(p4)
+
+              const polyline = L.polygon(latlngs)
+              const bjQuery = that.layers.bjPoint.query()
+              bjQuery.within(polyline)
+              bjQuery.run(function(error, featureCollection, response) {
+                if (error) {
+                  console.log(error)
+                  return
+                }
+
+                // 查询到结果
+                if (featureCollection.features.length > 0) {
+                  const result = featureCollection.features
+                  // 赋值
+                  that.compListOpts = []
+
+                  // 构建弹出窗口信息
+                  let popupStr = '<div class="popup-div">' +
+                    '<div class="popup-title">部件</div>' +
+                    '<div class="dashed-line"></div>' +
+                    '<div class="popup-item">坐标[' + e.latlng.lng.toFixed(4) + ', ' + e.latlng.lat.toFixed(4) + ']附近的部件有</div>' +
+                    '<div class="popup-item"><label>所在社区</label>' + that.form.communityName + '</div>' +
+                    '<div class="popup-item"><label>网格编号</label>' + that.form.gridId + '</div>'
+
+                  result.forEach((item, index) => {
+                    popupStr += '<div class="popup-subitem"><label style="padding-right: 5px;">部件' + (index + 1) + '</label>' + item.properties.dl + '/' + item.properties.xl + '[' + item.properties.objid + ']</div>'
+                    const comp = {}
+                    comp.name = '部件' + (index + 1) + '：' + item.properties.dl + '/' + item.properties.xl + '[' + item.properties.objid + ']'
+                    comp.value = item.properties.objid
+                    that.compListOpts.push(comp)
+                  })
+
+                  popupStr += '</div>'
+                  pos.bindPopup(popupStr).openPopup()
+                } else {
+                  that.$message({ message: '没有查询到部件，请重新定位', type: 'warning' })
+                }
+              })
+            }
+          })
         }
       })
     },
     addLayers() {
+      // 加载天地图底图和标注
+      this.baseLayer.push(L.tileLayer(this.baseConfig.mapUrl).addTo(this.map))
+      this.baseLayer.push(L.tileLayer(this.baseConfig.labelUrl).addTo(this.map))
+
+      // 加载底图
+      esri.dynamicMapLayer({
+        url: `${this.baseUrl}${this.mapUrl}`,
+        zIndex: 1
+      }).addTo(this.map)
+
+      // 初始化部件图层（不分层），待切换到部件定位时加载
       this.layers.bjPoint = esri.featureLayer({
-        url: serverConfig.mapUrlBj + '/0'
+        url: `${this.baseUrl}${this.partsAllUrl}`,
+        minZoom: 19
       })
-      this.layers.grid = esri.featureLayer({
-        url: serverConfig.mapUrlBase + '/16'
-      })
-      this.map.addLayer(this.layers.bjPoint)
-      this.map.addLayer(this.layers.grid)
     },
     switchEventOrComponent: function() {
       // 如果选中的是事件定位（1）或部件定位（0），点击地图时弹出事件或者部件的popup；否则（2以上）显示兴趣点结果的属性popup
       this.showEventPointPopup = this.queryEventSwitch < 2
       this.clearPoints()
+
+      if (this.queryEventSwitch === '0') {
+        // 加载和显示部件图层
+        this.map.addLayer(this.layers.bjPoint)
+        // 清空部件选择的列表
+        this.compListOpts = []
+      } else {
+        this.map.removeLayer(this.layers.bjPoint)
+      }
     },
     clearPoints() {
       const that = this
       this.markers.forEach(marker => {
         that.map.removeLayer(marker)
       })
+      this.pois.forEach(marker => {
+        that.map.removeLayer(marker)
+      })
+    },
+    queryOnMap: function() {
+      const that = this
+      merchantListPage({
+        keyword: this.keywords,
+        limit: this.limit
+      }).then(response => {
+        if (response.code === 200) {
+          console.log(response)
+          this.clearMap()
+          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 {
+            data.rows.forEach(item => {
+              const popupStr = '<div class="popup-div">' +
+                '<div class="popup-title">兴趣点</div>' +
+                '<div class="dashed-line"></div>' +
+                '<div class="popup-item"><label>名称</label>' + item.merchantName + '</div>' +
+                '<div class="popup-item"><label>详细地址</label>' + item.address + '</div>' +
+                '</div>'
+              const poi = L.marker([item.pointY, item.pointX], { icon: poiIcon })
+              poi.bindPopup(popupStr).openPopup()
+              that.pois.push(poi)
+              that.map.addLayer(poi)
+            })
+          }
+        }
+      })
     },
     // 返回事件定位的结果
     checkEventPoint: function() {
@@ -258,72 +332,52 @@
       this.form.gridId = '' // 单元网格ID
       this.form.componentId = '' // 部件ID
       this.form.componentName = '' // 部件名称
-    },
-    numberToRadius(t) {
-      return (t * Math.PI) / 180
-    },
-    numberToDegree(t) {
-      return (180 * t) / Math.PI
-    },
-    /**
-     * 根据一个经纬度及距离角度，算出另外一个经纬度
-     * @param {*} lon 经度 113.3960698
-     * @param {*} lat 纬度 22.941386
-     * @param {*} brng 方位角 45 ---- 正北方：000°或360° 正东方：090° 正南方：180° 正西方：270°
-     * @param {*} dist 90000距离(米)
-     */
-    getLonAndLat(lon, lat, brng, dist) {
-      // 大地坐标系资料WGS-84 长半径a=6378137 短半径b=6356752.3142 扁率f=1/298.2572236
-      var a = 6378137
-      var b = 6356752.3142
-      var f = 1 / 298.257223563
-      var lon1 = lon * 1
-      var lat1 = lat * 1
-      var s = dist
-      var alpha1 = this.numberToRadius(brng)
-      var sinAlpha1 = Math.sin(alpha1)
-      var cosAlpha1 = Math.cos(alpha1)
-      var tanU1 = (1 - f) * Math.tan(this.numberToRadius(lat1))
-      var cosU1 = 1 / Math.sqrt((1 + tanU1 * tanU1)), sinU1 = tanU1 * cosU1
-      var sigma1 = Math.atan2(tanU1, cosAlpha1)
-      var sinAlpha = cosU1 * sinAlpha1
-      var cosSqAlpha = 1 - sinAlpha * sinAlpha
-      var uSq = cosSqAlpha * (a * a - b * b) / (b * b)
-      var A = 1 + uSq / 16384 * (4096 + uSq * (-768 + uSq * (320 - 175 * uSq)))
-      var B = uSq / 1024 * (256 + uSq * (-128 + uSq * (74 - 47 * uSq)))
-      var sigma = s / (b * A), sigmaP = 2 * Math.PI
-      while (Math.abs(sigma - sigmaP) > 1e-12) {
-        var cos2SigmaM = Math.cos(2 * sigma1 + sigma)
-        var sinSigma = Math.sin(sigma)
-        var cosSigma = Math.cos(sigma)
-        var deltaSigma = B * sinSigma * (cos2SigmaM + B / 4 * (cosSigma * (-1 + 2 * cos2SigmaM * cos2SigmaM) -
-          B / 6 * cos2SigmaM * (-3 + 4 * sinSigma * sinSigma) * (-3 + 4 * cos2SigmaM * cos2SigmaM)))
-        sigmaP = sigma
-        sigma = s / (b * A) + deltaSigma
-      }
-      var tmp = sinU1 * sinSigma - cosU1 * cosSigma * cosAlpha1
-      var lat2 = Math.atan2(sinU1 * cosSigma + cosU1 * sinSigma * cosAlpha1, (1 - f) * Math.sqrt(sinAlpha * sinAlpha + tmp * tmp))
-      var lambda = Math.atan2(sinSigma * sinAlpha1, cosU1 * cosSigma - sinU1 * sinSigma * cosAlpha1)
-      var C = f / 16 * cosSqAlpha * (4 + f * (4 - 3 * cosSqAlpha))
-      var L = lambda - (1 - C) * f * sinAlpha * (sigma + C * sinSigma * (cos2SigmaM + C * cosSigma * (-1 + 2 * cos2SigmaM * cos2SigmaM)))
-      var revAz = Math.atan2(sinAlpha, -tmp) // final bearing
-      var lonLatObj = { lon: lon1 + this.numberToDegree(L), lat: this.numberToDegree(lat2) }
-      return lonLatObj
     }
   }
 }
 </script>
 
 <style scoped>
-  @import 'https://js.arcgis.com/4.13/esri/css/main.css';
   .baseMap {
-    height:60vh;
+    height: 65vh;
     width: 100%;
-    margin-top: 25px;
+    margin-top: 10px;
     border: 1px solid #DCDCDC;
     border-radius: 4px;
   }
-  .leaflet-container {
-    background: #fff0;
+</style>
+
+<style>
+  .leaflet-container a.leaflet-popup-close-button {
+    top: 5px; /* 修改弹窗关闭按钮样式 */
+    right: 10px; /* 修改弹窗关闭按钮样式 */
+  }
+
+  .leaflet-popup-content .popup-div {
+    font-size: 15px;
+    padding: 6px;
+  }
+
+  .leaflet-popup-content .popup-title {
+    font-weight: bold;
+  }
+
+  .leaflet-popup-content .dashed-line {
+    border-bottom: 1px dashed #dddddd;
+    margin: 10px -10px;
+  }
+
+  .leaflet-popup-content .popup-item {
+    padding-bottom: 6px;
+  }
+
+  .leaflet-popup-content .popup-item label {
+    font-weight: bold;
+    padding-right: 15px;
+  }
+
+  .leaflet-popup-content .popup-subitem {
+    padding-bottom: 6px;
+    font-size: 12px;
   }
 </style>
diff --git a/src/components/Map/leafletMapRead.vue b/src/components/Map/leafletMapRead.vue
index dd22198..edcd37d 100644
--- a/src/components/Map/leafletMapRead.vue
+++ b/src/components/Map/leafletMapRead.vue
@@ -7,7 +7,7 @@
 <script>
 import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import { mapConfig, serverConfig } from './ArcGISConfig'
+import { mapGetters } from 'vuex'
 const esri = require('esri-leaflet')
 export default {
   name: 'LeafletMapRead',
@@ -23,10 +23,20 @@
   },
   data() {
     return {
+      baseLayer: [],
       mapLoading: false,
       map: null
     }
   },
+  computed: {
+    ...mapGetters([
+      'baseUrl',
+      'partsUrl',
+      'mapUrl',
+      'gridUrl',
+      'partsAllUrl'
+    ])
+  },
   mounted() {
     this.initMap()
     this.addMarker()
@@ -36,9 +46,9 @@
       this.mapLoading = true
       const map = L.map('map', {
         minZoom: 13,
-        // maxZoom: 18,
-        center: [27.755, 116.08],
-        zoom: 16,
+        maxZoom: 24,
+        center: this.baseConfig.center,
+        zoom: this.baseConfig.zoom,
         zoomControl: false,
         attributionControl: false,
         crs: L.CRS.EPSG3857
@@ -47,45 +57,30 @@
       this.map = map // data上需要挂载
       window.map = map
 
+      // 加载天地图底图和标注
+      this.baseLayer.push(L.tileLayer(this.baseConfig.mapUrl).addTo(map))
+      this.baseLayer.push(L.tileLayer(this.baseConfig.labelUrl).addTo(map))
+
       esri.dynamicMapLayer({
-        url: serverConfig.mapUrlBase,
+        url: `${this.baseUrl}${this.mapUrl}`,
         opacity: 1,
         f: 'image'
       }).addTo(map)
 
-      // esri.tiledMapLayer({
-      //   url: serverConfig.mapUrlBase,
-      //   maxZoom: 15,
-      //   f: 'image'
-      // }).addTo(map)
-
-      // for (let i = 0; i < 24; i++) {
-      //   esri.featureLayer({
-      //     url: serverConfig.mapUrlBase + '/' + i
-      //     // minZoom: 4, // 最小缩放等级
-      //     // maxZoom: 21// 最大缩放等级
-      //   }).addTo(map)
-      // }
-
-      esri.featureLayer({
-        url: serverConfig.mapUrlBj + '/0'
-      }).addTo(map)
-      esri.featureLayer({
-        url: serverConfig.mapUrlBase + '/16'
-      }).addTo(map)
       this.mapLoading = false
     },
 
     addMarker() {
       const icon = L.icon({
-        iconUrl: require('../../assets/icons/icon-position.png'),
-        iconSize: [35, 35],
-        iconAnchor: [17.5, 35]
+        iconUrl: require('@/assets/icons/icon-position.png'),
+        iconSize: [32, 32],
+        iconAnchor: [16, 32],
+        popupAnchor: [0, -32]
       })
       const latlng = L.latLng([this.latitude, this.longitude])
       const feat = L.marker(latlng, { icon: icon })
       feat.addTo(this.map)
-      this.map.setView({ lat: this.latitude, lng: this.longitude }, 16)
+      this.map.setView({ lat: this.latitude, lng: this.longitude }, 18)
     }
   }
 }
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 2f77b38..134cb1e 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -31,12 +31,12 @@
         name: 'TimeLimit',
         meta: { title: '阶段时限', icon: '', permission: ['/timeLimit'] }
       },
-      {
-        path: '/caseList',
-        component: () => import('@/views/seo/seo'),
-        name: 'CaseList',
-        meta: { title: '综合查询', icon: '', permission: ['/caseList'] }
-      },
+      // {
+      //   path: '/caseList',
+      //   component: () => import('@/views/seo/seo'),
+      //   name: 'CaseList',
+      //   meta: { title: '综合查询', icon: '', permission: ['/caseList'] }
+      // },
       {
         path: '/caseType',
         component: () => import('@/views/busAdmin/caseType/listCaseType.vue'),
diff --git a/src/store/getters.js b/src/store/getters.js
index 57e8aac..d28b64f 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -30,7 +30,10 @@
   partsUrl: state => state.map.partsUrl, // 部件分层地址
   partsEditUrl: state => state.map.partsEditUrl, // 部件分层地址
   partsAllUrl: state => state.map.partsAllUrl, // 部件不分层地址
+  shopUrl: state => state.map.shopUrl, // 部件不分层地址
   mapUrl: state => state.map.mapUrl, // 底图地址
+  mapDtUrl: state => state.map.mapDtUrl, // 无网格底图地址
+  gridUrl: state => state.map.gridUrl, // 网格图层
   editUrl: state => state.map.editUrl // 编辑地图地址
 }
 export default getters
diff --git a/src/store/modules/map.js b/src/store/modules/map.js
index aa2c6f8..13f5313 100644
--- a/src/store/modules/map.js
+++ b/src/store/modules/map.js
@@ -5,7 +5,10 @@
   baseUrl: '', // 服务基础地址
   partsUrl: '', // 部件分层地址
   partsAllUrl: '', // 部件不分层地址
+  shopUrl: '', // 商户图层
   mapUrl: '', // 二维底图地址
+  mapDtUrl: '', // 无网格地图
+  gridUrl: '', // 网格图层
   editUrl: '' // 编辑地图URL
 }
 const mutations = {
@@ -24,9 +27,18 @@
   SET_PARTS_ALL_URL: (state, url) => {
     state.partsAllUrl = url
   },
+  SET_SHOP_URL: (state, url) => {
+    state.shopUrl = url
+  },
   SET_MAP_URL: (state, url) => {
     state.mapUrl = url
   },
+  SET_MAPDT_URL: (state, url) => {
+    state.mapDtUrl = url
+  },
+  SET_GRID_URL: (state, url) => {
+    state.gridUrl = url
+  },
   SET_EDIT_URL: (state, url) => {
     state.editUrl = url
   }
@@ -52,8 +64,14 @@
               commit('SET_PARTS_EDIT_URL', editUrl)
             } else if (item.name === '部件地图URL') {
               commit('SET_PARTS_ALL_URL', item.url)
+            } else if (item.name === '商户图层URL') {
+              commit('SET_SHOP_URL', item.url)
             } else if (item.name === '二维地图URL') {
               commit('SET_MAP_URL', item.url)
+            } else if (item.name === '无网格地图URL') {
+              commit('SET_MAPDT_URL', item.url)
+            } else if (item.name === '网格图层URL') {
+              commit('SET_GRID_URL', item.url)
             } else if (item.name === '编辑地图URL') {
               commit('SET_EDIT_URL', item.url)
             }
diff --git a/src/views/assessPost/receiverAccessChart.vue b/src/views/assessPost/receiverAccessChart.vue
index 6cc18f8..4e3523d 100644
--- a/src/views/assessPost/receiverAccessChart.vue
+++ b/src/views/assessPost/receiverAccessChart.vue
@@ -97,7 +97,8 @@
         xAxis: {
           data: this.x,
           axisLabel: {
-            fontSize: 14
+            fontSize: 14,
+            interval: 0
           }
         },
         yAxis: {
@@ -115,6 +116,18 @@
           tooltip: {
             position: 'right'
           }
+        }],
+        dataZoom: [{
+          type: 'slider',
+          show: true,
+          start: 0,
+          end: 50,
+          handleSize: 8
+        },
+        {
+          type: 'inside',
+          start: 0,
+          end: 50
         }]
       })
       this.chart.resize()
diff --git a/src/views/assessRegion/accessAreaChart.vue b/src/views/assessRegion/accessAreaChart.vue
index 3424aec..9745b4a 100644
--- a/src/views/assessRegion/accessAreaChart.vue
+++ b/src/views/assessRegion/accessAreaChart.vue
@@ -107,6 +107,18 @@
           tooltip: {
             position: 'right'
           }
+        }],
+        dataZoom: [{
+          type: 'slider',
+          show: true,
+          start: 0,
+          end: 50,
+          handleSize: 8
+        },
+        {
+          type: 'inside',
+          start: 0,
+          end: 50
         }]
       })
       this.chart.resize()
diff --git a/src/views/baseSource/components/layerChoose.vue b/src/views/baseSource/components/layerChoose.vue
index c98e787..2cd75c8 100644
--- a/src/views/baseSource/components/layerChoose.vue
+++ b/src/views/baseSource/components/layerChoose.vue
@@ -13,11 +13,13 @@
     <el-collapse-transition>
       <div v-show="cardShow" class="layers-card">
         <el-tree
+          ref="layerTree"
           :data="layers"
           :default-checked-keys="selectLayers"
           :props="treeProps"
           show-checkbox
           node-key="id"
+          @check="nodeCheck"
           @check-change="checkChange"/>
       </div>
     </el-collapse-transition>
@@ -65,6 +67,9 @@
     }
   },
   methods: {
+    nodeCheck(node, checked) {
+      this.$emit('check', node, checked)
+    },
     checkChange(node, checked) {
       this.$emit('choose', node, checked)
     }
diff --git a/src/views/baseSource/components/searchItem.vue b/src/views/baseSource/components/searchItem.vue
index a0c73f3..e2d52ab 100644
--- a/src/views/baseSource/components/searchItem.vue
+++ b/src/views/baseSource/components/searchItem.vue
@@ -10,9 +10,9 @@
       <img src="@/assets/global_images/point.png" class="item-icon">
     </div>
     <div class="list-item-right">
-      <div class="list-item-right-row"><div>名称：</div><div :title="data.feature.properties.小类名称" class="content">{{ data.feature.properties.小类名称 }}</div></div>
-      <div class="list-item-right-row"><div>编码：</div><div :title="data.feature.properties.编码" class="content">{{ data.feature.properties.编码 }}</div></div>
-      <div class="list-item-right-row"><div>地址：</div><div :title="data.feature.properties.编码" class="content">{{ data.feature.properties.编码 }}</div></div>
+      <div class="list-item-right-row"><div>名称：</div><div :title="data.name" class="content">{{ data.name }}</div></div>
+      <div class="list-item-right-row"><div>编码：</div><div :title="data.code" class="content">{{ data.code }}</div></div>
+      <div class="list-item-right-row"><div>{{ data.content.title }}：</div><div :title="data.content" class="content">{{ data.content.text }}</div></div>
     </div>
   </div>
 </template>
@@ -30,14 +30,9 @@
       required: true
     } // 数据
   },
-  // mounted() {
-  //   debugger
-  //   console.log(this.data.feature)
-  // },
   methods: {
     // 点击数据项
     itemClick() {
-      console.log('点击item')
       this.$emit('click', this.data)
     }
   }
diff --git a/src/views/baseSource/mapSearch.vue b/src/views/baseSource/mapSearch.vue
index 71147d8..5ae0c05 100644
--- a/src/views/baseSource/mapSearch.vue
+++ b/src/views/baseSource/mapSearch.vue
@@ -17,7 +17,7 @@
         <!--重置工具-->
         <clear-tool :disabled="clearDisabled" @click="drawDelete"/>
         <!--图层选择工具-->
-        <layer-choose :layers="layers" :select-layers="selectLayers" @choose="layerChange"/>
+        <layer-choose ref="layerRadio" :layers="layers" :select-layers="selectLayers" @check="layerChange"/>
       </tools-container>
       <!--图层选择组件-->
     </div>
@@ -45,10 +45,15 @@
       drawLayer: null, // 绘制图层（框选）
       bounds: null, // 查询区域
       clearDisabled: true, // 禁用重置按钮
-      layers: this.baseConfig.layers, // 所有图层
-      selectLayers: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], // 选中图层
+      baseLayer: [],
+      layers: [
+        { 'id': 0, 'name': '商户', 'type': 'layer', 'domain': [35] },
+        { 'id': 1, 'name': '部件', 'type': 'layer', 'domain': [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 15, 16, 18, 19, 20, 21, 22, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45] }
+      ],
+      selectLayers: [0], // 选中图层
       maps: [], // 地图图层
       parts: [], // 部件图层
+      layerGroups: [], // 图层组，用于控制一组内容显示或者隐藏
       searchList: [], // 全部查询结果
       featureCollection: [], // 选中的图层和Feature
       featureCollectionLength: 0, // 选中的feature个数
@@ -60,9 +65,8 @@
     ...mapGetters([
       'baseUrl',
       'partsUrl',
-      'partsAllUrl',
-      'mapUrl',
-      'partsEditUrl'
+      'shopUrl',
+      'mapUrl'
     ])
   },
   destroyed() {
@@ -89,18 +93,17 @@
       } // 其他不予处理
       this.searchLoading = true
       const results = [] // 存放查询结果列表
-      // 遍历所有图层进行查询
-      const partsLength = this.parts.length // 全部部件图层数量
-      for (let i = 0; i < partsLength; i++) {
-        const part = this.parts[i]
-        var str = ['编码', '小类名称', '大类名称']
-        var query = esri.query({ url: part.options.url })
+
+      // 获取是查询部件还是查询商户
+      if (this.selectLayers.toString() === '0') {
+        // 查询商户
+        const str = ['objid', 'dutyname', 'position_'] // 查询条件属性
+        const query = esri.query({ url: `${this.baseUrl}${this.shopUrl}` })
         let queryString = '1=1' // 默认查询语句
         // 如果有关键字
         if (this.keyword) {
           // 拼接查询语句
           queryString = str.map(item => `(${item} like '%${this.keyword}%')`).join(' OR ')
-          console.log(queryString)
         } else {
           return
         }
@@ -119,18 +122,98 @@
           if (featuresLength > 0) {
             // 遍历所有查询结果，放入results
             for (const feature of featureCollection.features) {
+              const popupStr = '<div class="popup-div">' +
+                '<div class="popup-title">商户信息</div>' +
+                '<div class="dashed-line"></div>' +
+                '<div class="popup-item"><label>商户名称</label>' + feature.properties.dutyname + '</div>' +
+                '<div class="popup-item"><label>商户编号</label>' + feature.properties.objid + '</div>' +
+                // '<div class="popup-item"><label>所在社区</label>' + feature.properties.communame + '</div>' +
+                // '<div class="popup-item"><label>所在网格编号</label>' + feature.properties.bgid + '</div>' +
+                '<div class="popup-item"><label>三包责任单位</label>' + feature.properties.deptname + '</div>' +
+                '<div class="popup-item"><label>详细地址</label>' + feature.properties.position_ + '</div>' +
+                '</div>'
+
               results.push({
-                layer: part,
-                feature: feature
+                name: feature.properties.dutyname,
+                code: feature.properties.objid,
+                content: {
+                  title: '地址',
+                  text: feature.properties.position_
+                },
+                lng: feature.properties.x,
+                lat: feature.properties.y,
+                popupStr: popupStr
               })
             }
           }
-          // 如果是最后一个图层
-          if (i === (partsLength - 1)) {
-            this.searchList = results
-            this.searchLoading = false
-          }
+
+          this.searchList = results
+          this.searchLoading = false
         })
+      } else if (this.selectLayers.toString() === '1') {
+        // 查询部件
+        // 遍历所有图层进行查询
+        const partsLength = this.parts.length // 全部部件图层数量
+        for (let i = 0; i < partsLength; i++) {
+          const part = this.parts[i]
+          const str = ['objid', 'xl', 'dl']
+          const query = esri.query({ url: part.url })
+          let queryString = '1=1' // 默认查询语句
+          // 如果有关键字
+          if (this.keyword) {
+            // 拼接查询语句
+            queryString = str.map(item => `(${item} like '%${this.keyword}%')`).join(' OR ')
+          } else {
+            return
+          }
+          query.where(queryString)
+          // 如果有查询边界
+          if (this.bounds) {
+            query.within(this.bounds)
+          }
+          // 执行查询
+          query.run((error, featureCollection, response) => {
+            if (error) {
+              console.log(error)
+              return
+            }
+            const featuresLength = featureCollection.features.length
+            if (featuresLength > 0) {
+              // 遍历所有查询结果，放入results
+              for (const feature of featureCollection.features) {
+                const popupStr = '<div class="popup-div">' +
+                  '<div class="popup-title">部件信息</div>' +
+                  '<div class="dashed-line"></div>' +
+                  '<div class="popup-item"><label>部件类型</label>' + feature.properties.dl + ' / ' + feature.properties.xl + '</div>' +
+                  '<div class="popup-item"><label>部件编号</label>' + feature.properties.objid + '</div>' +
+                  '<div class="popup-item"><label>所在网格编号</label>' + feature.properties.bgid + '</div>' +
+                  '<div class="popup-item"><label>权属部门</label>' + feature.properties.deptname2 + '</div>' +
+                  '<div class="popup-item"><label>责任部门</label>' + feature.properties.deptname1 + '</div>' +
+                  '<div class="popup-item"><label>养护部门</label>' + feature.properties.deptname3 + '</div>' +
+                  '</div>'
+
+                results.push({
+                  name: feature.properties.dl + ' / ' + feature.properties.xl,
+                  code: feature.properties.objid,
+                  content: {
+                    title: '权属部门',
+                    text: feature.properties.deptname2
+                  },
+                  lng: feature.geometry.coordinates[0],
+                  lat: feature.geometry.coordinates[1],
+                  popupStr: popupStr
+                })
+              }
+            }
+            // 如果是最后一个图层
+            if (i === (partsLength - 1)) {
+              this.searchList = results
+              this.searchLoading = false
+            }
+          })
+        }
+      } else {
+        this.searchLoading = false
       }
     },
     // 清空查询
@@ -154,28 +237,16 @@
       // 赋予新的查询结果
       const currentMarkesLength = data.length
       for (let i = 0; i < currentMarkesLength; i++) {
-        const feature = data[i].feature
-        var icon = this.searchIconList[i]
-        const latlng = L.latLng([feature.geometry.coordinates[1], feature.geometry.coordinates[0]])
-        var item = L.marker(latlng, { icon: icon, layer: data[i].layer, properties: feature.properties }).addTo(this.map)
+        const icon = this.searchIconList[i]
+        const latlng = L.latLng([data[i].lat, data[i].lng])
+        const item = L.marker(latlng, { icon: icon }).addTo(this.map)
         item.on('click', e => {
           if (item.getPopup()) {
             item.unbindPopup()
           }
           // 绑定弹窗
-          const properties = feature.properties
-          var str = `<div class="pop-window">
-                        <div class="pop-title">
-                          ${properties['小类名称']}
-                        </div>
-                        <div class="pop-line"><col>大类：</col>${properties['大类名称']}</div>
-                        <div class="pop-line"><col>小类：</col>${properties['小类名称']}</div>
-                        <div class="pop-line"><col>部件编码：</col>${properties['编码']}</div>
-                        <div class="pop-line"><col>权属单位：</col>${properties['权属单位'] ? properties.权属单位 : '未知'}</div>
-                        <div class="pop-line"><col>详细地址：</col>${properties['详细地址'] ? properties.详细地址 : '未知'}</div>
-                      <div>`
-          var popup = L.popup().setContent(str)
-          item.bindPopup(popup).openPopup(e.latlng)
+          const popup = L.popup().setContent(data[i].popupStr)
+          item.bindPopup(popup).openPopup([data[i].lat, data[i].lng])
         })
         this.currentSearchMarkers.push(item)
       }
@@ -186,10 +257,8 @@
     },
     // 点击查询列表项，将位置放在中间
     clickSearchItem(item, index) {
-      console.log('clickItem')
       if (item) {
-        const feature = item.feature
-        const latlng = L.latLng([feature.geometry.coordinates[1], feature.geometry.coordinates[0]])
+        const latlng = L.latLng([item.lat, item.lng])
         let zoom = this.map.getZoom()
         if (zoom < 19) {
           zoom = 19
@@ -229,36 +298,18 @@
       })
     },
     // 部件图层切换
-    layerChange(node, checked) {
-      const selectItem = this.layers.filter(item => item.name === node.name)[0]
-      // 如果选中底图,选中添加，没选中移除
-      if (selectItem.type === 'map') {
-        if (!checked) {
-          for (const item of this.maps) {
-            this.map.removeLayer(item)
-          }
-        } else {
-          for (const item of this.maps) {
-            this.map.addLayer(item)
-          }
-        }
-      } else if (node.type === 'layer') { // 其他图层
-        if (!checked) {
-          for (let i = 0; i < selectItem.domain.length; i++) {
-            this.map.removeLayer(this.parts[selectItem.domain[i] - 1])
-          }
-        } else {
-          for (let i = 0; i < selectItem.domain.length; i++) {
-            this.map.addLayer(this.parts[selectItem.domain[i] - 1])
-          }
-        }
-      }
+    layerChange(node) {
+      this.$refs.layerRadio.$refs.layerTree.setCheckedKeys([node.id])
+      this.selectLayers = [node.id]
+
+      // 清除查询
+      this.clearSearch()
     },
     // 地图初始化
     init() {
       const map = L.map('map', {
-        minZoom: 4,
-        maxZoom: 21,
+        minZoom: 14,
+        maxZoom: 25,
         center: this.baseConfig.center,
         zoom: this.baseConfig.zoom,
         zoomControl: false,
@@ -268,40 +319,64 @@
       map.doubleClickZoom.disable() // 禁止双击
       this.map = map // data挂载map
       window.map = map
-      // 添加底图
-      for (let i = 0; i <= 21; i++) {
-        const item = { url: `${this.baseUrl}${this.mapUrl}/${i}` }
-        this.maps.push(esri.featureLayer(item).addTo(map))
+
+      // 加载天地图底图和标注
+      this.baseLayer.push(L.tileLayer(this.baseConfig.mapUrl).addTo(map))
+      this.baseLayer.push(L.tileLayer(this.baseConfig.labelUrl).addTo(map))
+
+      // 构建并加载layerGroup
+      /* eslint-disable new-cap */
+      this.addMapDtLyaer() // 底图
+
+      // 部件图层组
+      for (let i = 3; i < 10; i++) {
+        this.addPartsLayer(i)
       }
-      // 添加部件图层
-      const partsLayer = this.baseConfig.partsLayer
-      for (const parent of partsLayer) { // 遍历大类
-        const childs = parent.children
-        for (const child of childs) { // 遍历小类
-          const item = { url: `${this.baseUrl}${this.partsUrl}/${child.layer}`, minZoom: 18 }
-          console.log(item)
-          var layer = esri.featureLayer(item).addTo(map)
-          // 点击部件事件
-          layer.on('click', function(e) {
-            // 获取要素的属性
-            const properties = e.layer.feature.properties
-            // 弹窗样式
-            var str = `<div class="pop-window">
-                        <div class="pop-title">
-                          ${properties['小类名称']}
-                        </div>
-                        <div class="pop-line"><col>大类：</col>${properties['大类名称']}</div>
-                        <div class="pop-line"><col>小类：</col>${properties['小类名称']}</div>
-                        <div class="pop-line"><col>部件编码：</col>${properties['编码']}</div>
-                        <div class="pop-line"><col>权属单位：</col>${properties['权属单位'] ? properties.权属单位 : '未知'}</div>
-                        <div class="pop-line"><col>详细地址：</col>${properties['详细地址'] ? properties.详细地址 : '未知'}</div>
-                      <div>`
-            var popup = L.popup().setContent(str)
-            e.layer.dragging._marker.bindPopup(popup, { minWidth: 200 }).openPopup()
-          })
-          this.parts.push(layer)
-        }
-      }
+    },
+    // 添加底图图层
+    addMapDtLyaer: function() {
+      const mapDtGroup = new L.layerGroup() // 创建layerGroup
+
+      // 创建图层并加载到layerGroup中
+      const item = { url: `${this.baseUrl}${this.mapUrl}` }
+      esri.dynamicMapLayer(item).addTo(mapDtGroup)
+
+      this.layerGroups.push(mapDtGroup)
+      this.map.addLayer(mapDtGroup)
+    },
+    addPartsLayer: function(index) {
+      const that = this
+      const group = new L.layerGroup() // 创建layerGroup
+
+      const domains = this.baseConfig.layers[index].domain
+      domains.forEach(dom => {
+        // 创建图层并加载到layerGroup中
+        const item = { url: `${this.baseUrl}${this.partsUrl}/${dom}`, minZoom: 18 }
+        const layer = esri.featureLayer(item).addTo(group)
+        this.parts.push(item)
+
+        layer.on('click', function(e) {
+          // 获取要素的属性
+          const properties = e.layer.feature.properties
+
+          // 弹窗样式
+          const popupStr = '<div class="popup-div">' +
+            '<div class="popup-title">部件信息</div>' +
+            '<div class="dashed-line"></div>' +
+            '<div class="popup-item"><label>部件类型</label>' + properties.dl + ' / ' + properties.xl + '</div>' +
+            '<div class="popup-item"><label>部件编号</label>' + properties.objid + '</div>' +
+            '<div class="popup-item"><label>所在网格编号</label>' + properties.bgid + '</div>' +
+            '<div class="popup-item"><label>权属部门</label>' + properties.deptname2 + '</div>' +
+            '<div class="popup-item"><label>责任部门</label>' + properties.deptname1 + '</div>' +
+            '<div class="popup-item"><label>养护部门</label>' + properties.deptname3 + '</div>' +
+            '</div>'
+          // 弹出窗口
+          L.popup().setContent(popupStr).setLatLng(e.latlng).openOn(that.map)
+        })
+
+        that.layerGroups.push(group)
+      })
+      this.map.addLayer(group)
     },
     // 初始化图标
     initIcons() {
@@ -310,23 +385,17 @@
         const icon = L.icon({
           iconUrl: require(`@/assets/global_images/point${i}.png`),
           iconSize: [25, 25],
-          iconAnchor: [12.5, 25]
+          iconAnchor: [12, 25],
+          popupAnchor: [0, -25]
         })
         this.searchIconList.push(icon)
       }
     },
     handleCurrentChange(val) {
       this.offset = val
-      var num = 5 * val >= this.searchlist.length ? this.searchlist.length : 5 * val
-      this.showlist = this.searchlist.slice(5 * (val - 1), num)
+      const num = 5 * val >= this.searchList.length ? this.searchList.length : 5 * val
+      this.showlist = this.searchList.slice(5 * (val - 1), num)
       this.drawIcon()
-    },
-    // 根据url找到layer
-    searchLayerByUrl(url) {
-      const layer = this.parts.filter(item => item.options.url === url)[0]
-      if (layer) {
-        this.currentLayer = layer
-      }
     }
   }
 }
@@ -345,8 +414,9 @@
   /*}*/
   $tableTitleHeight:35px;
   .leaflet_container{
-    width: 100%;
-    height: 84vh;
+    width: calc( 100vw - 208px );
+    height: calc( 100vh - 158px );
+    background-color: white;
   }
   .search-total{
     background-color: white; width: 300px;height: 35px;
@@ -453,3 +523,33 @@
     }
   }
 </style>
+
+<style>
+  .leaflet-container a.leaflet-popup-close-button {
+    top: 5px; /* 修改弹窗关闭按钮样式 */
+    right: 10px; /* 修改弹窗关闭按钮样式 */
+  }
+
+  .leaflet-popup-content .popup-div {
+    font-size: 15px;
+    padding: 6px;
+  }
+
+  .leaflet-popup-content .popup-title {
+    font-weight: bold;
+  }
+
+  .leaflet-popup-content .dashed-line {
+    border-bottom: 1px dashed #dddddd;
+    margin: 10px -10px;
+  }
+
+  .leaflet-popup-content .popup-item {
+    padding-bottom: 6px;
+  }
+
+  .leaflet-popup-content .popup-item label {
+    font-weight: bold;
+    padding-right: 15px;
+  }
+</style>

diff --git a/src/assets/icons/icon-poi.png b/src/assets/icons/icon-poi.png
new file mode 100644
index 0000000..364f2f6
--- /dev/null
+++ b/src/assets/icons/icon-poi.png
Binary files differ
diff --git a/src/components/Map/leafletMap.vue b/src/components/Map/leafletMap.vue
index c8b0b6f..e1150e9 100644
--- a/src/components/Map/leafletMap.vue
+++ b/src/components/Map/leafletMap.vue
@@ -1,25 +1,21 @@
 <template>
-  <div style="margin-top: -10px">
+  <div style="margin-top: -30px; margin-bottom: -10px;">
     <el-row :gutter="20">
-      <div v-show="showpoi">
-        <el-col :span="3">
-          <el-input v-model="keywords" size="small" type="text" placeholder="兴趣点关键字" clearable />
-        </el-col>
-        <el-col :span="5">
-          <el-button type="primary" size="small" @click="queryOnMap">查询</el-button>
-          <el-button type="info" size="small" @click="clearMap"> 清除地图 </el-button>
-        </el-col>
-      </div>
+      <el-col v-show="showpoi" :span="8">
+        <el-input v-model="keywords" size="small" type="text" placeholder="兴趣点关键字" clearable style="width: 50%" />
+        <el-button type="primary" size="small" @click="queryOnMap">查询</el-button>
+        <el-button type="info" size="small" @click="clearMap"> 清除地图 </el-button>
+      </el-col>
 
-      <el-col :span="6" :offset="8" style="text-align: right;">
+      <el-col :span="8" style="text-align: right">
         <el-radio-group v-model="queryEventSwitch" size="small" @change="switchEventOrComponent">
           <el-radio-button label="1">事件定位</el-radio-button>
           <el-radio-button label="0">部件定位</el-radio-button>
-          <el-radio-button v-show="showpoi" label="2">兴趣点属性</el-radio-button>
+          <!--          <el-radio-button v-show="showpoi" label="2">兴趣点属性</el-radio-button>-->
         </el-radio-group>
       </el-col>
 
-      <el-col v-if="queryEventSwitch === '0'" :span="10" :offset="0" style="text-align: right;">
+      <el-col v-if="queryEventSwitch === '0'" :span="8" style="text-align: right;">
         <el-select v-model="form.componentId" placeholder="选择部件" clearable value="" size="small">
           <el-option
             v-for="item in compListOpts"
@@ -30,7 +26,7 @@
         <el-button type="primary" size="small" @click="checkComponentPoint"> 部件提交 </el-button>
       </el-col>
 
-      <el-col v-if="queryEventSwitch === '1'" :span="10" :offset="0" style="text-align: right;">
+      <el-col v-if="queryEventSwitch === '1'" :span="8" :offset="0" style="text-align: right;">
         <el-button type="primary" size="small" @click="checkEventPoint"> 事件提交 </el-button>
       </el-col>
     </el-row>
@@ -42,18 +38,40 @@
 <script>
 import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import { mapConfig, serverConfig } from './ArcGISConfig'
+import { mapGetters } from 'vuex'
+import { merchantListPage } from '@/api/geoCoding/geoCoding'
+
 const esri = require('esri-leaflet')
 
+const icon = L.icon({
+  iconUrl: require('@/assets/icons/icon-position.png'),
+  iconSize: [32, 32],
+  iconAnchor: [16, 32],
+  popupAnchor: [0, -32]
+})
+
+const poiIcon = L.icon({
+  iconUrl: require('@/assets/icons/icon-poi.png'),
+  iconSize: [16, 16],
+  iconAnchor: [8, 16],
+  popupAnchor: [0, -16]
+})
+
+const deltaLng10 = 0.00002536 // 10米范围经度值偏移量（大约）
+const deltaLat10 = 0.00002256 // 10米范围纬度值偏移量（大约）
+
 export default {
   name: 'LeafletMap',
   data() {
     return {
       map: null,
-      markers: [],
+      baseLayer: [],
+      markers: [], // 选点
+      pois: [], // 兴趣点结果
       layers: {
         bjPoint: '', // 部件点图层
-        grid: '' // 单元网格图层
+        grid: '', // 单元网格图层
+        shopPoint: '' // 商铺图层
       },
       form: {
         longitude: '', // 定位点经度
@@ -64,23 +82,33 @@
         componentId: '', // 部件ID
         componentName: '' // 部件名称
       }, // 主页面返回值
-      showpoi: false,
+      showpoi: true,
       keywords: '', // 查询关键字
+      limit: 100, // 兴趣点查询的最大结果数
       showEventPointPopup: true, // 是否显示事部件的popup
       queryEventSwitch: '1', // 1==查询事件；0==查询部件
       compListOpts: [] // 部件选择下拉框option
     }
   },
+  computed: {
+    ...mapGetters([
+      'baseUrl',
+      'partsUrl',
+      'mapUrl',
+      'gridUrl',
+      'partsAllUrl'
+    ])
+  },
   mounted() {
     this.initMap()
   },
   methods: {
     initMap() {
-      const map = L.map('map', {
-        minZoom: 13,
-        // maxZoom: 18,
-        center: [27.755, 116.08],
-        zoom: 16,
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: 14,
+        maxZoom: 25,
+        center: this.baseConfig.center,
+        zoom: this.baseConfig.zoom,
         zoomControl: false,
         attributionControl: false,
         crs: L.CRS.EPSG3857
@@ -89,135 +117,181 @@
       this.map = map // data上需要挂载
       window.map = map
 
-      esri.dynamicMapLayer({
-        url: serverConfig.mapUrlBase
-      }).addTo(map)
-
+      // 加载图层
       this.addLayers()
 
       const that = this
       map.on('click', function(e) {
-
-        console.log('e', e)
-        console.log('e.latlng', e.latlng)
-        console.log('queryEventSwitch', that.queryEventSwitch)
         that.clearPoints()
 
         // 加载定位点
         if (that.showEventPointPopup) {
-          const icon = L.icon({
-            iconUrl: require('../../assets/icons/icon-position.png'),
-            iconSize: [35, 35]
-          })
           const pos = L.marker(e.latlng, {
             icon: icon
           })
           that.markers.push(pos)
           that.map.addLayer(pos)
 
-          // 查询事件或者部件
-          if (that.queryEventSwitch === '1') {
-            // 事件定位
-            // 1查询底图得到所在网格与所在社区
-            const query = that.layers.grid.query()
-            query.nearby(e.latlng, 10)
-            query.run(function(error, featureCollection, response) {
-              if (error) {
-                console.log(error)
-                return
-              }
-              const result = featureCollection.features[0].properties
-              // 赋值
-              that.form.longitude = e.latlng.lng
-              that.form.latitude = e.latlng.lat
-              that.form.gridId = result.CommuId
-              that.form.communityId = result.CommuId
-              that.form.communityName = result.CommuName
-
-              pos.bindPopup('坐标：[' + that.form.longitude.toFixed(4) + ', ' + that.form.latitude.toFixed(4) + ']' + '<p>' + '所在社区：' + result.CommuName).openPopup()
-            })
-          } else if (that.queryEventSwitch === '0') {
-            var latlngs = []
-            var p1 = that.getLonAndLat(e.latlng.lng, e.latlng.lat, 0, 2.5)
-            latlngs.push([p1.lat, p1.lon])
-            var p2 = that.getLonAndLat(e.latlng.lng, e.latlng.lat, 90, 2.5)
-            latlngs.push([p2.lat, p2.lon])
-            var p3 = that.getLonAndLat(e.latlng.lng, e.latlng.lat, 180, 2.5)
-            latlngs.push([p3.lat, p3.lon])
-            var p4 = that.getLonAndLat(e.latlng.lng, e.latlng.lat, 270, 2.5)
-            latlngs.push([p4.lat, p4.lon])
-
-            var polyline = L.polygon(latlngs)
-            const bjQuery = that.layers.bjPoint.query()
-            bjQuery.within(polyline)
-            bjQuery.run(function(error, featureCollection, response) {
-              if (error) {
-                console.log(error)
-                return
-              }
-              if (featureCollection.features.length > 0) {
-                const result = featureCollection.features
-                console.log(result)
-                // 赋值
-                that.compListOpts = []
-                let content = ''
-                result.forEach((item, index) => {
-                  content += '<p>部件' + (index + 1) + '：' + item.properties.大类名称 + '-' + item.properties.小类名称 + '-' + item.properties.编码
-                  const comp = {}
-                  comp.name = '部件' + (index + 1) + '：' + item.properties.大类名称 + '-' + item.properties.小类名称 + '-' + item.properties.编码
-                  comp.value = item.properties.编码
-                  that.compListOpts.push(comp)
-                })
-
-                pos.bindPopup('坐标：[' + e.latlng.lng.toFixed(4) + ', ' + e.latlng.lat.toFixed(4) + ']，附近5米的部件有：' + content).openPopup()
-
-                const query = that.layers.grid.query()
-                query.nearby(e.latlng, 10)
-                query.run(function(error, featureCollection, response) {
-                  if (error) {
-                    console.log(error)
-                    return
-                  }
-                  const result = featureCollection.features[0].properties
-                  // 赋值
-                  that.form.longitude = e.latlng.lng
-                  that.form.latitude = e.latlng.lat
-                  that.form.gridId = result.CommuId
-                  that.form.communityId = result.CommuId
-                  that.form.communityName = result.CommuName
-                })
-              } else {
-                that.$message({
-                  message: '没有查询到部件，请重新定位',
-                  type: 'warning'
-                })
-              }
-            }
-            )
+          // 飞到定位点
+          let zoom = that.map.getZoom()
+          if (zoom < 18) {
+            zoom = 18
           }
+          that.map.flyTo(e.latlng, zoom)
+
+          // 查询所点的网格
+          const query = that.layers.grid.query()
+          query.nearby(e.latlng, 10)
+          query.run(function(error, featureCollection, response) {
+            if (error) {
+              console.log(error)
+              return
+            }
+            const result = featureCollection.features[0].properties
+            // 赋值
+            that.form.longitude = e.latlng.lng
+            that.form.latitude = e.latlng.lat
+            that.form.gridId = result.GBID
+            that.form.communityId = result.GBID.substring(0, 12)
+            that.form.communityName = result.Note
+
+            if (that.queryEventSwitch === '1') {
+              // 事件定位
+              // 弹出事件点位信息
+              const popupStr = '<div class="popup-div">' +
+                '<div class="popup-title">事件点</div>' +
+                '<div class="dashed-line"></div>' +
+                '<div class="popup-item"><label>坐标</label>' + that.form.longitude.toFixed(4) + ', ' + that.form.latitude.toFixed(4) + '</div>' +
+                '<div class="popup-item"><label>所在社区</label>' + that.form.communityName + '</div>' +
+                '<div class="popup-item"><label>网格编号</label>' + that.form.gridId + '</div>' +
+                '</div>'
+
+              pos.bindPopup(popupStr).openPopup()
+            } else if (that.queryEventSwitch === '0') {
+              // 部件定位
+              // 1构建部件查询多边形，上下左右四个点
+              const latlngs = []
+              const p1 = [e.latlng.lat + deltaLat10, e.latlng.lng] // 上方点
+              const p2 = [e.latlng.lat, e.latlng.lng + deltaLng10] // 右侧点
+              const p3 = [e.latlng.lat - deltaLat10, e.latlng.lng] // 下方点
+              const p4 = [e.latlng.lat, e.latlng.lng - deltaLng10] // 左侧点
+              latlngs.push(p1)
+              latlngs.push(p2)
+              latlngs.push(p3)
+              latlngs.push(p4)
+
+              const polyline = L.polygon(latlngs)
+              const bjQuery = that.layers.bjPoint.query()
+              bjQuery.within(polyline)
+              bjQuery.run(function(error, featureCollection, response) {
+                if (error) {
+                  console.log(error)
+                  return
+                }
+
+                // 查询到结果
+                if (featureCollection.features.length > 0) {
+                  const result = featureCollection.features
+                  // 赋值
+                  that.compListOpts = []
+
+                  // 构建弹出窗口信息
+                  let popupStr = '<div class="popup-div">' +
+                    '<div class="popup-title">部件</div>' +
+                    '<div class="dashed-line"></div>' +
+                    '<div class="popup-item">坐标[' + e.latlng.lng.toFixed(4) + ', ' + e.latlng.lat.toFixed(4) + ']附近的部件有</div>' +
+                    '<div class="popup-item"><label>所在社区</label>' + that.form.communityName + '</div>' +
+                    '<div class="popup-item"><label>网格编号</label>' + that.form.gridId + '</div>'
+
+                  result.forEach((item, index) => {
+                    popupStr += '<div class="popup-subitem"><label style="padding-right: 5px;">部件' + (index + 1) + '</label>' + item.properties.dl + '/' + item.properties.xl + '[' + item.properties.objid + ']</div>'
+                    const comp = {}
+                    comp.name = '部件' + (index + 1) + '：' + item.properties.dl + '/' + item.properties.xl + '[' + item.properties.objid + ']'
+                    comp.value = item.properties.objid
+                    that.compListOpts.push(comp)
+                  })
+
+                  popupStr += '</div>'
+                  pos.bindPopup(popupStr).openPopup()
+                } else {
+                  that.$message({ message: '没有查询到部件，请重新定位', type: 'warning' })
+                }
+              })
+            }
+          })
         }
       })
     },
     addLayers() {
+      // 加载天地图底图和标注
+      this.baseLayer.push(L.tileLayer(this.baseConfig.mapUrl).addTo(this.map))
+      this.baseLayer.push(L.tileLayer(this.baseConfig.labelUrl).addTo(this.map))
+
+      // 加载底图
+      esri.dynamicMapLayer({
+        url: `${this.baseUrl}${this.mapUrl}`,
+        zIndex: 1
+      }).addTo(this.map)
+
+      // 初始化部件图层（不分层），待切换到部件定位时加载
       this.layers.bjPoint = esri.featureLayer({
-        url: serverConfig.mapUrlBj + '/0'
+        url: `${this.baseUrl}${this.partsAllUrl}`,
+        minZoom: 19
       })
-      this.layers.grid = esri.featureLayer({
-        url: serverConfig.mapUrlBase + '/16'
-      })
-      this.map.addLayer(this.layers.bjPoint)
-      this.map.addLayer(this.layers.grid)
     },
     switchEventOrComponent: function() {
       // 如果选中的是事件定位（1）或部件定位（0），点击地图时弹出事件或者部件的popup；否则（2以上）显示兴趣点结果的属性popup
       this.showEventPointPopup = this.queryEventSwitch < 2
       this.clearPoints()
+
+      if (this.queryEventSwitch === '0') {
+        // 加载和显示部件图层
+        this.map.addLayer(this.layers.bjPoint)
+        // 清空部件选择的列表
+        this.compListOpts = []
+      } else {
+        this.map.removeLayer(this.layers.bjPoint)
+      }
     },
     clearPoints() {
       const that = this
       this.markers.forEach(marker => {
         that.map.removeLayer(marker)
       })
+      this.pois.forEach(marker => {
+        that.map.removeLayer(marker)
+      })
+    },
+    queryOnMap: function() {
+      const that = this
+      merchantListPage({
+        keyword: this.keywords,
+        limit: this.limit
+      }).then(response => {
+        if (response.code === 200) {
+          console.log(response)
+          this.clearMap()
+          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 {
+            data.rows.forEach(item => {
+              const popupStr = '<div class="popup-div">' +
+                '<div class="popup-title">兴趣点</div>' +
+                '<div class="dashed-line"></div>' +
+                '<div class="popup-item"><label>名称</label>' + item.merchantName + '</div>' +
+                '<div class="popup-item"><label>详细地址</label>' + item.address + '</div>' +
+                '</div>'
+              const poi = L.marker([item.pointY, item.pointX], { icon: poiIcon })
+              poi.bindPopup(popupStr).openPopup()
+              that.pois.push(poi)
+              that.map.addLayer(poi)
+            })
+          }
+        }
+      })
     },
     // 返回事件定位的结果
     checkEventPoint: function() {
@@ -258,72 +332,52 @@
       this.form.gridId = '' // 单元网格ID
       this.form.componentId = '' // 部件ID
       this.form.componentName = '' // 部件名称
-    },
-    numberToRadius(t) {
-      return (t * Math.PI) / 180
-    },
-    numberToDegree(t) {
-      return (180 * t) / Math.PI
-    },
-    /**
-     * 根据一个经纬度及距离角度，算出另外一个经纬度
-     * @param {*} lon 经度 113.3960698
-     * @param {*} lat 纬度 22.941386
-     * @param {*} brng 方位角 45 ---- 正北方：000°或360° 正东方：090° 正南方：180° 正西方：270°
-     * @param {*} dist 90000距离(米)
-     */
-    getLonAndLat(lon, lat, brng, dist) {
-      // 大地坐标系资料WGS-84 长半径a=6378137 短半径b=6356752.3142 扁率f=1/298.2572236
-      var a = 6378137
-      var b = 6356752.3142
-      var f = 1 / 298.257223563
-      var lon1 = lon * 1
-      var lat1 = lat * 1
-      var s = dist
-      var alpha1 = this.numberToRadius(brng)
-      var sinAlpha1 = Math.sin(alpha1)
-      var cosAlpha1 = Math.cos(alpha1)
-      var tanU1 = (1 - f) * Math.tan(this.numberToRadius(lat1))
-      var cosU1 = 1 / Math.sqrt((1 + tanU1 * tanU1)), sinU1 = tanU1 * cosU1
-      var sigma1 = Math.atan2(tanU1, cosAlpha1)
-      var sinAlpha = cosU1 * sinAlpha1
-      var cosSqAlpha = 1 - sinAlpha * sinAlpha
-      var uSq = cosSqAlpha * (a * a - b * b) / (b * b)
-      var A = 1 + uSq / 16384 * (4096 + uSq * (-768 + uSq * (320 - 175 * uSq)))
-      var B = uSq / 1024 * (256 + uSq * (-128 + uSq * (74 - 47 * uSq)))
-      var sigma = s / (b * A), sigmaP = 2 * Math.PI
-      while (Math.abs(sigma - sigmaP) > 1e-12) {
-        var cos2SigmaM = Math.cos(2 * sigma1 + sigma)
-        var sinSigma = Math.sin(sigma)
-        var cosSigma = Math.cos(sigma)
-        var deltaSigma = B * sinSigma * (cos2SigmaM + B / 4 * (cosSigma * (-1 + 2 * cos2SigmaM * cos2SigmaM) -
-          B / 6 * cos2SigmaM * (-3 + 4 * sinSigma * sinSigma) * (-3 + 4 * cos2SigmaM * cos2SigmaM)))
-        sigmaP = sigma
-        sigma = s / (b * A) + deltaSigma
-      }
-      var tmp = sinU1 * sinSigma - cosU1 * cosSigma * cosAlpha1
-      var lat2 = Math.atan2(sinU1 * cosSigma + cosU1 * sinSigma * cosAlpha1, (1 - f) * Math.sqrt(sinAlpha * sinAlpha + tmp * tmp))
-      var lambda = Math.atan2(sinSigma * sinAlpha1, cosU1 * cosSigma - sinU1 * sinSigma * cosAlpha1)
-      var C = f / 16 * cosSqAlpha * (4 + f * (4 - 3 * cosSqAlpha))
-      var L = lambda - (1 - C) * f * sinAlpha * (sigma + C * sinSigma * (cos2SigmaM + C * cosSigma * (-1 + 2 * cos2SigmaM * cos2SigmaM)))
-      var revAz = Math.atan2(sinAlpha, -tmp) // final bearing
-      var lonLatObj = { lon: lon1 + this.numberToDegree(L), lat: this.numberToDegree(lat2) }
-      return lonLatObj
     }
   }
 }
 </script>
 
 <style scoped>
-  @import 'https://js.arcgis.com/4.13/esri/css/main.css';
   .baseMap {
-    height:60vh;
+    height: 65vh;
     width: 100%;
-    margin-top: 25px;
+    margin-top: 10px;
     border: 1px solid #DCDCDC;
     border-radius: 4px;
   }
-  .leaflet-container {
-    background: #fff0;
+</style>
+
+<style>
+  .leaflet-container a.leaflet-popup-close-button {
+    top: 5px; /* 修改弹窗关闭按钮样式 */
+    right: 10px; /* 修改弹窗关闭按钮样式 */
+  }
+
+  .leaflet-popup-content .popup-div {
+    font-size: 15px;
+    padding: 6px;
+  }
+
+  .leaflet-popup-content .popup-title {
+    font-weight: bold;
+  }
+
+  .leaflet-popup-content .dashed-line {
+    border-bottom: 1px dashed #dddddd;
+    margin: 10px -10px;
+  }
+
+  .leaflet-popup-content .popup-item {
+    padding-bottom: 6px;
+  }
+
+  .leaflet-popup-content .popup-item label {
+    font-weight: bold;
+    padding-right: 15px;
+  }
+
+  .leaflet-popup-content .popup-subitem {
+    padding-bottom: 6px;
+    font-size: 12px;
   }
 </style>
diff --git a/src/components/Map/leafletMapRead.vue b/src/components/Map/leafletMapRead.vue
index dd22198..edcd37d 100644
--- a/src/components/Map/leafletMapRead.vue
+++ b/src/components/Map/leafletMapRead.vue
@@ -7,7 +7,7 @@
 <script>
 import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import { mapConfig, serverConfig } from './ArcGISConfig'
+import { mapGetters } from 'vuex'
 const esri = require('esri-leaflet')
 export default {
   name: 'LeafletMapRead',
@@ -23,10 +23,20 @@
   },
   data() {
     return {
+      baseLayer: [],
       mapLoading: false,
       map: null
     }
   },
+  computed: {
+    ...mapGetters([
+      'baseUrl',
+      'partsUrl',
+      'mapUrl',
+      'gridUrl',
+      'partsAllUrl'
+    ])
+  },
   mounted() {
     this.initMap()
     this.addMarker()
@@ -36,9 +46,9 @@
       this.mapLoading = true
       const map = L.map('map', {
         minZoom: 13,
-        // maxZoom: 18,
-        center: [27.755, 116.08],
-        zoom: 16,
+        maxZoom: 24,
+        center: this.baseConfig.center,
+        zoom: this.baseConfig.zoom,
         zoomControl: false,
         attributionControl: false,
         crs: L.CRS.EPSG3857
@@ -47,45 +57,30 @@
       this.map = map // data上需要挂载
       window.map = map
 
+      // 加载天地图底图和标注
+      this.baseLayer.push(L.tileLayer(this.baseConfig.mapUrl).addTo(map))
+      this.baseLayer.push(L.tileLayer(this.baseConfig.labelUrl).addTo(map))
+
       esri.dynamicMapLayer({
-        url: serverConfig.mapUrlBase,
+        url: `${this.baseUrl}${this.mapUrl}`,
         opacity: 1,
         f: 'image'
       }).addTo(map)
 
-      // esri.tiledMapLayer({
-      //   url: serverConfig.mapUrlBase,
-      //   maxZoom: 15,
-      //   f: 'image'
-      // }).addTo(map)
-
-      // for (let i = 0; i < 24; i++) {
-      //   esri.featureLayer({
-      //     url: serverConfig.mapUrlBase + '/' + i
-      //     // minZoom: 4, // 最小缩放等级
-      //     // maxZoom: 21// 最大缩放等级
-      //   }).addTo(map)
-      // }
-
-      esri.featureLayer({
-        url: serverConfig.mapUrlBj + '/0'
-      }).addTo(map)
-      esri.featureLayer({
-        url: serverConfig.mapUrlBase + '/16'
-      }).addTo(map)
       this.mapLoading = false
     },
 
     addMarker() {
       const icon = L.icon({
-        iconUrl: require('../../assets/icons/icon-position.png'),
-        iconSize: [35, 35],
-        iconAnchor: [17.5, 35]
+        iconUrl: require('@/assets/icons/icon-position.png'),
+        iconSize: [32, 32],
+        iconAnchor: [16, 32],
+        popupAnchor: [0, -32]
       })
       const latlng = L.latLng([this.latitude, this.longitude])
       const feat = L.marker(latlng, { icon: icon })
       feat.addTo(this.map)
-      this.map.setView({ lat: this.latitude, lng: this.longitude }, 16)
+      this.map.setView({ lat: this.latitude, lng: this.longitude }, 18)
     }
   }
 }
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 2f77b38..134cb1e 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -31,12 +31,12 @@
         name: 'TimeLimit',
         meta: { title: '阶段时限', icon: '', permission: ['/timeLimit'] }
       },
-      {
-        path: '/caseList',
-        component: () => import('@/views/seo/seo'),
-        name: 'CaseList',
-        meta: { title: '综合查询', icon: '', permission: ['/caseList'] }
-      },
+      // {
+      //   path: '/caseList',
+      //   component: () => import('@/views/seo/seo'),
+      //   name: 'CaseList',
+      //   meta: { title: '综合查询', icon: '', permission: ['/caseList'] }
+      // },
       {
         path: '/caseType',
         component: () => import('@/views/busAdmin/caseType/listCaseType.vue'),
diff --git a/src/store/getters.js b/src/store/getters.js
index 57e8aac..d28b64f 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -30,7 +30,10 @@
   partsUrl: state => state.map.partsUrl, // 部件分层地址
   partsEditUrl: state => state.map.partsEditUrl, // 部件分层地址
   partsAllUrl: state => state.map.partsAllUrl, // 部件不分层地址
+  shopUrl: state => state.map.shopUrl, // 部件不分层地址
   mapUrl: state => state.map.mapUrl, // 底图地址
+  mapDtUrl: state => state.map.mapDtUrl, // 无网格底图地址
+  gridUrl: state => state.map.gridUrl, // 网格图层
   editUrl: state => state.map.editUrl // 编辑地图地址
 }
 export default getters
diff --git a/src/store/modules/map.js b/src/store/modules/map.js
index aa2c6f8..13f5313 100644
--- a/src/store/modules/map.js
+++ b/src/store/modules/map.js
@@ -5,7 +5,10 @@
   baseUrl: '', // 服务基础地址
   partsUrl: '', // 部件分层地址
   partsAllUrl: '', // 部件不分层地址
+  shopUrl: '', // 商户图层
   mapUrl: '', // 二维底图地址
+  mapDtUrl: '', // 无网格地图
+  gridUrl: '', // 网格图层
   editUrl: '' // 编辑地图URL
 }
 const mutations = {
@@ -24,9 +27,18 @@
   SET_PARTS_ALL_URL: (state, url) => {
     state.partsAllUrl = url
   },
+  SET_SHOP_URL: (state, url) => {
+    state.shopUrl = url
+  },
   SET_MAP_URL: (state, url) => {
     state.mapUrl = url
   },
+  SET_MAPDT_URL: (state, url) => {
+    state.mapDtUrl = url
+  },
+  SET_GRID_URL: (state, url) => {
+    state.gridUrl = url
+  },
   SET_EDIT_URL: (state, url) => {
     state.editUrl = url
   }
@@ -52,8 +64,14 @@
               commit('SET_PARTS_EDIT_URL', editUrl)
             } else if (item.name === '部件地图URL') {
               commit('SET_PARTS_ALL_URL', item.url)
+            } else if (item.name === '商户图层URL') {
+              commit('SET_SHOP_URL', item.url)
             } else if (item.name === '二维地图URL') {
               commit('SET_MAP_URL', item.url)
+            } else if (item.name === '无网格地图URL') {
+              commit('SET_MAPDT_URL', item.url)
+            } else if (item.name === '网格图层URL') {
+              commit('SET_GRID_URL', item.url)
             } else if (item.name === '编辑地图URL') {
               commit('SET_EDIT_URL', item.url)
             }
diff --git a/src/views/assessPost/receiverAccessChart.vue b/src/views/assessPost/receiverAccessChart.vue
index 6cc18f8..4e3523d 100644
--- a/src/views/assessPost/receiverAccessChart.vue
+++ b/src/views/assessPost/receiverAccessChart.vue
@@ -97,7 +97,8 @@
         xAxis: {
           data: this.x,
           axisLabel: {
-            fontSize: 14
+            fontSize: 14,
+            interval: 0
           }
         },
         yAxis: {
@@ -115,6 +116,18 @@
           tooltip: {
             position: 'right'
           }
+        }],
+        dataZoom: [{
+          type: 'slider',
+          show: true,
+          start: 0,
+          end: 50,
+          handleSize: 8
+        },
+        {
+          type: 'inside',
+          start: 0,
+          end: 50
         }]
       })
       this.chart.resize()
diff --git a/src/views/assessRegion/accessAreaChart.vue b/src/views/assessRegion/accessAreaChart.vue
index 3424aec..9745b4a 100644
--- a/src/views/assessRegion/accessAreaChart.vue
+++ b/src/views/assessRegion/accessAreaChart.vue
@@ -107,6 +107,18 @@
           tooltip: {
             position: 'right'
           }
+        }],
+        dataZoom: [{
+          type: 'slider',
+          show: true,
+          start: 0,
+          end: 50,
+          handleSize: 8
+        },
+        {
+          type: 'inside',
+          start: 0,
+          end: 50
         }]
       })
       this.chart.resize()
diff --git a/src/views/baseSource/components/layerChoose.vue b/src/views/baseSource/components/layerChoose.vue
index c98e787..2cd75c8 100644
--- a/src/views/baseSource/components/layerChoose.vue
+++ b/src/views/baseSource/components/layerChoose.vue
@@ -13,11 +13,13 @@
     <el-collapse-transition>
       <div v-show="cardShow" class="layers-card">
         <el-tree
+          ref="layerTree"
           :data="layers"
           :default-checked-keys="selectLayers"
           :props="treeProps"
           show-checkbox
           node-key="id"
+          @check="nodeCheck"
           @check-change="checkChange"/>
       </div>
     </el-collapse-transition>
@@ -65,6 +67,9 @@
     }
   },
   methods: {
+    nodeCheck(node, checked) {
+      this.$emit('check', node, checked)
+    },
     checkChange(node, checked) {
       this.$emit('choose', node, checked)
     }
diff --git a/src/views/baseSource/components/searchItem.vue b/src/views/baseSource/components/searchItem.vue
index a0c73f3..e2d52ab 100644
--- a/src/views/baseSource/components/searchItem.vue
+++ b/src/views/baseSource/components/searchItem.vue
@@ -10,9 +10,9 @@
       <img src="@/assets/global_images/point.png" class="item-icon">
     </div>
     <div class="list-item-right">
-      <div class="list-item-right-row"><div>名称：</div><div :title="data.feature.properties.小类名称" class="content">{{ data.feature.properties.小类名称 }}</div></div>
-      <div class="list-item-right-row"><div>编码：</div><div :title="data.feature.properties.编码" class="content">{{ data.feature.properties.编码 }}</div></div>
-      <div class="list-item-right-row"><div>地址：</div><div :title="data.feature.properties.编码" class="content">{{ data.feature.properties.编码 }}</div></div>
+      <div class="list-item-right-row"><div>名称：</div><div :title="data.name" class="content">{{ data.name }}</div></div>
+      <div class="list-item-right-row"><div>编码：</div><div :title="data.code" class="content">{{ data.code }}</div></div>
+      <div class="list-item-right-row"><div>{{ data.content.title }}：</div><div :title="data.content" class="content">{{ data.content.text }}</div></div>
     </div>
   </div>
 </template>
@@ -30,14 +30,9 @@
       required: true
     } // 数据
   },
-  // mounted() {
-  //   debugger
-  //   console.log(this.data.feature)
-  // },
   methods: {
     // 点击数据项
     itemClick() {
-      console.log('点击item')
       this.$emit('click', this.data)
     }
   }
diff --git a/src/views/baseSource/mapSearch.vue b/src/views/baseSource/mapSearch.vue
index 71147d8..5ae0c05 100644
--- a/src/views/baseSource/mapSearch.vue
+++ b/src/views/baseSource/mapSearch.vue
@@ -17,7 +17,7 @@
         <!--重置工具-->
         <clear-tool :disabled="clearDisabled" @click="drawDelete"/>
         <!--图层选择工具-->
-        <layer-choose :layers="layers" :select-layers="selectLayers" @choose="layerChange"/>
+        <layer-choose ref="layerRadio" :layers="layers" :select-layers="selectLayers" @check="layerChange"/>
       </tools-container>
       <!--图层选择组件-->
     </div>
@@ -45,10 +45,15 @@
       drawLayer: null, // 绘制图层（框选）
       bounds: null, // 查询区域
       clearDisabled: true, // 禁用重置按钮
-      layers: this.baseConfig.layers, // 所有图层
-      selectLayers: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], // 选中图层
+      baseLayer: [],
+      layers: [
+        { 'id': 0, 'name': '商户', 'type': 'layer', 'domain': [35] },
+        { 'id': 1, 'name': '部件', 'type': 'layer', 'domain': [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 15, 16, 18, 19, 20, 21, 22, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45] }
+      ],
+      selectLayers: [0], // 选中图层
       maps: [], // 地图图层
       parts: [], // 部件图层
+      layerGroups: [], // 图层组，用于控制一组内容显示或者隐藏
       searchList: [], // 全部查询结果
       featureCollection: [], // 选中的图层和Feature
       featureCollectionLength: 0, // 选中的feature个数
@@ -60,9 +65,8 @@
     ...mapGetters([
       'baseUrl',
       'partsUrl',
-      'partsAllUrl',
-      'mapUrl',
-      'partsEditUrl'
+      'shopUrl',
+      'mapUrl'
     ])
   },
   destroyed() {
@@ -89,18 +93,17 @@
       } // 其他不予处理
       this.searchLoading = true
       const results = [] // 存放查询结果列表
-      // 遍历所有图层进行查询
-      const partsLength = this.parts.length // 全部部件图层数量
-      for (let i = 0; i < partsLength; i++) {
-        const part = this.parts[i]
-        var str = ['编码', '小类名称', '大类名称']
-        var query = esri.query({ url: part.options.url })
+
+      // 获取是查询部件还是查询商户
+      if (this.selectLayers.toString() === '0') {
+        // 查询商户
+        const str = ['objid', 'dutyname', 'position_'] // 查询条件属性
+        const query = esri.query({ url: `${this.baseUrl}${this.shopUrl}` })
         let queryString = '1=1' // 默认查询语句
         // 如果有关键字
         if (this.keyword) {
           // 拼接查询语句
           queryString = str.map(item => `(${item} like '%${this.keyword}%')`).join(' OR ')
-          console.log(queryString)
         } else {
           return
         }
@@ -119,18 +122,98 @@
           if (featuresLength > 0) {
             // 遍历所有查询结果，放入results
             for (const feature of featureCollection.features) {
+              const popupStr = '<div class="popup-div">' +
+                '<div class="popup-title">商户信息</div>' +
+                '<div class="dashed-line"></div>' +
+                '<div class="popup-item"><label>商户名称</label>' + feature.properties.dutyname + '</div>' +
+                '<div class="popup-item"><label>商户编号</label>' + feature.properties.objid + '</div>' +
+                // '<div class="popup-item"><label>所在社区</label>' + feature.properties.communame + '</div>' +
+                // '<div class="popup-item"><label>所在网格编号</label>' + feature.properties.bgid + '</div>' +
+                '<div class="popup-item"><label>三包责任单位</label>' + feature.properties.deptname + '</div>' +
+                '<div class="popup-item"><label>详细地址</label>' + feature.properties.position_ + '</div>' +
+                '</div>'
+
               results.push({
-                layer: part,
-                feature: feature
+                name: feature.properties.dutyname,
+                code: feature.properties.objid,
+                content: {
+                  title: '地址',
+                  text: feature.properties.position_
+                },
+                lng: feature.properties.x,
+                lat: feature.properties.y,
+                popupStr: popupStr
               })
             }
           }
-          // 如果是最后一个图层
-          if (i === (partsLength - 1)) {
-            this.searchList = results
-            this.searchLoading = false
-          }
+
+          this.searchList = results
+          this.searchLoading = false
         })
+      } else if (this.selectLayers.toString() === '1') {
+        // 查询部件
+        // 遍历所有图层进行查询
+        const partsLength = this.parts.length // 全部部件图层数量
+        for (let i = 0; i < partsLength; i++) {
+          const part = this.parts[i]
+          const str = ['objid', 'xl', 'dl']
+          const query = esri.query({ url: part.url })
+          let queryString = '1=1' // 默认查询语句
+          // 如果有关键字
+          if (this.keyword) {
+            // 拼接查询语句
+            queryString = str.map(item => `(${item} like '%${this.keyword}%')`).join(' OR ')
+          } else {
+            return
+          }
+          query.where(queryString)
+          // 如果有查询边界
+          if (this.bounds) {
+            query.within(this.bounds)
+          }
+          // 执行查询
+          query.run((error, featureCollection, response) => {
+            if (error) {
+              console.log(error)
+              return
+            }
+            const featuresLength = featureCollection.features.length
+            if (featuresLength > 0) {
+              // 遍历所有查询结果，放入results
+              for (const feature of featureCollection.features) {
+                const popupStr = '<div class="popup-div">' +
+                  '<div class="popup-title">部件信息</div>' +
+                  '<div class="dashed-line"></div>' +
+                  '<div class="popup-item"><label>部件类型</label>' + feature.properties.dl + ' / ' + feature.properties.xl + '</div>' +
+                  '<div class="popup-item"><label>部件编号</label>' + feature.properties.objid + '</div>' +
+                  '<div class="popup-item"><label>所在网格编号</label>' + feature.properties.bgid + '</div>' +
+                  '<div class="popup-item"><label>权属部门</label>' + feature.properties.deptname2 + '</div>' +
+                  '<div class="popup-item"><label>责任部门</label>' + feature.properties.deptname1 + '</div>' +
+                  '<div class="popup-item"><label>养护部门</label>' + feature.properties.deptname3 + '</div>' +
+                  '</div>'
+
+                results.push({
+                  name: feature.properties.dl + ' / ' + feature.properties.xl,
+                  code: feature.properties.objid,
+                  content: {
+                    title: '权属部门',
+                    text: feature.properties.deptname2
+                  },
+                  lng: feature.geometry.coordinates[0],
+                  lat: feature.geometry.coordinates[1],
+                  popupStr: popupStr
+                })
+              }
+            }
+            // 如果是最后一个图层
+            if (i === (partsLength - 1)) {
+              this.searchList = results
+              this.searchLoading = false
+            }
+          })
+        }
+      } else {
+        this.searchLoading = false
       }
     },
     // 清空查询
@@ -154,28 +237,16 @@
       // 赋予新的查询结果
       const currentMarkesLength = data.length
       for (let i = 0; i < currentMarkesLength; i++) {
-        const feature = data[i].feature
-        var icon = this.searchIconList[i]
-        const latlng = L.latLng([feature.geometry.coordinates[1], feature.geometry.coordinates[0]])
-        var item = L.marker(latlng, { icon: icon, layer: data[i].layer, properties: feature.properties }).addTo(this.map)
+        const icon = this.searchIconList[i]
+        const latlng = L.latLng([data[i].lat, data[i].lng])
+        const item = L.marker(latlng, { icon: icon }).addTo(this.map)
         item.on('click', e => {
           if (item.getPopup()) {
             item.unbindPopup()
           }
           // 绑定弹窗
-          const properties = feature.properties
-          var str = `<div class="pop-window">
-                        <div class="pop-title">
-                          ${properties['小类名称']}
-                        </div>
-                        <div class="pop-line"><col>大类：</col>${properties['大类名称']}</div>
-                        <div class="pop-line"><col>小类：</col>${properties['小类名称']}</div>
-                        <div class="pop-line"><col>部件编码：</col>${properties['编码']}</div>
-                        <div class="pop-line"><col>权属单位：</col>${properties['权属单位'] ? properties.权属单位 : '未知'}</div>
-                        <div class="pop-line"><col>详细地址：</col>${properties['详细地址'] ? properties.详细地址 : '未知'}</div>
-                      <div>`
-          var popup = L.popup().setContent(str)
-          item.bindPopup(popup).openPopup(e.latlng)
+          const popup = L.popup().setContent(data[i].popupStr)
+          item.bindPopup(popup).openPopup([data[i].lat, data[i].lng])
         })
         this.currentSearchMarkers.push(item)
       }
@@ -186,10 +257,8 @@
     },
     // 点击查询列表项，将位置放在中间
     clickSearchItem(item, index) {
-      console.log('clickItem')
       if (item) {
-        const feature = item.feature
-        const latlng = L.latLng([feature.geometry.coordinates[1], feature.geometry.coordinates[0]])
+        const latlng = L.latLng([item.lat, item.lng])
         let zoom = this.map.getZoom()
         if (zoom < 19) {
           zoom = 19
@@ -229,36 +298,18 @@
       })
     },
     // 部件图层切换
-    layerChange(node, checked) {
-      const selectItem = this.layers.filter(item => item.name === node.name)[0]
-      // 如果选中底图,选中添加，没选中移除
-      if (selectItem.type === 'map') {
-        if (!checked) {
-          for (const item of this.maps) {
-            this.map.removeLayer(item)
-          }
-        } else {
-          for (const item of this.maps) {
-            this.map.addLayer(item)
-          }
-        }
-      } else if (node.type === 'layer') { // 其他图层
-        if (!checked) {
-          for (let i = 0; i < selectItem.domain.length; i++) {
-            this.map.removeLayer(this.parts[selectItem.domain[i] - 1])
-          }
-        } else {
-          for (let i = 0; i < selectItem.domain.length; i++) {
-            this.map.addLayer(this.parts[selectItem.domain[i] - 1])
-          }
-        }
-      }
+    layerChange(node) {
+      this.$refs.layerRadio.$refs.layerTree.setCheckedKeys([node.id])
+      this.selectLayers = [node.id]
+
+      // 清除查询
+      this.clearSearch()
     },
     // 地图初始化
     init() {
       const map = L.map('map', {
-        minZoom: 4,
-        maxZoom: 21,
+        minZoom: 14,
+        maxZoom: 25,
         center: this.baseConfig.center,
         zoom: this.baseConfig.zoom,
         zoomControl: false,
@@ -268,40 +319,64 @@
       map.doubleClickZoom.disable() // 禁止双击
       this.map = map // data挂载map
       window.map = map
-      // 添加底图
-      for (let i = 0; i <= 21; i++) {
-        const item = { url: `${this.baseUrl}${this.mapUrl}/${i}` }
-        this.maps.push(esri.featureLayer(item).addTo(map))
+
+      // 加载天地图底图和标注
+      this.baseLayer.push(L.tileLayer(this.baseConfig.mapUrl).addTo(map))
+      this.baseLayer.push(L.tileLayer(this.baseConfig.labelUrl).addTo(map))
+
+      // 构建并加载layerGroup
+      /* eslint-disable new-cap */
+      this.addMapDtLyaer() // 底图
+
+      // 部件图层组
+      for (let i = 3; i < 10; i++) {
+        this.addPartsLayer(i)
       }
-      // 添加部件图层
-      const partsLayer = this.baseConfig.partsLayer
-      for (const parent of partsLayer) { // 遍历大类
-        const childs = parent.children
-        for (const child of childs) { // 遍历小类
-          const item = { url: `${this.baseUrl}${this.partsUrl}/${child.layer}`, minZoom: 18 }
-          console.log(item)
-          var layer = esri.featureLayer(item).addTo(map)
-          // 点击部件事件
-          layer.on('click', function(e) {
-            // 获取要素的属性
-            const properties = e.layer.feature.properties
-            // 弹窗样式
-            var str = `<div class="pop-window">
-                        <div class="pop-title">
-                          ${properties['小类名称']}
-                        </div>
-                        <div class="pop-line"><col>大类：</col>${properties['大类名称']}</div>
-                        <div class="pop-line"><col>小类：</col>${properties['小类名称']}</div>
-                        <div class="pop-line"><col>部件编码：</col>${properties['编码']}</div>
-                        <div class="pop-line"><col>权属单位：</col>${properties['权属单位'] ? properties.权属单位 : '未知'}</div>
-                        <div class="pop-line"><col>详细地址：</col>${properties['详细地址'] ? properties.详细地址 : '未知'}</div>
-                      <div>`
-            var popup = L.popup().setContent(str)
-            e.layer.dragging._marker.bindPopup(popup, { minWidth: 200 }).openPopup()
-          })
-          this.parts.push(layer)
-        }
-      }
+    },
+    // 添加底图图层
+    addMapDtLyaer: function() {
+      const mapDtGroup = new L.layerGroup() // 创建layerGroup
+
+      // 创建图层并加载到layerGroup中
+      const item = { url: `${this.baseUrl}${this.mapUrl}` }
+      esri.dynamicMapLayer(item).addTo(mapDtGroup)
+
+      this.layerGroups.push(mapDtGroup)
+      this.map.addLayer(mapDtGroup)
+    },
+    addPartsLayer: function(index) {
+      const that = this
+      const group = new L.layerGroup() // 创建layerGroup
+
+      const domains = this.baseConfig.layers[index].domain
+      domains.forEach(dom => {
+        // 创建图层并加载到layerGroup中
+        const item = { url: `${this.baseUrl}${this.partsUrl}/${dom}`, minZoom: 18 }
+        const layer = esri.featureLayer(item).addTo(group)
+        this.parts.push(item)
+
+        layer.on('click', function(e) {
+          // 获取要素的属性
+          const properties = e.layer.feature.properties
+
+          // 弹窗样式
+          const popupStr = '<div class="popup-div">' +
+            '<div class="popup-title">部件信息</div>' +
+            '<div class="dashed-line"></div>' +
+            '<div class="popup-item"><label>部件类型</label>' + properties.dl + ' / ' + properties.xl + '</div>' +
+            '<div class="popup-item"><label>部件编号</label>' + properties.objid + '</div>' +
+            '<div class="popup-item"><label>所在网格编号</label>' + properties.bgid + '</div>' +
+            '<div class="popup-item"><label>权属部门</label>' + properties.deptname2 + '</div>' +
+            '<div class="popup-item"><label>责任部门</label>' + properties.deptname1 + '</div>' +
+            '<div class="popup-item"><label>养护部门</label>' + properties.deptname3 + '</div>' +
+            '</div>'
+          // 弹出窗口
+          L.popup().setContent(popupStr).setLatLng(e.latlng).openOn(that.map)
+        })
+
+        that.layerGroups.push(group)
+      })
+      this.map.addLayer(group)
     },
     // 初始化图标
     initIcons() {
@@ -310,23 +385,17 @@
         const icon = L.icon({
           iconUrl: require(`@/assets/global_images/point${i}.png`),
           iconSize: [25, 25],
-          iconAnchor: [12.5, 25]
+          iconAnchor: [12, 25],
+          popupAnchor: [0, -25]
         })
         this.searchIconList.push(icon)
       }
     },
     handleCurrentChange(val) {
       this.offset = val
-      var num = 5 * val >= this.searchlist.length ? this.searchlist.length : 5 * val
-      this.showlist = this.searchlist.slice(5 * (val - 1), num)
+      const num = 5 * val >= this.searchList.length ? this.searchList.length : 5 * val
+      this.showlist = this.searchList.slice(5 * (val - 1), num)
       this.drawIcon()
-    },
-    // 根据url找到layer
-    searchLayerByUrl(url) {
-      const layer = this.parts.filter(item => item.options.url === url)[0]
-      if (layer) {
-        this.currentLayer = layer
-      }
     }
   }
 }
@@ -345,8 +414,9 @@
   /*}*/
   $tableTitleHeight:35px;
   .leaflet_container{
-    width: 100%;
-    height: 84vh;
+    width: calc( 100vw - 208px );
+    height: calc( 100vh - 158px );
+    background-color: white;
   }
   .search-total{
     background-color: white; width: 300px;height: 35px;
@@ -453,3 +523,33 @@
     }
   }
 </style>
+
+<style>
+  .leaflet-container a.leaflet-popup-close-button {
+    top: 5px; /* 修改弹窗关闭按钮样式 */
+    right: 10px; /* 修改弹窗关闭按钮样式 */
+  }
+
+  .leaflet-popup-content .popup-div {
+    font-size: 15px;
+    padding: 6px;
+  }
+
+  .leaflet-popup-content .popup-title {
+    font-weight: bold;
+  }
+
+  .leaflet-popup-content .dashed-line {
+    border-bottom: 1px dashed #dddddd;
+    margin: 10px -10px;
+  }
+
+  .leaflet-popup-content .popup-item {
+    padding-bottom: 6px;
+  }
+
+  .leaflet-popup-content .popup-item label {
+    font-weight: bold;
+    padding-right: 15px;
+  }
+</style>
diff --git a/src/views/baseSource/overview.vue b/src/views/baseSource/overview.vue
index 8a3f857..02267ef 100644
--- a/src/views/baseSource/overview.vue
+++ b/src/views/baseSource/overview.vue
@@ -20,9 +20,11 @@
   components: { LayerChoose, ToolsContainer },
   data() {
     return {
+      baseLayer: [],
       layers: this.baseConfig.layers, // 图层列表
-      selectLayers: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], // 选中图层列表
+      selectLayers: [0, 1, 2], // 选中图层列表
       map: null, // 地图对象
+      layerGroups: [], // 图层组，用于控制一组内容显示或者隐藏
       maps: [], // 地图图层
       parts: [] // 部件图层
     }
@@ -32,7 +34,10 @@
       'baseUrl',
       'partsUrl',
       'partsAllUrl',
-      'mapUrl'
+      'shopUrl',
+      'mapUrl',
+      'gridUrl',
+      'mapDtUrl'
     ])
   },
   mounted() {
@@ -42,34 +47,18 @@
     // 部件图层切换
     layerChange(node, checked) {
       const selectItem = this.layers.filter(item => item.name === node.name)[0]
-      // 如果选中底图,选中添加，没选中移除
-      if (selectItem.type === 'map') {
-        if (!checked) {
-          for (const item of this.maps) {
-            this.map.removeLayer(item)
-          }
-        } else {
-          for (const item of this.maps) {
-            this.map.addLayer(item)
-          }
-        }
-      } else if (node.type === 'layer') { // 其他图层
-        if (!checked) {
-          for (let i = 0; i < selectItem.domain.length; i++) {
-            this.map.removeLayer(this.parts[selectItem.domain[i] - 1])
-          }
-        } else {
-          for (let i = 0; i < selectItem.domain.length; i++) {
-            this.map.addLayer(this.parts[selectItem.domain[i] - 1])
-          }
-        }
+
+      if (!checked) {
+        this.map.removeLayer(this.layerGroups[selectItem.id])
+      } else {
+        this.map.addLayer(this.layerGroups[selectItem.id])
       }
     },
     // 地图初始化
     init() {
       const map = L.map('map', {
-        minZoom: 4,
-        maxZoom: 21,
+        minZoom: 14,
+        maxZoom: 25,
         center: this.baseConfig.center,
         zoom: this.baseConfig.zoom,
         zoomControl: false,
@@ -79,48 +68,147 @@
       map.doubleClickZoom.disable() // 禁止双击
       this.map = map // data挂载map
       window.map = map
-      // 添加底图图层
-      for (let i = 0; i <= 21; i++) {
-        const item = { url: `${this.baseUrl}${this.mapUrl}/${i}` }
-        this.maps.push(esri.featureLayer(item).addTo(map))
+
+      // 加载天地图底图和标注
+      this.baseLayer.push(L.tileLayer(this.baseConfig.mapUrl).addTo(map))
+      this.baseLayer.push(L.tileLayer(this.baseConfig.labelUrl).addTo(map))
+
+      // 构建并加载layerGroup
+      /* eslint-disable new-cap */
+      this.addMapDtLyaer() // 底图
+      this.addGridLayer() // 网格
+      this.addShopLayer() // 商户
+
+      // 部件图层组
+      for (let i = 3; i < 10; i++) {
+        this.addPartsLayer(i)
       }
-      // 添加部件图层
-      const partsLayer = this.baseConfig.partsLayer
-      for (const parent of partsLayer) { // 遍历大类
-        const childs = parent.children
-        for (const child of childs) { // 遍历小类
-          const item = { url: `${this.baseUrl}${this.partsUrl}/${child.layer}`, minZoom: 18 }
-          console.log(item)
-          var layer = esri.featureLayer(item).addTo(map)
-          // 点击部件事件
-          layer.on('click', function(e) {
-            // 获取要素的属性
-            const properties = e.layer.feature.properties
-            // 弹窗样式
-            var str = `<div class="pop-window">
-                        <div class="pop-title">
-                          ${properties['小类名称']}
-                        </div>
-                        <div class="pop-line"><col>大类：</col>${properties['大类名称']}</div>
-                        <div class="pop-line"><col>小类：</col>${properties['小类名称']}</div>
-                        <div class="pop-line"><col>部件编码：</col>${properties['编码']}</div>
-                        <div class="pop-line"><col>权属单位：</col>${properties['权属单位'] ? properties.权属单位 : '未知'}</div>
-                        <div class="pop-line"><col>详细地址：</col>${properties['详细地址'] ? properties.详细地址 : '未知'}</div>
-                      <div>`
-            var popup = L.popup().setContent(str)
-            e.layer.dragging._marker.bindPopup(popup, { minWidth: 200 }).openPopup()
-          })
-          this.parts.push(layer)
-        }
-      }
+
+      // 添加默认显示的图层
+      this.selectLayers.forEach(item => {
+        this.map.addLayer(this.layerGroups[item])
+      })
+    },
+    // 添加底图图层
+    addMapDtLyaer: function() {
+      const mapDtGroup = new L.layerGroup() // 创建layerGroup
+
+      // 创建图层并加载到layerGroup中
+      const item = { url: `${this.baseUrl}${this.mapDtUrl}` }
+      esri.dynamicMapLayer(item).addTo(mapDtGroup)
+
+      this.layerGroups.push(mapDtGroup)
+    },
+    // 添加网格图层
+    addGridLayer: function() {
+      const gridGroup = new L.layerGroup() // 创建layerGroup
+
+      // 创建图层并加载到layerGroup中
+      const item = { url: `${this.baseUrl}${this.gridUrl}` }
+      esri.featureLayer(item).addTo(gridGroup)
+
+      this.layerGroups.push(gridGroup)
+    },
+    // 添加商户图层
+    addShopLayer: function() {
+      const shopGroup = new L.layerGroup() // 创建layerGroup
+
+      // 创建图层并加载到layerGroup中
+      const item = { url: `${this.baseUrl}${this.shopUrl}` }
+      const layer = esri.featureLayer(item).addTo(shopGroup)
+
+      const that = this
+      layer.on('click', function(e) {
+        // 获取要素的属性
+        const properties = e.layer.feature.properties
+
+        // 弹窗样式
+        const popupStr = '<div class="popup-div">' +
+          '<div class="popup-title">商户信息</div>' +
+          '<div class="dashed-line"></div>' +
+          '<div class="popup-item"><label>商户名称</label>' + properties.dutyname + '</div>' +
+          '<div class="popup-item"><label>商户编号</label>' + properties.objid + '</div>' +
+          // '<div class="popup-item"><label>所在社区</label>' + properties.communame + '</div>' +
+          // '<div class="popup-item"><label>所在网格编号</label>' + properties.bgid + '</div>' +
+          '<div class="popup-item"><label>三包责任单位</label>' + properties.deptname + '</div>' +
+          '<div class="popup-item"><label>详细地址</label>' + properties.position_ + '</div>' +
+          '</div>'
+        // 弹出窗口
+        L.popup().setContent(popupStr).setLatLng(e.latlng).openOn(that.map)
+      })
+
+      this.layerGroups.push(shopGroup)
+    },
+    addPartsLayer: function(index) {
+      const that = this
+      const group = new L.layerGroup() // 创建layerGroup
+
+      const domains = this.baseConfig.layers[index].domain
+      const minZoom = this.baseConfig.layers[index].minZoom === undefined ? 18 : this.baseConfig.layers[index].minZoom
+      domains.forEach(dom => {
+        // 创建图层并加载到layerGroup中
+        const item = { url: `${this.baseUrl}${this.partsUrl}/${dom}`, minZoom: minZoom }
+        const layer = esri.featureLayer(item).addTo(group)
+
+        layer.on('click', function(e) {
+          // 获取要素的属性
+          const properties = e.layer.feature.properties
+
+          // 弹窗样式
+          const popupStr = '<div class="popup-div">' +
+            '<div class="popup-title">部件信息</div>' +
+            '<div class="dashed-line"></div>' +
+            '<div class="popup-item"><label>部件类型</label>' + properties.dl + ' / ' + properties.xl + '</div>' +
+            '<div class="popup-item"><label>部件编号</label>' + properties.objid + '</div>' +
+            '<div class="popup-item"><label>所在网格编号</label>' + properties.bgid + '</div>' +
+            '<div class="popup-item"><label>权属部门</label>' + properties.deptname2 + '</div>' +
+            '<div class="popup-item"><label>责任部门</label>' + properties.deptname1 + '</div>' +
+            '<div class="popup-item"><label>养护部门</label>' + properties.deptname3 + '</div>' +
+            '</div>'
+          // 弹出窗口
+          L.popup().setContent(popupStr).setLatLng(e.latlng).openOn(that.map)
+        })
+
+        that.layerGroups.push(group)
+      })
     }
   }
 }
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
   .leaflet_container{
-    width: calc( 100% - 158px );
-    height: 83vh;
+    width: calc( 100vw - 208px );
+    height: calc( 100vh - 158px );
     background-color: white;
   }
 </style>
+
+<style>
+  .leaflet-container a.leaflet-popup-close-button {
+    top: 5px; /* 修改弹窗关闭按钮样式 */
+    right: 10px; /* 修改弹窗关闭按钮样式 */
+  }
+
+  .leaflet-popup-content .popup-div {
+    font-size: 15px;
+    padding: 6px;
+  }
+
+  .leaflet-popup-content .popup-title {
+    font-weight: bold;
+  }
+
+  .leaflet-popup-content .dashed-line {
+    border-bottom: 1px dashed #dddddd;
+    margin: 10px -10px;
+  }
+
+  .leaflet-popup-content .popup-item {
+    padding-bottom: 6px;
+  }
+
+  .leaflet-popup-content .popup-item label {
+    font-weight: bold;
+    padding-right: 15px;
+  }
+</style>

diff --git a/src/assets/icons/icon-poi.png b/src/assets/icons/icon-poi.png
new file mode 100644
index 0000000..364f2f6
--- /dev/null
+++ b/src/assets/icons/icon-poi.png
Binary files differ
diff --git a/src/components/Map/leafletMap.vue b/src/components/Map/leafletMap.vue
index c8b0b6f..e1150e9 100644
--- a/src/components/Map/leafletMap.vue
+++ b/src/components/Map/leafletMap.vue
@@ -1,25 +1,21 @@
 <template>
-  <div style="margin-top: -10px">
+  <div style="margin-top: -30px; margin-bottom: -10px;">
     <el-row :gutter="20">
-      <div v-show="showpoi">
-        <el-col :span="3">
-          <el-input v-model="keywords" size="small" type="text" placeholder="兴趣点关键字" clearable />
-        </el-col>
-        <el-col :span="5">
-          <el-button type="primary" size="small" @click="queryOnMap">查询</el-button>
-          <el-button type="info" size="small" @click="clearMap"> 清除地图 </el-button>
-        </el-col>
-      </div>
+      <el-col v-show="showpoi" :span="8">
+        <el-input v-model="keywords" size="small" type="text" placeholder="兴趣点关键字" clearable style="width: 50%" />
+        <el-button type="primary" size="small" @click="queryOnMap">查询</el-button>
+        <el-button type="info" size="small" @click="clearMap"> 清除地图 </el-button>
+      </el-col>
 
-      <el-col :span="6" :offset="8" style="text-align: right;">
+      <el-col :span="8" style="text-align: right">
         <el-radio-group v-model="queryEventSwitch" size="small" @change="switchEventOrComponent">
           <el-radio-button label="1">事件定位</el-radio-button>
           <el-radio-button label="0">部件定位</el-radio-button>
-          <el-radio-button v-show="showpoi" label="2">兴趣点属性</el-radio-button>
+          <!--          <el-radio-button v-show="showpoi" label="2">兴趣点属性</el-radio-button>-->
         </el-radio-group>
       </el-col>
 
-      <el-col v-if="queryEventSwitch === '0'" :span="10" :offset="0" style="text-align: right;">
+      <el-col v-if="queryEventSwitch === '0'" :span="8" style="text-align: right;">
         <el-select v-model="form.componentId" placeholder="选择部件" clearable value="" size="small">
           <el-option
             v-for="item in compListOpts"
@@ -30,7 +26,7 @@
         <el-button type="primary" size="small" @click="checkComponentPoint"> 部件提交 </el-button>
       </el-col>
 
-      <el-col v-if="queryEventSwitch === '1'" :span="10" :offset="0" style="text-align: right;">
+      <el-col v-if="queryEventSwitch === '1'" :span="8" :offset="0" style="text-align: right;">
         <el-button type="primary" size="small" @click="checkEventPoint"> 事件提交 </el-button>
       </el-col>
     </el-row>
@@ -42,18 +38,40 @@
 <script>
 import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import { mapConfig, serverConfig } from './ArcGISConfig'
+import { mapGetters } from 'vuex'
+import { merchantListPage } from '@/api/geoCoding/geoCoding'
+
 const esri = require('esri-leaflet')
 
+const icon = L.icon({
+  iconUrl: require('@/assets/icons/icon-position.png'),
+  iconSize: [32, 32],
+  iconAnchor: [16, 32],
+  popupAnchor: [0, -32]
+})
+
+const poiIcon = L.icon({
+  iconUrl: require('@/assets/icons/icon-poi.png'),
+  iconSize: [16, 16],
+  iconAnchor: [8, 16],
+  popupAnchor: [0, -16]
+})
+
+const deltaLng10 = 0.00002536 // 10米范围经度值偏移量（大约）
+const deltaLat10 = 0.00002256 // 10米范围纬度值偏移量（大约）
+
 export default {
   name: 'LeafletMap',
   data() {
     return {
       map: null,
-      markers: [],
+      baseLayer: [],
+      markers: [], // 选点
+      pois: [], // 兴趣点结果
       layers: {
         bjPoint: '', // 部件点图层
-        grid: '' // 单元网格图层
+        grid: '', // 单元网格图层
+        shopPoint: '' // 商铺图层
       },
       form: {
         longitude: '', // 定位点经度
@@ -64,23 +82,33 @@
         componentId: '', // 部件ID
         componentName: '' // 部件名称
       }, // 主页面返回值
-      showpoi: false,
+      showpoi: true,
       keywords: '', // 查询关键字
+      limit: 100, // 兴趣点查询的最大结果数
       showEventPointPopup: true, // 是否显示事部件的popup
       queryEventSwitch: '1', // 1==查询事件；0==查询部件
       compListOpts: [] // 部件选择下拉框option
     }
   },
+  computed: {
+    ...mapGetters([
+      'baseUrl',
+      'partsUrl',
+      'mapUrl',
+      'gridUrl',
+      'partsAllUrl'
+    ])
+  },
   mounted() {
     this.initMap()
   },
   methods: {
     initMap() {
-      const map = L.map('map', {
-        minZoom: 13,
-        // maxZoom: 18,
-        center: [27.755, 116.08],
-        zoom: 16,
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: 14,
+        maxZoom: 25,
+        center: this.baseConfig.center,
+        zoom: this.baseConfig.zoom,
         zoomControl: false,
         attributionControl: false,
         crs: L.CRS.EPSG3857
@@ -89,135 +117,181 @@
       this.map = map // data上需要挂载
       window.map = map
 
-      esri.dynamicMapLayer({
-        url: serverConfig.mapUrlBase
-      }).addTo(map)
-
+      // 加载图层
       this.addLayers()
 
       const that = this
       map.on('click', function(e) {
-
-        console.log('e', e)
-        console.log('e.latlng', e.latlng)
-        console.log('queryEventSwitch', that.queryEventSwitch)
         that.clearPoints()
 
         // 加载定位点
         if (that.showEventPointPopup) {
-          const icon = L.icon({
-            iconUrl: require('../../assets/icons/icon-position.png'),
-            iconSize: [35, 35]
-          })
           const pos = L.marker(e.latlng, {
             icon: icon
           })
           that.markers.push(pos)
           that.map.addLayer(pos)
 
-          // 查询事件或者部件
-          if (that.queryEventSwitch === '1') {
-            // 事件定位
-            // 1查询底图得到所在网格与所在社区
-            const query = that.layers.grid.query()
-            query.nearby(e.latlng, 10)
-            query.run(function(error, featureCollection, response) {
-              if (error) {
-                console.log(error)
-                return
-              }
-              const result = featureCollection.features[0].properties
-              // 赋值
-              that.form.longitude = e.latlng.lng
-              that.form.latitude = e.latlng.lat
-              that.form.gridId = result.CommuId
-              that.form.communityId = result.CommuId
-              that.form.communityName = result.CommuName
-
-              pos.bindPopup('坐标：[' + that.form.longitude.toFixed(4) + ', ' + that.form.latitude.toFixed(4) + ']' + '<p>' + '所在社区：' + result.CommuName).openPopup()
-            })
-          } else if (that.queryEventSwitch === '0') {
-            var latlngs = []
-            var p1 = that.getLonAndLat(e.latlng.lng, e.latlng.lat, 0, 2.5)
-            latlngs.push([p1.lat, p1.lon])
-            var p2 = that.getLonAndLat(e.latlng.lng, e.latlng.lat, 90, 2.5)
-            latlngs.push([p2.lat, p2.lon])
-            var p3 = that.getLonAndLat(e.latlng.lng, e.latlng.lat, 180, 2.5)
-            latlngs.push([p3.lat, p3.lon])
-            var p4 = that.getLonAndLat(e.latlng.lng, e.latlng.lat, 270, 2.5)
-            latlngs.push([p4.lat, p4.lon])
-
-            var polyline = L.polygon(latlngs)
-            const bjQuery = that.layers.bjPoint.query()
-            bjQuery.within(polyline)
-            bjQuery.run(function(error, featureCollection, response) {
-              if (error) {
-                console.log(error)
-                return
-              }
-              if (featureCollection.features.length > 0) {
-                const result = featureCollection.features
-                console.log(result)
-                // 赋值
-                that.compListOpts = []
-                let content = ''
-                result.forEach((item, index) => {
-                  content += '<p>部件' + (index + 1) + '：' + item.properties.大类名称 + '-' + item.properties.小类名称 + '-' + item.properties.编码
-                  const comp = {}
-                  comp.name = '部件' + (index + 1) + '：' + item.properties.大类名称 + '-' + item.properties.小类名称 + '-' + item.properties.编码
-                  comp.value = item.properties.编码
-                  that.compListOpts.push(comp)
-                })
-
-                pos.bindPopup('坐标：[' + e.latlng.lng.toFixed(4) + ', ' + e.latlng.lat.toFixed(4) + ']，附近5米的部件有：' + content).openPopup()
-
-                const query = that.layers.grid.query()
-                query.nearby(e.latlng, 10)
-                query.run(function(error, featureCollection, response) {
-                  if (error) {
-                    console.log(error)
-                    return
-                  }
-                  const result = featureCollection.features[0].properties
-                  // 赋值
-                  that.form.longitude = e.latlng.lng
-                  that.form.latitude = e.latlng.lat
-                  that.form.gridId = result.CommuId
-                  that.form.communityId = result.CommuId
-                  that.form.communityName = result.CommuName
-                })
-              } else {
-                that.$message({
-                  message: '没有查询到部件，请重新定位',
-                  type: 'warning'
-                })
-              }
-            }
-            )
+          // 飞到定位点
+          let zoom = that.map.getZoom()
+          if (zoom < 18) {
+            zoom = 18
           }
+          that.map.flyTo(e.latlng, zoom)
+
+          // 查询所点的网格
+          const query = that.layers.grid.query()
+          query.nearby(e.latlng, 10)
+          query.run(function(error, featureCollection, response) {
+            if (error) {
+              console.log(error)
+              return
+            }
+            const result = featureCollection.features[0].properties
+            // 赋值
+            that.form.longitude = e.latlng.lng
+            that.form.latitude = e.latlng.lat
+            that.form.gridId = result.GBID
+            that.form.communityId = result.GBID.substring(0, 12)
+            that.form.communityName = result.Note
+
+            if (that.queryEventSwitch === '1') {
+              // 事件定位
+              // 弹出事件点位信息
+              const popupStr = '<div class="popup-div">' +
+                '<div class="popup-title">事件点</div>' +
+                '<div class="dashed-line"></div>' +
+                '<div class="popup-item"><label>坐标</label>' + that.form.longitude.toFixed(4) + ', ' + that.form.latitude.toFixed(4) + '</div>' +
+                '<div class="popup-item"><label>所在社区</label>' + that.form.communityName + '</div>' +
+                '<div class="popup-item"><label>网格编号</label>' + that.form.gridId + '</div>' +
+                '</div>'
+
+              pos.bindPopup(popupStr).openPopup()
+            } else if (that.queryEventSwitch === '0') {
+              // 部件定位
+              // 1构建部件查询多边形，上下左右四个点
+              const latlngs = []
+              const p1 = [e.latlng.lat + deltaLat10, e.latlng.lng] // 上方点
+              const p2 = [e.latlng.lat, e.latlng.lng + deltaLng10] // 右侧点
+              const p3 = [e.latlng.lat - deltaLat10, e.latlng.lng] // 下方点
+              const p4 = [e.latlng.lat, e.latlng.lng - deltaLng10] // 左侧点
+              latlngs.push(p1)
+              latlngs.push(p2)
+              latlngs.push(p3)
+              latlngs.push(p4)
+
+              const polyline = L.polygon(latlngs)
+              const bjQuery = that.layers.bjPoint.query()
+              bjQuery.within(polyline)
+              bjQuery.run(function(error, featureCollection, response) {
+                if (error) {
+                  console.log(error)
+                  return
+                }
+
+                // 查询到结果
+                if (featureCollection.features.length > 0) {
+                  const result = featureCollection.features
+                  // 赋值
+                  that.compListOpts = []
+
+                  // 构建弹出窗口信息
+                  let popupStr = '<div class="popup-div">' +
+                    '<div class="popup-title">部件</div>' +
+                    '<div class="dashed-line"></div>' +
+                    '<div class="popup-item">坐标[' + e.latlng.lng.toFixed(4) + ', ' + e.latlng.lat.toFixed(4) + ']附近的部件有</div>' +
+                    '<div class="popup-item"><label>所在社区</label>' + that.form.communityName + '</div>' +
+                    '<div class="popup-item"><label>网格编号</label>' + that.form.gridId + '</div>'
+
+                  result.forEach((item, index) => {
+                    popupStr += '<div class="popup-subitem"><label style="padding-right: 5px;">部件' + (index + 1) + '</label>' + item.properties.dl + '/' + item.properties.xl + '[' + item.properties.objid + ']</div>'
+                    const comp = {}
+                    comp.name = '部件' + (index + 1) + '：' + item.properties.dl + '/' + item.properties.xl + '[' + item.properties.objid + ']'
+                    comp.value = item.properties.objid
+                    that.compListOpts.push(comp)
+                  })
+
+                  popupStr += '</div>'
+                  pos.bindPopup(popupStr).openPopup()
+                } else {
+                  that.$message({ message: '没有查询到部件，请重新定位', type: 'warning' })
+                }
+              })
+            }
+          })
         }
       })
     },
     addLayers() {
+      // 加载天地图底图和标注
+      this.baseLayer.push(L.tileLayer(this.baseConfig.mapUrl).addTo(this.map))
+      this.baseLayer.push(L.tileLayer(this.baseConfig.labelUrl).addTo(this.map))
+
+      // 加载底图
+      esri.dynamicMapLayer({
+        url: `${this.baseUrl}${this.mapUrl}`,
+        zIndex: 1
+      }).addTo(this.map)
+
+      // 初始化部件图层（不分层），待切换到部件定位时加载
       this.layers.bjPoint = esri.featureLayer({
-        url: serverConfig.mapUrlBj + '/0'
+        url: `${this.baseUrl}${this.partsAllUrl}`,
+        minZoom: 19
       })
-      this.layers.grid = esri.featureLayer({
-        url: serverConfig.mapUrlBase + '/16'
-      })
-      this.map.addLayer(this.layers.bjPoint)
-      this.map.addLayer(this.layers.grid)
     },
     switchEventOrComponent: function() {
       // 如果选中的是事件定位（1）或部件定位（0），点击地图时弹出事件或者部件的popup；否则（2以上）显示兴趣点结果的属性popup
       this.showEventPointPopup = this.queryEventSwitch < 2
       this.clearPoints()
+
+      if (this.queryEventSwitch === '0') {
+        // 加载和显示部件图层
+        this.map.addLayer(this.layers.bjPoint)
+        // 清空部件选择的列表
+        this.compListOpts = []
+      } else {
+        this.map.removeLayer(this.layers.bjPoint)
+      }
     },
     clearPoints() {
       const that = this
       this.markers.forEach(marker => {
         that.map.removeLayer(marker)
       })
+      this.pois.forEach(marker => {
+        that.map.removeLayer(marker)
+      })
+    },
+    queryOnMap: function() {
+      const that = this
+      merchantListPage({
+        keyword: this.keywords,
+        limit: this.limit
+      }).then(response => {
+        if (response.code === 200) {
+          console.log(response)
+          this.clearMap()
+          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 {
+            data.rows.forEach(item => {
+              const popupStr = '<div class="popup-div">' +
+                '<div class="popup-title">兴趣点</div>' +
+                '<div class="dashed-line"></div>' +
+                '<div class="popup-item"><label>名称</label>' + item.merchantName + '</div>' +
+                '<div class="popup-item"><label>详细地址</label>' + item.address + '</div>' +
+                '</div>'
+              const poi = L.marker([item.pointY, item.pointX], { icon: poiIcon })
+              poi.bindPopup(popupStr).openPopup()
+              that.pois.push(poi)
+              that.map.addLayer(poi)
+            })
+          }
+        }
+      })
     },
     // 返回事件定位的结果
     checkEventPoint: function() {
@@ -258,72 +332,52 @@
       this.form.gridId = '' // 单元网格ID
       this.form.componentId = '' // 部件ID
       this.form.componentName = '' // 部件名称
-    },
-    numberToRadius(t) {
-      return (t * Math.PI) / 180
-    },
-    numberToDegree(t) {
-      return (180 * t) / Math.PI
-    },
-    /**
-     * 根据一个经纬度及距离角度，算出另外一个经纬度
-     * @param {*} lon 经度 113.3960698
-     * @param {*} lat 纬度 22.941386
-     * @param {*} brng 方位角 45 ---- 正北方：000°或360° 正东方：090° 正南方：180° 正西方：270°
-     * @param {*} dist 90000距离(米)
-     */
-    getLonAndLat(lon, lat, brng, dist) {
-      // 大地坐标系资料WGS-84 长半径a=6378137 短半径b=6356752.3142 扁率f=1/298.2572236
-      var a = 6378137
-      var b = 6356752.3142
-      var f = 1 / 298.257223563
-      var lon1 = lon * 1
-      var lat1 = lat * 1
-      var s = dist
-      var alpha1 = this.numberToRadius(brng)
-      var sinAlpha1 = Math.sin(alpha1)
-      var cosAlpha1 = Math.cos(alpha1)
-      var tanU1 = (1 - f) * Math.tan(this.numberToRadius(lat1))
-      var cosU1 = 1 / Math.sqrt((1 + tanU1 * tanU1)), sinU1 = tanU1 * cosU1
-      var sigma1 = Math.atan2(tanU1, cosAlpha1)
-      var sinAlpha = cosU1 * sinAlpha1
-      var cosSqAlpha = 1 - sinAlpha * sinAlpha
-      var uSq = cosSqAlpha * (a * a - b * b) / (b * b)
-      var A = 1 + uSq / 16384 * (4096 + uSq * (-768 + uSq * (320 - 175 * uSq)))
-      var B = uSq / 1024 * (256 + uSq * (-128 + uSq * (74 - 47 * uSq)))
-      var sigma = s / (b * A), sigmaP = 2 * Math.PI
-      while (Math.abs(sigma - sigmaP) > 1e-12) {
-        var cos2SigmaM = Math.cos(2 * sigma1 + sigma)
-        var sinSigma = Math.sin(sigma)
-        var cosSigma = Math.cos(sigma)
-        var deltaSigma = B * sinSigma * (cos2SigmaM + B / 4 * (cosSigma * (-1 + 2 * cos2SigmaM * cos2SigmaM) -
-          B / 6 * cos2SigmaM * (-3 + 4 * sinSigma * sinSigma) * (-3 + 4 * cos2SigmaM * cos2SigmaM)))
-        sigmaP = sigma
-        sigma = s / (b * A) + deltaSigma
-      }
-      var tmp = sinU1 * sinSigma - cosU1 * cosSigma * cosAlpha1
-      var lat2 = Math.atan2(sinU1 * cosSigma + cosU1 * sinSigma * cosAlpha1, (1 - f) * Math.sqrt(sinAlpha * sinAlpha + tmp * tmp))
-      var lambda = Math.atan2(sinSigma * sinAlpha1, cosU1 * cosSigma - sinU1 * sinSigma * cosAlpha1)
-      var C = f / 16 * cosSqAlpha * (4 + f * (4 - 3 * cosSqAlpha))
-      var L = lambda - (1 - C) * f * sinAlpha * (sigma + C * sinSigma * (cos2SigmaM + C * cosSigma * (-1 + 2 * cos2SigmaM * cos2SigmaM)))
-      var revAz = Math.atan2(sinAlpha, -tmp) // final bearing
-      var lonLatObj = { lon: lon1 + this.numberToDegree(L), lat: this.numberToDegree(lat2) }
-      return lonLatObj
     }
   }
 }
 </script>
 
 <style scoped>
-  @import 'https://js.arcgis.com/4.13/esri/css/main.css';
   .baseMap {
-    height:60vh;
+    height: 65vh;
     width: 100%;
-    margin-top: 25px;
+    margin-top: 10px;
     border: 1px solid #DCDCDC;
     border-radius: 4px;
   }
-  .leaflet-container {
-    background: #fff0;
+</style>
+
+<style>
+  .leaflet-container a.leaflet-popup-close-button {
+    top: 5px; /* 修改弹窗关闭按钮样式 */
+    right: 10px; /* 修改弹窗关闭按钮样式 */
+  }
+
+  .leaflet-popup-content .popup-div {
+    font-size: 15px;
+    padding: 6px;
+  }
+
+  .leaflet-popup-content .popup-title {
+    font-weight: bold;
+  }
+
+  .leaflet-popup-content .dashed-line {
+    border-bottom: 1px dashed #dddddd;
+    margin: 10px -10px;
+  }
+
+  .leaflet-popup-content .popup-item {
+    padding-bottom: 6px;
+  }
+
+  .leaflet-popup-content .popup-item label {
+    font-weight: bold;
+    padding-right: 15px;
+  }
+
+  .leaflet-popup-content .popup-subitem {
+    padding-bottom: 6px;
+    font-size: 12px;
   }
 </style>
diff --git a/src/components/Map/leafletMapRead.vue b/src/components/Map/leafletMapRead.vue
index dd22198..edcd37d 100644
--- a/src/components/Map/leafletMapRead.vue
+++ b/src/components/Map/leafletMapRead.vue
@@ -7,7 +7,7 @@
 <script>
 import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import { mapConfig, serverConfig } from './ArcGISConfig'
+import { mapGetters } from 'vuex'
 const esri = require('esri-leaflet')
 export default {
   name: 'LeafletMapRead',
@@ -23,10 +23,20 @@
   },
   data() {
     return {
+      baseLayer: [],
       mapLoading: false,
       map: null
     }
   },
+  computed: {
+    ...mapGetters([
+      'baseUrl',
+      'partsUrl',
+      'mapUrl',
+      'gridUrl',
+      'partsAllUrl'
+    ])
+  },
   mounted() {
     this.initMap()
     this.addMarker()
@@ -36,9 +46,9 @@
       this.mapLoading = true
       const map = L.map('map', {
         minZoom: 13,
-        // maxZoom: 18,
-        center: [27.755, 116.08],
-        zoom: 16,
+        maxZoom: 24,
+        center: this.baseConfig.center,
+        zoom: this.baseConfig.zoom,
         zoomControl: false,
         attributionControl: false,
         crs: L.CRS.EPSG3857
@@ -47,45 +57,30 @@
       this.map = map // data上需要挂载
       window.map = map
 
+      // 加载天地图底图和标注
+      this.baseLayer.push(L.tileLayer(this.baseConfig.mapUrl).addTo(map))
+      this.baseLayer.push(L.tileLayer(this.baseConfig.labelUrl).addTo(map))
+
       esri.dynamicMapLayer({
-        url: serverConfig.mapUrlBase,
+        url: `${this.baseUrl}${this.mapUrl}`,
         opacity: 1,
         f: 'image'
       }).addTo(map)
 
-      // esri.tiledMapLayer({
-      //   url: serverConfig.mapUrlBase,
-      //   maxZoom: 15,
-      //   f: 'image'
-      // }).addTo(map)
-
-      // for (let i = 0; i < 24; i++) {
-      //   esri.featureLayer({
-      //     url: serverConfig.mapUrlBase + '/' + i
-      //     // minZoom: 4, // 最小缩放等级
-      //     // maxZoom: 21// 最大缩放等级
-      //   }).addTo(map)
-      // }
-
-      esri.featureLayer({
-        url: serverConfig.mapUrlBj + '/0'
-      }).addTo(map)
-      esri.featureLayer({
-        url: serverConfig.mapUrlBase + '/16'
-      }).addTo(map)
       this.mapLoading = false
     },
 
     addMarker() {
       const icon = L.icon({
-        iconUrl: require('../../assets/icons/icon-position.png'),
-        iconSize: [35, 35],
-        iconAnchor: [17.5, 35]
+        iconUrl: require('@/assets/icons/icon-position.png'),
+        iconSize: [32, 32],
+        iconAnchor: [16, 32],
+        popupAnchor: [0, -32]
       })
       const latlng = L.latLng([this.latitude, this.longitude])
       const feat = L.marker(latlng, { icon: icon })
       feat.addTo(this.map)
-      this.map.setView({ lat: this.latitude, lng: this.longitude }, 16)
+      this.map.setView({ lat: this.latitude, lng: this.longitude }, 18)
     }
   }
 }
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 2f77b38..134cb1e 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -31,12 +31,12 @@
         name: 'TimeLimit',
         meta: { title: '阶段时限', icon: '', permission: ['/timeLimit'] }
       },
-      {
-        path: '/caseList',
-        component: () => import('@/views/seo/seo'),
-        name: 'CaseList',
-        meta: { title: '综合查询', icon: '', permission: ['/caseList'] }
-      },
+      // {
+      //   path: '/caseList',
+      //   component: () => import('@/views/seo/seo'),
+      //   name: 'CaseList',
+      //   meta: { title: '综合查询', icon: '', permission: ['/caseList'] }
+      // },
       {
         path: '/caseType',
         component: () => import('@/views/busAdmin/caseType/listCaseType.vue'),
diff --git a/src/store/getters.js b/src/store/getters.js
index 57e8aac..d28b64f 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -30,7 +30,10 @@
   partsUrl: state => state.map.partsUrl, // 部件分层地址
   partsEditUrl: state => state.map.partsEditUrl, // 部件分层地址
   partsAllUrl: state => state.map.partsAllUrl, // 部件不分层地址
+  shopUrl: state => state.map.shopUrl, // 部件不分层地址
   mapUrl: state => state.map.mapUrl, // 底图地址
+  mapDtUrl: state => state.map.mapDtUrl, // 无网格底图地址
+  gridUrl: state => state.map.gridUrl, // 网格图层
   editUrl: state => state.map.editUrl // 编辑地图地址
 }
 export default getters
diff --git a/src/store/modules/map.js b/src/store/modules/map.js
index aa2c6f8..13f5313 100644
--- a/src/store/modules/map.js
+++ b/src/store/modules/map.js
@@ -5,7 +5,10 @@
   baseUrl: '', // 服务基础地址
   partsUrl: '', // 部件分层地址
   partsAllUrl: '', // 部件不分层地址
+  shopUrl: '', // 商户图层
   mapUrl: '', // 二维底图地址
+  mapDtUrl: '', // 无网格地图
+  gridUrl: '', // 网格图层
   editUrl: '' // 编辑地图URL
 }
 const mutations = {
@@ -24,9 +27,18 @@
   SET_PARTS_ALL_URL: (state, url) => {
     state.partsAllUrl = url
   },
+  SET_SHOP_URL: (state, url) => {
+    state.shopUrl = url
+  },
   SET_MAP_URL: (state, url) => {
     state.mapUrl = url
   },
+  SET_MAPDT_URL: (state, url) => {
+    state.mapDtUrl = url
+  },
+  SET_GRID_URL: (state, url) => {
+    state.gridUrl = url
+  },
   SET_EDIT_URL: (state, url) => {
     state.editUrl = url
   }
@@ -52,8 +64,14 @@
               commit('SET_PARTS_EDIT_URL', editUrl)
             } else if (item.name === '部件地图URL') {
               commit('SET_PARTS_ALL_URL', item.url)
+            } else if (item.name === '商户图层URL') {
+              commit('SET_SHOP_URL', item.url)
             } else if (item.name === '二维地图URL') {
               commit('SET_MAP_URL', item.url)
+            } else if (item.name === '无网格地图URL') {
+              commit('SET_MAPDT_URL', item.url)
+            } else if (item.name === '网格图层URL') {
+              commit('SET_GRID_URL', item.url)
             } else if (item.name === '编辑地图URL') {
               commit('SET_EDIT_URL', item.url)
             }
diff --git a/src/views/assessPost/receiverAccessChart.vue b/src/views/assessPost/receiverAccessChart.vue
index 6cc18f8..4e3523d 100644
--- a/src/views/assessPost/receiverAccessChart.vue
+++ b/src/views/assessPost/receiverAccessChart.vue
@@ -97,7 +97,8 @@
         xAxis: {
           data: this.x,
           axisLabel: {
-            fontSize: 14
+            fontSize: 14,
+            interval: 0
           }
         },
         yAxis: {
@@ -115,6 +116,18 @@
           tooltip: {
             position: 'right'
           }
+        }],
+        dataZoom: [{
+          type: 'slider',
+          show: true,
+          start: 0,
+          end: 50,
+          handleSize: 8
+        },
+        {
+          type: 'inside',
+          start: 0,
+          end: 50
         }]
       })
       this.chart.resize()
diff --git a/src/views/assessRegion/accessAreaChart.vue b/src/views/assessRegion/accessAreaChart.vue
index 3424aec..9745b4a 100644
--- a/src/views/assessRegion/accessAreaChart.vue
+++ b/src/views/assessRegion/accessAreaChart.vue
@@ -107,6 +107,18 @@
           tooltip: {
             position: 'right'
           }
+        }],
+        dataZoom: [{
+          type: 'slider',
+          show: true,
+          start: 0,
+          end: 50,
+          handleSize: 8
+        },
+        {
+          type: 'inside',
+          start: 0,
+          end: 50
         }]
       })
       this.chart.resize()
diff --git a/src/views/baseSource/components/layerChoose.vue b/src/views/baseSource/components/layerChoose.vue
index c98e787..2cd75c8 100644
--- a/src/views/baseSource/components/layerChoose.vue
+++ b/src/views/baseSource/components/layerChoose.vue
@@ -13,11 +13,13 @@
     <el-collapse-transition>
       <div v-show="cardShow" class="layers-card">
         <el-tree
+          ref="layerTree"
           :data="layers"
           :default-checked-keys="selectLayers"
           :props="treeProps"
           show-checkbox
           node-key="id"
+          @check="nodeCheck"
           @check-change="checkChange"/>
       </div>
     </el-collapse-transition>
@@ -65,6 +67,9 @@
     }
   },
   methods: {
+    nodeCheck(node, checked) {
+      this.$emit('check', node, checked)
+    },
     checkChange(node, checked) {
       this.$emit('choose', node, checked)
     }
diff --git a/src/views/baseSource/components/searchItem.vue b/src/views/baseSource/components/searchItem.vue
index a0c73f3..e2d52ab 100644
--- a/src/views/baseSource/components/searchItem.vue
+++ b/src/views/baseSource/components/searchItem.vue
@@ -10,9 +10,9 @@
       <img src="@/assets/global_images/point.png" class="item-icon">
     </div>
     <div class="list-item-right">
-      <div class="list-item-right-row"><div>名称：</div><div :title="data.feature.properties.小类名称" class="content">{{ data.feature.properties.小类名称 }}</div></div>
-      <div class="list-item-right-row"><div>编码：</div><div :title="data.feature.properties.编码" class="content">{{ data.feature.properties.编码 }}</div></div>
-      <div class="list-item-right-row"><div>地址：</div><div :title="data.feature.properties.编码" class="content">{{ data.feature.properties.编码 }}</div></div>
+      <div class="list-item-right-row"><div>名称：</div><div :title="data.name" class="content">{{ data.name }}</div></div>
+      <div class="list-item-right-row"><div>编码：</div><div :title="data.code" class="content">{{ data.code }}</div></div>
+      <div class="list-item-right-row"><div>{{ data.content.title }}：</div><div :title="data.content" class="content">{{ data.content.text }}</div></div>
     </div>
   </div>
 </template>
@@ -30,14 +30,9 @@
       required: true
     } // 数据
   },
-  // mounted() {
-  //   debugger
-  //   console.log(this.data.feature)
-  // },
   methods: {
     // 点击数据项
     itemClick() {
-      console.log('点击item')
       this.$emit('click', this.data)
     }
   }
diff --git a/src/views/baseSource/mapSearch.vue b/src/views/baseSource/mapSearch.vue
index 71147d8..5ae0c05 100644
--- a/src/views/baseSource/mapSearch.vue
+++ b/src/views/baseSource/mapSearch.vue
@@ -17,7 +17,7 @@
         <!--重置工具-->
         <clear-tool :disabled="clearDisabled" @click="drawDelete"/>
         <!--图层选择工具-->
-        <layer-choose :layers="layers" :select-layers="selectLayers" @choose="layerChange"/>
+        <layer-choose ref="layerRadio" :layers="layers" :select-layers="selectLayers" @check="layerChange"/>
       </tools-container>
       <!--图层选择组件-->
     </div>
@@ -45,10 +45,15 @@
       drawLayer: null, // 绘制图层（框选）
       bounds: null, // 查询区域
       clearDisabled: true, // 禁用重置按钮
-      layers: this.baseConfig.layers, // 所有图层
-      selectLayers: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], // 选中图层
+      baseLayer: [],
+      layers: [
+        { 'id': 0, 'name': '商户', 'type': 'layer', 'domain': [35] },
+        { 'id': 1, 'name': '部件', 'type': 'layer', 'domain': [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 15, 16, 18, 19, 20, 21, 22, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45] }
+      ],
+      selectLayers: [0], // 选中图层
       maps: [], // 地图图层
       parts: [], // 部件图层
+      layerGroups: [], // 图层组，用于控制一组内容显示或者隐藏
       searchList: [], // 全部查询结果
       featureCollection: [], // 选中的图层和Feature
       featureCollectionLength: 0, // 选中的feature个数
@@ -60,9 +65,8 @@
     ...mapGetters([
       'baseUrl',
       'partsUrl',
-      'partsAllUrl',
-      'mapUrl',
-      'partsEditUrl'
+      'shopUrl',
+      'mapUrl'
     ])
   },
   destroyed() {
@@ -89,18 +93,17 @@
       } // 其他不予处理
       this.searchLoading = true
       const results = [] // 存放查询结果列表
-      // 遍历所有图层进行查询
-      const partsLength = this.parts.length // 全部部件图层数量
-      for (let i = 0; i < partsLength; i++) {
-        const part = this.parts[i]
-        var str = ['编码', '小类名称', '大类名称']
-        var query = esri.query({ url: part.options.url })
+
+      // 获取是查询部件还是查询商户
+      if (this.selectLayers.toString() === '0') {
+        // 查询商户
+        const str = ['objid', 'dutyname', 'position_'] // 查询条件属性
+        const query = esri.query({ url: `${this.baseUrl}${this.shopUrl}` })
         let queryString = '1=1' // 默认查询语句
         // 如果有关键字
         if (this.keyword) {
           // 拼接查询语句
           queryString = str.map(item => `(${item} like '%${this.keyword}%')`).join(' OR ')
-          console.log(queryString)
         } else {
           return
         }
@@ -119,18 +122,98 @@
           if (featuresLength > 0) {
             // 遍历所有查询结果，放入results
             for (const feature of featureCollection.features) {
+              const popupStr = '<div class="popup-div">' +
+                '<div class="popup-title">商户信息</div>' +
+                '<div class="dashed-line"></div>' +
+                '<div class="popup-item"><label>商户名称</label>' + feature.properties.dutyname + '</div>' +
+                '<div class="popup-item"><label>商户编号</label>' + feature.properties.objid + '</div>' +
+                // '<div class="popup-item"><label>所在社区</label>' + feature.properties.communame + '</div>' +
+                // '<div class="popup-item"><label>所在网格编号</label>' + feature.properties.bgid + '</div>' +
+                '<div class="popup-item"><label>三包责任单位</label>' + feature.properties.deptname + '</div>' +
+                '<div class="popup-item"><label>详细地址</label>' + feature.properties.position_ + '</div>' +
+                '</div>'
+
               results.push({
-                layer: part,
-                feature: feature
+                name: feature.properties.dutyname,
+                code: feature.properties.objid,
+                content: {
+                  title: '地址',
+                  text: feature.properties.position_
+                },
+                lng: feature.properties.x,
+                lat: feature.properties.y,
+                popupStr: popupStr
               })
             }
           }
-          // 如果是最后一个图层
-          if (i === (partsLength - 1)) {
-            this.searchList = results
-            this.searchLoading = false
-          }
+
+          this.searchList = results
+          this.searchLoading = false
         })
+      } else if (this.selectLayers.toString() === '1') {
+        // 查询部件
+        // 遍历所有图层进行查询
+        const partsLength = this.parts.length // 全部部件图层数量
+        for (let i = 0; i < partsLength; i++) {
+          const part = this.parts[i]
+          const str = ['objid', 'xl', 'dl']
+          const query = esri.query({ url: part.url })
+          let queryString = '1=1' // 默认查询语句
+          // 如果有关键字
+          if (this.keyword) {
+            // 拼接查询语句
+            queryString = str.map(item => `(${item} like '%${this.keyword}%')`).join(' OR ')
+          } else {
+            return
+          }
+          query.where(queryString)
+          // 如果有查询边界
+          if (this.bounds) {
+            query.within(this.bounds)
+          }
+          // 执行查询
+          query.run((error, featureCollection, response) => {
+            if (error) {
+              console.log(error)
+              return
+            }
+            const featuresLength = featureCollection.features.length
+            if (featuresLength > 0) {
+              // 遍历所有查询结果，放入results
+              for (const feature of featureCollection.features) {
+                const popupStr = '<div class="popup-div">' +
+                  '<div class="popup-title">部件信息</div>' +
+                  '<div class="dashed-line"></div>' +
+                  '<div class="popup-item"><label>部件类型</label>' + feature.properties.dl + ' / ' + feature.properties.xl + '</div>' +
+                  '<div class="popup-item"><label>部件编号</label>' + feature.properties.objid + '</div>' +
+                  '<div class="popup-item"><label>所在网格编号</label>' + feature.properties.bgid + '</div>' +
+                  '<div class="popup-item"><label>权属部门</label>' + feature.properties.deptname2 + '</div>' +
+                  '<div class="popup-item"><label>责任部门</label>' + feature.properties.deptname1 + '</div>' +
+                  '<div class="popup-item"><label>养护部门</label>' + feature.properties.deptname3 + '</div>' +
+                  '</div>'
+
+                results.push({
+                  name: feature.properties.dl + ' / ' + feature.properties.xl,
+                  code: feature.properties.objid,
+                  content: {
+                    title: '权属部门',
+                    text: feature.properties.deptname2
+                  },
+                  lng: feature.geometry.coordinates[0],
+                  lat: feature.geometry.coordinates[1],
+                  popupStr: popupStr
+                })
+              }
+            }
+            // 如果是最后一个图层
+            if (i === (partsLength - 1)) {
+              this.searchList = results
+              this.searchLoading = false
+            }
+          })
+        }
+      } else {
+        this.searchLoading = false
       }
     },
     // 清空查询
@@ -154,28 +237,16 @@
       // 赋予新的查询结果
       const currentMarkesLength = data.length
       for (let i = 0; i < currentMarkesLength; i++) {
-        const feature = data[i].feature
-        var icon = this.searchIconList[i]
-        const latlng = L.latLng([feature.geometry.coordinates[1], feature.geometry.coordinates[0]])
-        var item = L.marker(latlng, { icon: icon, layer: data[i].layer, properties: feature.properties }).addTo(this.map)
+        const icon = this.searchIconList[i]
+        const latlng = L.latLng([data[i].lat, data[i].lng])
+        const item = L.marker(latlng, { icon: icon }).addTo(this.map)
         item.on('click', e => {
           if (item.getPopup()) {
             item.unbindPopup()
           }
           // 绑定弹窗
-          const properties = feature.properties
-          var str = `<div class="pop-window">
-                        <div class="pop-title">
-                          ${properties['小类名称']}
-                        </div>
-                        <div class="pop-line"><col>大类：</col>${properties['大类名称']}</div>
-                        <div class="pop-line"><col>小类：</col>${properties['小类名称']}</div>
-                        <div class="pop-line"><col>部件编码：</col>${properties['编码']}</div>
-                        <div class="pop-line"><col>权属单位：</col>${properties['权属单位'] ? properties.权属单位 : '未知'}</div>
-                        <div class="pop-line"><col>详细地址：</col>${properties['详细地址'] ? properties.详细地址 : '未知'}</div>
-                      <div>`
-          var popup = L.popup().setContent(str)
-          item.bindPopup(popup).openPopup(e.latlng)
+          const popup = L.popup().setContent(data[i].popupStr)
+          item.bindPopup(popup).openPopup([data[i].lat, data[i].lng])
         })
         this.currentSearchMarkers.push(item)
       }
@@ -186,10 +257,8 @@
     },
     // 点击查询列表项，将位置放在中间
     clickSearchItem(item, index) {
-      console.log('clickItem')
       if (item) {
-        const feature = item.feature
-        const latlng = L.latLng([feature.geometry.coordinates[1], feature.geometry.coordinates[0]])
+        const latlng = L.latLng([item.lat, item.lng])
         let zoom = this.map.getZoom()
         if (zoom < 19) {
           zoom = 19
@@ -229,36 +298,18 @@
       })
     },
     // 部件图层切换
-    layerChange(node, checked) {
-      const selectItem = this.layers.filter(item => item.name === node.name)[0]
-      // 如果选中底图,选中添加，没选中移除
-      if (selectItem.type === 'map') {
-        if (!checked) {
-          for (const item of this.maps) {
-            this.map.removeLayer(item)
-          }
-        } else {
-          for (const item of this.maps) {
-            this.map.addLayer(item)
-          }
-        }
-      } else if (node.type === 'layer') { // 其他图层
-        if (!checked) {
-          for (let i = 0; i < selectItem.domain.length; i++) {
-            this.map.removeLayer(this.parts[selectItem.domain[i] - 1])
-          }
-        } else {
-          for (let i = 0; i < selectItem.domain.length; i++) {
-            this.map.addLayer(this.parts[selectItem.domain[i] - 1])
-          }
-        }
-      }
+    layerChange(node) {
+      this.$refs.layerRadio.$refs.layerTree.setCheckedKeys([node.id])
+      this.selectLayers = [node.id]
+
+      // 清除查询
+      this.clearSearch()
     },
     // 地图初始化
     init() {
       const map = L.map('map', {
-        minZoom: 4,
-        maxZoom: 21,
+        minZoom: 14,
+        maxZoom: 25,
         center: this.baseConfig.center,
         zoom: this.baseConfig.zoom,
         zoomControl: false,
@@ -268,40 +319,64 @@
       map.doubleClickZoom.disable() // 禁止双击
       this.map = map // data挂载map
       window.map = map
-      // 添加底图
-      for (let i = 0; i <= 21; i++) {
-        const item = { url: `${this.baseUrl}${this.mapUrl}/${i}` }
-        this.maps.push(esri.featureLayer(item).addTo(map))
+
+      // 加载天地图底图和标注
+      this.baseLayer.push(L.tileLayer(this.baseConfig.mapUrl).addTo(map))
+      this.baseLayer.push(L.tileLayer(this.baseConfig.labelUrl).addTo(map))
+
+      // 构建并加载layerGroup
+      /* eslint-disable new-cap */
+      this.addMapDtLyaer() // 底图
+
+      // 部件图层组
+      for (let i = 3; i < 10; i++) {
+        this.addPartsLayer(i)
       }
-      // 添加部件图层
-      const partsLayer = this.baseConfig.partsLayer
-      for (const parent of partsLayer) { // 遍历大类
-        const childs = parent.children
-        for (const child of childs) { // 遍历小类
-          const item = { url: `${this.baseUrl}${this.partsUrl}/${child.layer}`, minZoom: 18 }
-          console.log(item)
-          var layer = esri.featureLayer(item).addTo(map)
-          // 点击部件事件
-          layer.on('click', function(e) {
-            // 获取要素的属性
-            const properties = e.layer.feature.properties
-            // 弹窗样式
-            var str = `<div class="pop-window">
-                        <div class="pop-title">
-                          ${properties['小类名称']}
-                        </div>
-                        <div class="pop-line"><col>大类：</col>${properties['大类名称']}</div>
-                        <div class="pop-line"><col>小类：</col>${properties['小类名称']}</div>
-                        <div class="pop-line"><col>部件编码：</col>${properties['编码']}</div>
-                        <div class="pop-line"><col>权属单位：</col>${properties['权属单位'] ? properties.权属单位 : '未知'}</div>
-                        <div class="pop-line"><col>详细地址：</col>${properties['详细地址'] ? properties.详细地址 : '未知'}</div>
-                      <div>`
-            var popup = L.popup().setContent(str)
-            e.layer.dragging._marker.bindPopup(popup, { minWidth: 200 }).openPopup()
-          })
-          this.parts.push(layer)
-        }
-      }
+    },
+    // 添加底图图层
+    addMapDtLyaer: function() {
+      const mapDtGroup = new L.layerGroup() // 创建layerGroup
+
+      // 创建图层并加载到layerGroup中
+      const item = { url: `${this.baseUrl}${this.mapUrl}` }
+      esri.dynamicMapLayer(item).addTo(mapDtGroup)
+
+      this.layerGroups.push(mapDtGroup)
+      this.map.addLayer(mapDtGroup)
+    },
+    addPartsLayer: function(index) {
+      const that = this
+      const group = new L.layerGroup() // 创建layerGroup
+
+      const domains = this.baseConfig.layers[index].domain
+      domains.forEach(dom => {
+        // 创建图层并加载到layerGroup中
+        const item = { url: `${this.baseUrl}${this.partsUrl}/${dom}`, minZoom: 18 }
+        const layer = esri.featureLayer(item).addTo(group)
+        this.parts.push(item)
+
+        layer.on('click', function(e) {
+          // 获取要素的属性
+          const properties = e.layer.feature.properties
+
+          // 弹窗样式
+          const popupStr = '<div class="popup-div">' +
+            '<div class="popup-title">部件信息</div>' +
+            '<div class="dashed-line"></div>' +
+            '<div class="popup-item"><label>部件类型</label>' + properties.dl + ' / ' + properties.xl + '</div>' +
+            '<div class="popup-item"><label>部件编号</label>' + properties.objid + '</div>' +
+            '<div class="popup-item"><label>所在网格编号</label>' + properties.bgid + '</div>' +
+            '<div class="popup-item"><label>权属部门</label>' + properties.deptname2 + '</div>' +
+            '<div class="popup-item"><label>责任部门</label>' + properties.deptname1 + '</div>' +
+            '<div class="popup-item"><label>养护部门</label>' + properties.deptname3 + '</div>' +
+            '</div>'
+          // 弹出窗口
+          L.popup().setContent(popupStr).setLatLng(e.latlng).openOn(that.map)
+        })
+
+        that.layerGroups.push(group)
+      })
+      this.map.addLayer(group)
     },
     // 初始化图标
     initIcons() {
@@ -310,23 +385,17 @@
         const icon = L.icon({
           iconUrl: require(`@/assets/global_images/point${i}.png`),
           iconSize: [25, 25],
-          iconAnchor: [12.5, 25]
+          iconAnchor: [12, 25],
+          popupAnchor: [0, -25]
         })
         this.searchIconList.push(icon)
       }
     },
     handleCurrentChange(val) {
       this.offset = val
-      var num = 5 * val >= this.searchlist.length ? this.searchlist.length : 5 * val
-      this.showlist = this.searchlist.slice(5 * (val - 1), num)
+      const num = 5 * val >= this.searchList.length ? this.searchList.length : 5 * val
+      this.showlist = this.searchList.slice(5 * (val - 1), num)
       this.drawIcon()
-    },
-    // 根据url找到layer
-    searchLayerByUrl(url) {
-      const layer = this.parts.filter(item => item.options.url === url)[0]
-      if (layer) {
-        this.currentLayer = layer
-      }
     }
   }
 }
@@ -345,8 +414,9 @@
   /*}*/
   $tableTitleHeight:35px;
   .leaflet_container{
-    width: 100%;
-    height: 84vh;
+    width: calc( 100vw - 208px );
+    height: calc( 100vh - 158px );
+    background-color: white;
   }
   .search-total{
     background-color: white; width: 300px;height: 35px;
@@ -453,3 +523,33 @@
     }
   }
 </style>
+
+<style>
+  .leaflet-container a.leaflet-popup-close-button {
+    top: 5px; /* 修改弹窗关闭按钮样式 */
+    right: 10px; /* 修改弹窗关闭按钮样式 */
+  }
+
+  .leaflet-popup-content .popup-div {
+    font-size: 15px;
+    padding: 6px;
+  }
+
+  .leaflet-popup-content .popup-title {
+    font-weight: bold;
+  }
+
+  .leaflet-popup-content .dashed-line {
+    border-bottom: 1px dashed #dddddd;
+    margin: 10px -10px;
+  }
+
+  .leaflet-popup-content .popup-item {
+    padding-bottom: 6px;
+  }
+
+  .leaflet-popup-content .popup-item label {
+    font-weight: bold;
+    padding-right: 15px;
+  }
+</style>
diff --git a/src/views/baseSource/overview.vue b/src/views/baseSource/overview.vue
index 8a3f857..02267ef 100644
--- a/src/views/baseSource/overview.vue
+++ b/src/views/baseSource/overview.vue
@@ -20,9 +20,11 @@
   components: { LayerChoose, ToolsContainer },
   data() {
     return {
+      baseLayer: [],
       layers: this.baseConfig.layers, // 图层列表
-      selectLayers: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], // 选中图层列表
+      selectLayers: [0, 1, 2], // 选中图层列表
       map: null, // 地图对象
+      layerGroups: [], // 图层组，用于控制一组内容显示或者隐藏
       maps: [], // 地图图层
       parts: [] // 部件图层
     }
@@ -32,7 +34,10 @@
       'baseUrl',
       'partsUrl',
       'partsAllUrl',
-      'mapUrl'
+      'shopUrl',
+      'mapUrl',
+      'gridUrl',
+      'mapDtUrl'
     ])
   },
   mounted() {
@@ -42,34 +47,18 @@
     // 部件图层切换
     layerChange(node, checked) {
       const selectItem = this.layers.filter(item => item.name === node.name)[0]
-      // 如果选中底图,选中添加，没选中移除
-      if (selectItem.type === 'map') {
-        if (!checked) {
-          for (const item of this.maps) {
-            this.map.removeLayer(item)
-          }
-        } else {
-          for (const item of this.maps) {
-            this.map.addLayer(item)
-          }
-        }
-      } else if (node.type === 'layer') { // 其他图层
-        if (!checked) {
-          for (let i = 0; i < selectItem.domain.length; i++) {
-            this.map.removeLayer(this.parts[selectItem.domain[i] - 1])
-          }
-        } else {
-          for (let i = 0; i < selectItem.domain.length; i++) {
-            this.map.addLayer(this.parts[selectItem.domain[i] - 1])
-          }
-        }
+
+      if (!checked) {
+        this.map.removeLayer(this.layerGroups[selectItem.id])
+      } else {
+        this.map.addLayer(this.layerGroups[selectItem.id])
       }
     },
     // 地图初始化
     init() {
       const map = L.map('map', {
-        minZoom: 4,
-        maxZoom: 21,
+        minZoom: 14,
+        maxZoom: 25,
         center: this.baseConfig.center,
         zoom: this.baseConfig.zoom,
         zoomControl: false,
@@ -79,48 +68,147 @@
       map.doubleClickZoom.disable() // 禁止双击
       this.map = map // data挂载map
       window.map = map
-      // 添加底图图层
-      for (let i = 0; i <= 21; i++) {
-        const item = { url: `${this.baseUrl}${this.mapUrl}/${i}` }
-        this.maps.push(esri.featureLayer(item).addTo(map))
+
+      // 加载天地图底图和标注
+      this.baseLayer.push(L.tileLayer(this.baseConfig.mapUrl).addTo(map))
+      this.baseLayer.push(L.tileLayer(this.baseConfig.labelUrl).addTo(map))
+
+      // 构建并加载layerGroup
+      /* eslint-disable new-cap */
+      this.addMapDtLyaer() // 底图
+      this.addGridLayer() // 网格
+      this.addShopLayer() // 商户
+
+      // 部件图层组
+      for (let i = 3; i < 10; i++) {
+        this.addPartsLayer(i)
       }
-      // 添加部件图层
-      const partsLayer = this.baseConfig.partsLayer
-      for (const parent of partsLayer) { // 遍历大类
-        const childs = parent.children
-        for (const child of childs) { // 遍历小类
-          const item = { url: `${this.baseUrl}${this.partsUrl}/${child.layer}`, minZoom: 18 }
-          console.log(item)
-          var layer = esri.featureLayer(item).addTo(map)
-          // 点击部件事件
-          layer.on('click', function(e) {
-            // 获取要素的属性
-            const properties = e.layer.feature.properties
-            // 弹窗样式
-            var str = `<div class="pop-window">
-                        <div class="pop-title">
-                          ${properties['小类名称']}
-                        </div>
-                        <div class="pop-line"><col>大类：</col>${properties['大类名称']}</div>
-                        <div class="pop-line"><col>小类：</col>${properties['小类名称']}</div>
-                        <div class="pop-line"><col>部件编码：</col>${properties['编码']}</div>
-                        <div class="pop-line"><col>权属单位：</col>${properties['权属单位'] ? properties.权属单位 : '未知'}</div>
-                        <div class="pop-line"><col>详细地址：</col>${properties['详细地址'] ? properties.详细地址 : '未知'}</div>
-                      <div>`
-            var popup = L.popup().setContent(str)
-            e.layer.dragging._marker.bindPopup(popup, { minWidth: 200 }).openPopup()
-          })
-          this.parts.push(layer)
-        }
-      }
+
+      // 添加默认显示的图层
+      this.selectLayers.forEach(item => {
+        this.map.addLayer(this.layerGroups[item])
+      })
+    },
+    // 添加底图图层
+    addMapDtLyaer: function() {
+      const mapDtGroup = new L.layerGroup() // 创建layerGroup
+
+      // 创建图层并加载到layerGroup中
+      const item = { url: `${this.baseUrl}${this.mapDtUrl}` }
+      esri.dynamicMapLayer(item).addTo(mapDtGroup)
+
+      this.layerGroups.push(mapDtGroup)
+    },
+    // 添加网格图层
+    addGridLayer: function() {
+      const gridGroup = new L.layerGroup() // 创建layerGroup
+
+      // 创建图层并加载到layerGroup中
+      const item = { url: `${this.baseUrl}${this.gridUrl}` }
+      esri.featureLayer(item).addTo(gridGroup)
+
+      this.layerGroups.push(gridGroup)
+    },
+    // 添加商户图层
+    addShopLayer: function() {
+      const shopGroup = new L.layerGroup() // 创建layerGroup
+
+      // 创建图层并加载到layerGroup中
+      const item = { url: `${this.baseUrl}${this.shopUrl}` }
+      const layer = esri.featureLayer(item).addTo(shopGroup)
+
+      const that = this
+      layer.on('click', function(e) {
+        // 获取要素的属性
+        const properties = e.layer.feature.properties
+
+        // 弹窗样式
+        const popupStr = '<div class="popup-div">' +
+          '<div class="popup-title">商户信息</div>' +
+          '<div class="dashed-line"></div>' +
+          '<div class="popup-item"><label>商户名称</label>' + properties.dutyname + '</div>' +
+          '<div class="popup-item"><label>商户编号</label>' + properties.objid + '</div>' +
+          // '<div class="popup-item"><label>所在社区</label>' + properties.communame + '</div>' +
+          // '<div class="popup-item"><label>所在网格编号</label>' + properties.bgid + '</div>' +
+          '<div class="popup-item"><label>三包责任单位</label>' + properties.deptname + '</div>' +
+          '<div class="popup-item"><label>详细地址</label>' + properties.position_ + '</div>' +
+          '</div>'
+        // 弹出窗口
+        L.popup().setContent(popupStr).setLatLng(e.latlng).openOn(that.map)
+      })
+
+      this.layerGroups.push(shopGroup)
+    },
+    addPartsLayer: function(index) {
+      const that = this
+      const group = new L.layerGroup() // 创建layerGroup
+
+      const domains = this.baseConfig.layers[index].domain
+      const minZoom = this.baseConfig.layers[index].minZoom === undefined ? 18 : this.baseConfig.layers[index].minZoom
+      domains.forEach(dom => {
+        // 创建图层并加载到layerGroup中
+        const item = { url: `${this.baseUrl}${this.partsUrl}/${dom}`, minZoom: minZoom }
+        const layer = esri.featureLayer(item).addTo(group)
+
+        layer.on('click', function(e) {
+          // 获取要素的属性
+          const properties = e.layer.feature.properties
+
+          // 弹窗样式
+          const popupStr = '<div class="popup-div">' +
+            '<div class="popup-title">部件信息</div>' +
+            '<div class="dashed-line"></div>' +
+            '<div class="popup-item"><label>部件类型</label>' + properties.dl + ' / ' + properties.xl + '</div>' +
+            '<div class="popup-item"><label>部件编号</label>' + properties.objid + '</div>' +
+            '<div class="popup-item"><label>所在网格编号</label>' + properties.bgid + '</div>' +
+            '<div class="popup-item"><label>权属部门</label>' + properties.deptname2 + '</div>' +
+            '<div class="popup-item"><label>责任部门</label>' + properties.deptname1 + '</div>' +
+            '<div class="popup-item"><label>养护部门</label>' + properties.deptname3 + '</div>' +
+            '</div>'
+          // 弹出窗口
+          L.popup().setContent(popupStr).setLatLng(e.latlng).openOn(that.map)
+        })
+
+        that.layerGroups.push(group)
+      })
     }
   }
 }
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
   .leaflet_container{
-    width: calc( 100% - 158px );
-    height: 83vh;
+    width: calc( 100vw - 208px );
+    height: calc( 100vh - 158px );
     background-color: white;
   }
 </style>
+
+<style>
+  .leaflet-container a.leaflet-popup-close-button {
+    top: 5px; /* 修改弹窗关闭按钮样式 */
+    right: 10px; /* 修改弹窗关闭按钮样式 */
+  }
+
+  .leaflet-popup-content .popup-div {
+    font-size: 15px;
+    padding: 6px;
+  }
+
+  .leaflet-popup-content .popup-title {
+    font-weight: bold;
+  }
+
+  .leaflet-popup-content .dashed-line {
+    border-bottom: 1px dashed #dddddd;
+    margin: 10px -10px;
+  }
+
+  .leaflet-popup-content .popup-item {
+    padding-bottom: 6px;
+  }
+
+  .leaflet-popup-content .popup-item label {
+    font-weight: bold;
+    padding-right: 15px;
+  }
+</style>
diff --git a/src/views/supControl/supControl.vue b/src/views/supControl/supControl.vue
index 490ec1c..b6c153f 100644
--- a/src/views/supControl/supControl.vue
+++ b/src/views/supControl/supControl.vue
@@ -607,7 +607,7 @@
     // 初始化地图
     initMap: function() {
       const map = Leaflet.map(this.$refs.mapDiv, {
-        minZoom: 4,
+        minZoom: 14,
         maxZoom: 25,
         center: this.baseConfig.center,
         zoom: this.baseConfig.zoom,
@@ -615,18 +615,13 @@
         attributionControl: false,
         crs: Leaflet.CRS.EPSG3857
       })
+      map.doubleClickZoom.disable() // 禁止双击
       this.map = map // data上需要挂载
       window.map = map
 
       // 加载天地图底图和标注
-      this.baseLayer.push(Leaflet.tileLayer(
-        this.baseConfig.mapUrl,
-        { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
-      ).addTo(map))
-      this.baseLayer.push(Leaflet.tileLayer(
-        this.baseConfig.labelUrl,
-        { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
-      ).addTo(map))
+      this.baseLayer.push(Leaflet.tileLayer(this.baseConfig.mapUrl).addTo(map))
+      this.baseLayer.push(Leaflet.tileLayer(this.baseConfig.labelUrl).addTo(map))
 
       // 加载部件分层的图层
       const bjfcLayer = esri.dynamicMapLayer({

diff --git a/src/assets/icons/icon-poi.png b/src/assets/icons/icon-poi.png
new file mode 100644
index 0000000..364f2f6
--- /dev/null
+++ b/src/assets/icons/icon-poi.png
Binary files differ
diff --git a/src/components/Map/leafletMap.vue b/src/components/Map/leafletMap.vue
index c8b0b6f..e1150e9 100644
--- a/src/components/Map/leafletMap.vue
+++ b/src/components/Map/leafletMap.vue
@@ -1,25 +1,21 @@
 <template>
-  <div style="margin-top: -10px">
+  <div style="margin-top: -30px; margin-bottom: -10px;">
     <el-row :gutter="20">
-      <div v-show="showpoi">
-        <el-col :span="3">
-          <el-input v-model="keywords" size="small" type="text" placeholder="兴趣点关键字" clearable />
-        </el-col>
-        <el-col :span="5">
-          <el-button type="primary" size="small" @click="queryOnMap">查询</el-button>
-          <el-button type="info" size="small" @click="clearMap"> 清除地图 </el-button>
-        </el-col>
-      </div>
+      <el-col v-show="showpoi" :span="8">
+        <el-input v-model="keywords" size="small" type="text" placeholder="兴趣点关键字" clearable style="width: 50%" />
+        <el-button type="primary" size="small" @click="queryOnMap">查询</el-button>
+        <el-button type="info" size="small" @click="clearMap"> 清除地图 </el-button>
+      </el-col>
 
-      <el-col :span="6" :offset="8" style="text-align: right;">
+      <el-col :span="8" style="text-align: right">
         <el-radio-group v-model="queryEventSwitch" size="small" @change="switchEventOrComponent">
           <el-radio-button label="1">事件定位</el-radio-button>
           <el-radio-button label="0">部件定位</el-radio-button>
-          <el-radio-button v-show="showpoi" label="2">兴趣点属性</el-radio-button>
+          <!--          <el-radio-button v-show="showpoi" label="2">兴趣点属性</el-radio-button>-->
         </el-radio-group>
       </el-col>
 
-      <el-col v-if="queryEventSwitch === '0'" :span="10" :offset="0" style="text-align: right;">
+      <el-col v-if="queryEventSwitch === '0'" :span="8" style="text-align: right;">
         <el-select v-model="form.componentId" placeholder="选择部件" clearable value="" size="small">
           <el-option
             v-for="item in compListOpts"
@@ -30,7 +26,7 @@
         <el-button type="primary" size="small" @click="checkComponentPoint"> 部件提交 </el-button>
       </el-col>
 
-      <el-col v-if="queryEventSwitch === '1'" :span="10" :offset="0" style="text-align: right;">
+      <el-col v-if="queryEventSwitch === '1'" :span="8" :offset="0" style="text-align: right;">
         <el-button type="primary" size="small" @click="checkEventPoint"> 事件提交 </el-button>
       </el-col>
     </el-row>
@@ -42,18 +38,40 @@
 <script>
 import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import { mapConfig, serverConfig } from './ArcGISConfig'
+import { mapGetters } from 'vuex'
+import { merchantListPage } from '@/api/geoCoding/geoCoding'
+
 const esri = require('esri-leaflet')
 
+const icon = L.icon({
+  iconUrl: require('@/assets/icons/icon-position.png'),
+  iconSize: [32, 32],
+  iconAnchor: [16, 32],
+  popupAnchor: [0, -32]
+})
+
+const poiIcon = L.icon({
+  iconUrl: require('@/assets/icons/icon-poi.png'),
+  iconSize: [16, 16],
+  iconAnchor: [8, 16],
+  popupAnchor: [0, -16]
+})
+
+const deltaLng10 = 0.00002536 // 10米范围经度值偏移量（大约）
+const deltaLat10 = 0.00002256 // 10米范围纬度值偏移量（大约）
+
 export default {
   name: 'LeafletMap',
   data() {
     return {
       map: null,
-      markers: [],
+      baseLayer: [],
+      markers: [], // 选点
+      pois: [], // 兴趣点结果
       layers: {
         bjPoint: '', // 部件点图层
-        grid: '' // 单元网格图层
+        grid: '', // 单元网格图层
+        shopPoint: '' // 商铺图层
       },
       form: {
         longitude: '', // 定位点经度
@@ -64,23 +82,33 @@
         componentId: '', // 部件ID
         componentName: '' // 部件名称
       }, // 主页面返回值
-      showpoi: false,
+      showpoi: true,
       keywords: '', // 查询关键字
+      limit: 100, // 兴趣点查询的最大结果数
       showEventPointPopup: true, // 是否显示事部件的popup
       queryEventSwitch: '1', // 1==查询事件；0==查询部件
       compListOpts: [] // 部件选择下拉框option
     }
   },
+  computed: {
+    ...mapGetters([
+      'baseUrl',
+      'partsUrl',
+      'mapUrl',
+      'gridUrl',
+      'partsAllUrl'
+    ])
+  },
   mounted() {
     this.initMap()
   },
   methods: {
     initMap() {
-      const map = L.map('map', {
-        minZoom: 13,
-        // maxZoom: 18,
-        center: [27.755, 116.08],
-        zoom: 16,
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: 14,
+        maxZoom: 25,
+        center: this.baseConfig.center,
+        zoom: this.baseConfig.zoom,
         zoomControl: false,
         attributionControl: false,
         crs: L.CRS.EPSG3857
@@ -89,135 +117,181 @@
       this.map = map // data上需要挂载
       window.map = map
 
-      esri.dynamicMapLayer({
-        url: serverConfig.mapUrlBase
-      }).addTo(map)
-
+      // 加载图层
       this.addLayers()
 
       const that = this
       map.on('click', function(e) {
-
-        console.log('e', e)
-        console.log('e.latlng', e.latlng)
-        console.log('queryEventSwitch', that.queryEventSwitch)
         that.clearPoints()
 
         // 加载定位点
         if (that.showEventPointPopup) {
-          const icon = L.icon({
-            iconUrl: require('../../assets/icons/icon-position.png'),
-            iconSize: [35, 35]
-          })
           const pos = L.marker(e.latlng, {
             icon: icon
           })
           that.markers.push(pos)
           that.map.addLayer(pos)
 
-          // 查询事件或者部件
-          if (that.queryEventSwitch === '1') {
-            // 事件定位
-            // 1查询底图得到所在网格与所在社区
-            const query = that.layers.grid.query()
-            query.nearby(e.latlng, 10)
-            query.run(function(error, featureCollection, response) {
-              if (error) {
-                console.log(error)
-                return
-              }
-              const result = featureCollection.features[0].properties
-              // 赋值
-              that.form.longitude = e.latlng.lng
-              that.form.latitude = e.latlng.lat
-              that.form.gridId = result.CommuId
-              that.form.communityId = result.CommuId
-              that.form.communityName = result.CommuName
-
-              pos.bindPopup('坐标：[' + that.form.longitude.toFixed(4) + ', ' + that.form.latitude.toFixed(4) + ']' + '<p>' + '所在社区：' + result.CommuName).openPopup()
-            })
-          } else if (that.queryEventSwitch === '0') {
-            var latlngs = []
-            var p1 = that.getLonAndLat(e.latlng.lng, e.latlng.lat, 0, 2.5)
-            latlngs.push([p1.lat, p1.lon])
-            var p2 = that.getLonAndLat(e.latlng.lng, e.latlng.lat, 90, 2.5)
-            latlngs.push([p2.lat, p2.lon])
-            var p3 = that.getLonAndLat(e.latlng.lng, e.latlng.lat, 180, 2.5)
-            latlngs.push([p3.lat, p3.lon])
-            var p4 = that.getLonAndLat(e.latlng.lng, e.latlng.lat, 270, 2.5)
-            latlngs.push([p4.lat, p4.lon])
-
-            var polyline = L.polygon(latlngs)
-            const bjQuery = that.layers.bjPoint.query()
-            bjQuery.within(polyline)
-            bjQuery.run(function(error, featureCollection, response) {
-              if (error) {
-                console.log(error)
-                return
-              }
-              if (featureCollection.features.length > 0) {
-                const result = featureCollection.features
-                console.log(result)
-                // 赋值
-                that.compListOpts = []
-                let content = ''
-                result.forEach((item, index) => {
-                  content += '<p>部件' + (index + 1) + '：' + item.properties.大类名称 + '-' + item.properties.小类名称 + '-' + item.properties.编码
-                  const comp = {}
-                  comp.name = '部件' + (index + 1) + '：' + item.properties.大类名称 + '-' + item.properties.小类名称 + '-' + item.properties.编码
-                  comp.value = item.properties.编码
-                  that.compListOpts.push(comp)
-                })
-
-                pos.bindPopup('坐标：[' + e.latlng.lng.toFixed(4) + ', ' + e.latlng.lat.toFixed(4) + ']，附近5米的部件有：' + content).openPopup()
-
-                const query = that.layers.grid.query()
-                query.nearby(e.latlng, 10)
-                query.run(function(error, featureCollection, response) {
-                  if (error) {
-                    console.log(error)
-                    return
-                  }
-                  const result = featureCollection.features[0].properties
-                  // 赋值
-                  that.form.longitude = e.latlng.lng
-                  that.form.latitude = e.latlng.lat
-                  that.form.gridId = result.CommuId
-                  that.form.communityId = result.CommuId
-                  that.form.communityName = result.CommuName
-                })
-              } else {
-                that.$message({
-                  message: '没有查询到部件，请重新定位',
-                  type: 'warning'
-                })
-              }
-            }
-            )
+          // 飞到定位点
+          let zoom = that.map.getZoom()
+          if (zoom < 18) {
+            zoom = 18
           }
+          that.map.flyTo(e.latlng, zoom)
+
+          // 查询所点的网格
+          const query = that.layers.grid.query()
+          query.nearby(e.latlng, 10)
+          query.run(function(error, featureCollection, response) {
+            if (error) {
+              console.log(error)
+              return
+            }
+            const result = featureCollection.features[0].properties
+            // 赋值
+            that.form.longitude = e.latlng.lng
+            that.form.latitude = e.latlng.lat
+            that.form.gridId = result.GBID
+            that.form.communityId = result.GBID.substring(0, 12)
+            that.form.communityName = result.Note
+
+            if (that.queryEventSwitch === '1') {
+              // 事件定位
+              // 弹出事件点位信息
+              const popupStr = '<div class="popup-div">' +
+                '<div class="popup-title">事件点</div>' +
+                '<div class="dashed-line"></div>' +
+                '<div class="popup-item"><label>坐标</label>' + that.form.longitude.toFixed(4) + ', ' + that.form.latitude.toFixed(4) + '</div>' +
+                '<div class="popup-item"><label>所在社区</label>' + that.form.communityName + '</div>' +
+                '<div class="popup-item"><label>网格编号</label>' + that.form.gridId + '</div>' +
+                '</div>'
+
+              pos.bindPopup(popupStr).openPopup()
+            } else if (that.queryEventSwitch === '0') {
+              // 部件定位
+              // 1构建部件查询多边形，上下左右四个点
+              const latlngs = []
+              const p1 = [e.latlng.lat + deltaLat10, e.latlng.lng] // 上方点
+              const p2 = [e.latlng.lat, e.latlng.lng + deltaLng10] // 右侧点
+              const p3 = [e.latlng.lat - deltaLat10, e.latlng.lng] // 下方点
+              const p4 = [e.latlng.lat, e.latlng.lng - deltaLng10] // 左侧点
+              latlngs.push(p1)
+              latlngs.push(p2)
+              latlngs.push(p3)
+              latlngs.push(p4)
+
+              const polyline = L.polygon(latlngs)
+              const bjQuery = that.layers.bjPoint.query()
+              bjQuery.within(polyline)
+              bjQuery.run(function(error, featureCollection, response) {
+                if (error) {
+                  console.log(error)
+                  return
+                }
+
+                // 查询到结果
+                if (featureCollection.features.length > 0) {
+                  const result = featureCollection.features
+                  // 赋值
+                  that.compListOpts = []
+
+                  // 构建弹出窗口信息
+                  let popupStr = '<div class="popup-div">' +
+                    '<div class="popup-title">部件</div>' +
+                    '<div class="dashed-line"></div>' +
+                    '<div class="popup-item">坐标[' + e.latlng.lng.toFixed(4) + ', ' + e.latlng.lat.toFixed(4) + ']附近的部件有</div>' +
+                    '<div class="popup-item"><label>所在社区</label>' + that.form.communityName + '</div>' +
+                    '<div class="popup-item"><label>网格编号</label>' + that.form.gridId + '</div>'
+
+                  result.forEach((item, index) => {
+                    popupStr += '<div class="popup-subitem"><label style="padding-right: 5px;">部件' + (index + 1) + '</label>' + item.properties.dl + '/' + item.properties.xl + '[' + item.properties.objid + ']</div>'
+                    const comp = {}
+                    comp.name = '部件' + (index + 1) + '：' + item.properties.dl + '/' + item.properties.xl + '[' + item.properties.objid + ']'
+                    comp.value = item.properties.objid
+                    that.compListOpts.push(comp)
+                  })
+
+                  popupStr += '</div>'
+                  pos.bindPopup(popupStr).openPopup()
+                } else {
+                  that.$message({ message: '没有查询到部件，请重新定位', type: 'warning' })
+                }
+              })
+            }
+          })
         }
       })
     },
     addLayers() {
+      // 加载天地图底图和标注
+      this.baseLayer.push(L.tileLayer(this.baseConfig.mapUrl).addTo(this.map))
+      this.baseLayer.push(L.tileLayer(this.baseConfig.labelUrl).addTo(this.map))
+
+      // 加载底图
+      esri.dynamicMapLayer({
+        url: `${this.baseUrl}${this.mapUrl}`,
+        zIndex: 1
+      }).addTo(this.map)
+
+      // 初始化部件图层（不分层），待切换到部件定位时加载
       this.layers.bjPoint = esri.featureLayer({
-        url: serverConfig.mapUrlBj + '/0'
+        url: `${this.baseUrl}${this.partsAllUrl}`,
+        minZoom: 19
       })
-      this.layers.grid = esri.featureLayer({
-        url: serverConfig.mapUrlBase + '/16'
-      })
-      this.map.addLayer(this.layers.bjPoint)
-      this.map.addLayer(this.layers.grid)
     },
     switchEventOrComponent: function() {
       // 如果选中的是事件定位（1）或部件定位（0），点击地图时弹出事件或者部件的popup；否则（2以上）显示兴趣点结果的属性popup
       this.showEventPointPopup = this.queryEventSwitch < 2
       this.clearPoints()
+
+      if (this.queryEventSwitch === '0') {
+        // 加载和显示部件图层
+        this.map.addLayer(this.layers.bjPoint)
+        // 清空部件选择的列表
+        this.compListOpts = []
+      } else {
+        this.map.removeLayer(this.layers.bjPoint)
+      }
     },
     clearPoints() {
       const that = this
       this.markers.forEach(marker => {
         that.map.removeLayer(marker)
       })
+      this.pois.forEach(marker => {
+        that.map.removeLayer(marker)
+      })
+    },
+    queryOnMap: function() {
+      const that = this
+      merchantListPage({
+        keyword: this.keywords,
+        limit: this.limit
+      }).then(response => {
+        if (response.code === 200) {
+          console.log(response)
+          this.clearMap()
+          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 {
+            data.rows.forEach(item => {
+              const popupStr = '<div class="popup-div">' +
+                '<div class="popup-title">兴趣点</div>' +
+                '<div class="dashed-line"></div>' +
+                '<div class="popup-item"><label>名称</label>' + item.merchantName + '</div>' +
+                '<div class="popup-item"><label>详细地址</label>' + item.address + '</div>' +
+                '</div>'
+              const poi = L.marker([item.pointY, item.pointX], { icon: poiIcon })
+              poi.bindPopup(popupStr).openPopup()
+              that.pois.push(poi)
+              that.map.addLayer(poi)
+            })
+          }
+        }
+      })
     },
     // 返回事件定位的结果
     checkEventPoint: function() {
@@ -258,72 +332,52 @@
       this.form.gridId = '' // 单元网格ID
       this.form.componentId = '' // 部件ID
       this.form.componentName = '' // 部件名称
-    },
-    numberToRadius(t) {
-      return (t * Math.PI) / 180
-    },
-    numberToDegree(t) {
-      return (180 * t) / Math.PI
-    },
-    /**
-     * 根据一个经纬度及距离角度，算出另外一个经纬度
-     * @param {*} lon 经度 113.3960698
-     * @param {*} lat 纬度 22.941386
-     * @param {*} brng 方位角 45 ---- 正北方：000°或360° 正东方：090° 正南方：180° 正西方：270°
-     * @param {*} dist 90000距离(米)
-     */
-    getLonAndLat(lon, lat, brng, dist) {
-      // 大地坐标系资料WGS-84 长半径a=6378137 短半径b=6356752.3142 扁率f=1/298.2572236
-      var a = 6378137
-      var b = 6356752.3142
-      var f = 1 / 298.257223563
-      var lon1 = lon * 1
-      var lat1 = lat * 1
-      var s = dist
-      var alpha1 = this.numberToRadius(brng)
-      var sinAlpha1 = Math.sin(alpha1)
-      var cosAlpha1 = Math.cos(alpha1)
-      var tanU1 = (1 - f) * Math.tan(this.numberToRadius(lat1))
-      var cosU1 = 1 / Math.sqrt((1 + tanU1 * tanU1)), sinU1 = tanU1 * cosU1
-      var sigma1 = Math.atan2(tanU1, cosAlpha1)
-      var sinAlpha = cosU1 * sinAlpha1
-      var cosSqAlpha = 1 - sinAlpha * sinAlpha
-      var uSq = cosSqAlpha * (a * a - b * b) / (b * b)
-      var A = 1 + uSq / 16384 * (4096 + uSq * (-768 + uSq * (320 - 175 * uSq)))
-      var B = uSq / 1024 * (256 + uSq * (-128 + uSq * (74 - 47 * uSq)))
-      var sigma = s / (b * A), sigmaP = 2 * Math.PI
-      while (Math.abs(sigma - sigmaP) > 1e-12) {
-        var cos2SigmaM = Math.cos(2 * sigma1 + sigma)
-        var sinSigma = Math.sin(sigma)
-        var cosSigma = Math.cos(sigma)
-        var deltaSigma = B * sinSigma * (cos2SigmaM + B / 4 * (cosSigma * (-1 + 2 * cos2SigmaM * cos2SigmaM) -
-          B / 6 * cos2SigmaM * (-3 + 4 * sinSigma * sinSigma) * (-3 + 4 * cos2SigmaM * cos2SigmaM)))
-        sigmaP = sigma
-        sigma = s / (b * A) + deltaSigma
-      }
-      var tmp = sinU1 * sinSigma - cosU1 * cosSigma * cosAlpha1
-      var lat2 = Math.atan2(sinU1 * cosSigma + cosU1 * sinSigma * cosAlpha1, (1 - f) * Math.sqrt(sinAlpha * sinAlpha + tmp * tmp))
-      var lambda = Math.atan2(sinSigma * sinAlpha1, cosU1 * cosSigma - sinU1 * sinSigma * cosAlpha1)
-      var C = f / 16 * cosSqAlpha * (4 + f * (4 - 3 * cosSqAlpha))
-      var L = lambda - (1 - C) * f * sinAlpha * (sigma + C * sinSigma * (cos2SigmaM + C * cosSigma * (-1 + 2 * cos2SigmaM * cos2SigmaM)))
-      var revAz = Math.atan2(sinAlpha, -tmp) // final bearing
-      var lonLatObj = { lon: lon1 + this.numberToDegree(L), lat: this.numberToDegree(lat2) }
-      return lonLatObj
     }
   }
 }
 </script>
 
 <style scoped>
-  @import 'https://js.arcgis.com/4.13/esri/css/main.css';
   .baseMap {
-    height:60vh;
+    height: 65vh;
     width: 100%;
-    margin-top: 25px;
+    margin-top: 10px;
     border: 1px solid #DCDCDC;
     border-radius: 4px;
   }
-  .leaflet-container {
-    background: #fff0;
+</style>
+
+<style>
+  .leaflet-container a.leaflet-popup-close-button {
+    top: 5px; /* 修改弹窗关闭按钮样式 */
+    right: 10px; /* 修改弹窗关闭按钮样式 */
+  }
+
+  .leaflet-popup-content .popup-div {
+    font-size: 15px;
+    padding: 6px;
+  }
+
+  .leaflet-popup-content .popup-title {
+    font-weight: bold;
+  }
+
+  .leaflet-popup-content .dashed-line {
+    border-bottom: 1px dashed #dddddd;
+    margin: 10px -10px;
+  }
+
+  .leaflet-popup-content .popup-item {
+    padding-bottom: 6px;
+  }
+
+  .leaflet-popup-content .popup-item label {
+    font-weight: bold;
+    padding-right: 15px;
+  }
+
+  .leaflet-popup-content .popup-subitem {
+    padding-bottom: 6px;
+    font-size: 12px;
   }
 </style>
diff --git a/src/components/Map/leafletMapRead.vue b/src/components/Map/leafletMapRead.vue
index dd22198..edcd37d 100644
--- a/src/components/Map/leafletMapRead.vue
+++ b/src/components/Map/leafletMapRead.vue
@@ -7,7 +7,7 @@
 <script>
 import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import { mapConfig, serverConfig } from './ArcGISConfig'
+import { mapGetters } from 'vuex'
 const esri = require('esri-leaflet')
 export default {
   name: 'LeafletMapRead',
@@ -23,10 +23,20 @@
   },
   data() {
     return {
+      baseLayer: [],
       mapLoading: false,
       map: null
     }
   },
+  computed: {
+    ...mapGetters([
+      'baseUrl',
+      'partsUrl',
+      'mapUrl',
+      'gridUrl',
+      'partsAllUrl'
+    ])
+  },
   mounted() {
     this.initMap()
     this.addMarker()
@@ -36,9 +46,9 @@
       this.mapLoading = true
       const map = L.map('map', {
         minZoom: 13,
-        // maxZoom: 18,
-        center: [27.755, 116.08],
-        zoom: 16,
+        maxZoom: 24,
+        center: this.baseConfig.center,
+        zoom: this.baseConfig.zoom,
         zoomControl: false,
         attributionControl: false,
         crs: L.CRS.EPSG3857
@@ -47,45 +57,30 @@
       this.map = map // data上需要挂载
       window.map = map
 
+      // 加载天地图底图和标注
+      this.baseLayer.push(L.tileLayer(this.baseConfig.mapUrl).addTo(map))
+      this.baseLayer.push(L.tileLayer(this.baseConfig.labelUrl).addTo(map))
+
       esri.dynamicMapLayer({
-        url: serverConfig.mapUrlBase,
+        url: `${this.baseUrl}${this.mapUrl}`,
         opacity: 1,
         f: 'image'
       }).addTo(map)
 
-      // esri.tiledMapLayer({
-      //   url: serverConfig.mapUrlBase,
-      //   maxZoom: 15,
-      //   f: 'image'
-      // }).addTo(map)
-
-      // for (let i = 0; i < 24; i++) {
-      //   esri.featureLayer({
-      //     url: serverConfig.mapUrlBase + '/' + i
-      //     // minZoom: 4, // 最小缩放等级
-      //     // maxZoom: 21// 最大缩放等级
-      //   }).addTo(map)
-      // }
-
-      esri.featureLayer({
-        url: serverConfig.mapUrlBj + '/0'
-      }).addTo(map)
-      esri.featureLayer({
-        url: serverConfig.mapUrlBase + '/16'
-      }).addTo(map)
       this.mapLoading = false
     },
 
     addMarker() {
       const icon = L.icon({
-        iconUrl: require('../../assets/icons/icon-position.png'),
-        iconSize: [35, 35],
-        iconAnchor: [17.5, 35]
+        iconUrl: require('@/assets/icons/icon-position.png'),
+        iconSize: [32, 32],
+        iconAnchor: [16, 32],
+        popupAnchor: [0, -32]
       })
       const latlng = L.latLng([this.latitude, this.longitude])
       const feat = L.marker(latlng, { icon: icon })
       feat.addTo(this.map)
-      this.map.setView({ lat: this.latitude, lng: this.longitude }, 16)
+      this.map.setView({ lat: this.latitude, lng: this.longitude }, 18)
     }
   }
 }
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 2f77b38..134cb1e 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -31,12 +31,12 @@
         name: 'TimeLimit',
         meta: { title: '阶段时限', icon: '', permission: ['/timeLimit'] }
       },
-      {
-        path: '/caseList',
-        component: () => import('@/views/seo/seo'),
-        name: 'CaseList',
-        meta: { title: '综合查询', icon: '', permission: ['/caseList'] }
-      },
+      // {
+      //   path: '/caseList',
+      //   component: () => import('@/views/seo/seo'),
+      //   name: 'CaseList',
+      //   meta: { title: '综合查询', icon: '', permission: ['/caseList'] }
+      // },
       {
         path: '/caseType',
         component: () => import('@/views/busAdmin/caseType/listCaseType.vue'),
diff --git a/src/store/getters.js b/src/store/getters.js
index 57e8aac..d28b64f 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -30,7 +30,10 @@
   partsUrl: state => state.map.partsUrl, // 部件分层地址
   partsEditUrl: state => state.map.partsEditUrl, // 部件分层地址
   partsAllUrl: state => state.map.partsAllUrl, // 部件不分层地址
+  shopUrl: state => state.map.shopUrl, // 部件不分层地址
   mapUrl: state => state.map.mapUrl, // 底图地址
+  mapDtUrl: state => state.map.mapDtUrl, // 无网格底图地址
+  gridUrl: state => state.map.gridUrl, // 网格图层
   editUrl: state => state.map.editUrl // 编辑地图地址
 }
 export default getters
diff --git a/src/store/modules/map.js b/src/store/modules/map.js
index aa2c6f8..13f5313 100644
--- a/src/store/modules/map.js
+++ b/src/store/modules/map.js
@@ -5,7 +5,10 @@
   baseUrl: '', // 服务基础地址
   partsUrl: '', // 部件分层地址
   partsAllUrl: '', // 部件不分层地址
+  shopUrl: '', // 商户图层
   mapUrl: '', // 二维底图地址
+  mapDtUrl: '', // 无网格地图
+  gridUrl: '', // 网格图层
   editUrl: '' // 编辑地图URL
 }
 const mutations = {
@@ -24,9 +27,18 @@
   SET_PARTS_ALL_URL: (state, url) => {
     state.partsAllUrl = url
   },
+  SET_SHOP_URL: (state, url) => {
+    state.shopUrl = url
+  },
   SET_MAP_URL: (state, url) => {
     state.mapUrl = url
   },
+  SET_MAPDT_URL: (state, url) => {
+    state.mapDtUrl = url
+  },
+  SET_GRID_URL: (state, url) => {
+    state.gridUrl = url
+  },
   SET_EDIT_URL: (state, url) => {
     state.editUrl = url
   }
@@ -52,8 +64,14 @@
               commit('SET_PARTS_EDIT_URL', editUrl)
             } else if (item.name === '部件地图URL') {
               commit('SET_PARTS_ALL_URL', item.url)
+            } else if (item.name === '商户图层URL') {
+              commit('SET_SHOP_URL', item.url)
             } else if (item.name === '二维地图URL') {
               commit('SET_MAP_URL', item.url)
+            } else if (item.name === '无网格地图URL') {
+              commit('SET_MAPDT_URL', item.url)
+            } else if (item.name === '网格图层URL') {
+              commit('SET_GRID_URL', item.url)
             } else if (item.name === '编辑地图URL') {
               commit('SET_EDIT_URL', item.url)
             }
diff --git a/src/views/assessPost/receiverAccessChart.vue b/src/views/assessPost/receiverAccessChart.vue
index 6cc18f8..4e3523d 100644
--- a/src/views/assessPost/receiverAccessChart.vue
+++ b/src/views/assessPost/receiverAccessChart.vue
@@ -97,7 +97,8 @@
         xAxis: {
           data: this.x,
           axisLabel: {
-            fontSize: 14
+            fontSize: 14,
+            interval: 0
           }
         },
         yAxis: {
@@ -115,6 +116,18 @@
           tooltip: {
             position: 'right'
           }
+        }],
+        dataZoom: [{
+          type: 'slider',
+          show: true,
+          start: 0,
+          end: 50,
+          handleSize: 8
+        },
+        {
+          type: 'inside',
+          start: 0,
+          end: 50
         }]
       })
       this.chart.resize()
diff --git a/src/views/assessRegion/accessAreaChart.vue b/src/views/assessRegion/accessAreaChart.vue
index 3424aec..9745b4a 100644
--- a/src/views/assessRegion/accessAreaChart.vue
+++ b/src/views/assessRegion/accessAreaChart.vue
@@ -107,6 +107,18 @@
           tooltip: {
             position: 'right'
           }
+        }],
+        dataZoom: [{
+          type: 'slider',
+          show: true,
+          start: 0,
+          end: 50,
+          handleSize: 8
+        },
+        {
+          type: 'inside',
+          start: 0,
+          end: 50
         }]
       })
       this.chart.resize()
diff --git a/src/views/baseSource/components/layerChoose.vue b/src/views/baseSource/components/layerChoose.vue
index c98e787..2cd75c8 100644
--- a/src/views/baseSource/components/layerChoose.vue
+++ b/src/views/baseSource/components/layerChoose.vue
@@ -13,11 +13,13 @@
     <el-collapse-transition>
       <div v-show="cardShow" class="layers-card">
         <el-tree
+          ref="layerTree"
           :data="layers"
           :default-checked-keys="selectLayers"
           :props="treeProps"
           show-checkbox
           node-key="id"
+          @check="nodeCheck"
           @check-change="checkChange"/>
       </div>
     </el-collapse-transition>
@@ -65,6 +67,9 @@
     }
   },
   methods: {
+    nodeCheck(node, checked) {
+      this.$emit('check', node, checked)
+    },
     checkChange(node, checked) {
       this.$emit('choose', node, checked)
     }
diff --git a/src/views/baseSource/components/searchItem.vue b/src/views/baseSource/components/searchItem.vue
index a0c73f3..e2d52ab 100644
--- a/src/views/baseSource/components/searchItem.vue
+++ b/src/views/baseSource/components/searchItem.vue
@@ -10,9 +10,9 @@
       <img src="@/assets/global_images/point.png" class="item-icon">
     </div>
     <div class="list-item-right">
-      <div class="list-item-right-row"><div>名称：</div><div :title="data.feature.properties.小类名称" class="content">{{ data.feature.properties.小类名称 }}</div></div>
-      <div class="list-item-right-row"><div>编码：</div><div :title="data.feature.properties.编码" class="content">{{ data.feature.properties.编码 }}</div></div>
-      <div class="list-item-right-row"><div>地址：</div><div :title="data.feature.properties.编码" class="content">{{ data.feature.properties.编码 }}</div></div>
+      <div class="list-item-right-row"><div>名称：</div><div :title="data.name" class="content">{{ data.name }}</div></div>
+      <div class="list-item-right-row"><div>编码：</div><div :title="data.code" class="content">{{ data.code }}</div></div>
+      <div class="list-item-right-row"><div>{{ data.content.title }}：</div><div :title="data.content" class="content">{{ data.content.text }}</div></div>
     </div>
   </div>
 </template>
@@ -30,14 +30,9 @@
       required: true
     } // 数据
   },
-  // mounted() {
-  //   debugger
-  //   console.log(this.data.feature)
-  // },
   methods: {
     // 点击数据项
     itemClick() {
-      console.log('点击item')
       this.$emit('click', this.data)
     }
   }
diff --git a/src/views/baseSource/mapSearch.vue b/src/views/baseSource/mapSearch.vue
index 71147d8..5ae0c05 100644
--- a/src/views/baseSource/mapSearch.vue
+++ b/src/views/baseSource/mapSearch.vue
@@ -17,7 +17,7 @@
         <!--重置工具-->
         <clear-tool :disabled="clearDisabled" @click="drawDelete"/>
         <!--图层选择工具-->
-        <layer-choose :layers="layers" :select-layers="selectLayers" @choose="layerChange"/>
+        <layer-choose ref="layerRadio" :layers="layers" :select-layers="selectLayers" @check="layerChange"/>
       </tools-container>
       <!--图层选择组件-->
     </div>
@@ -45,10 +45,15 @@
       drawLayer: null, // 绘制图层（框选）
       bounds: null, // 查询区域
       clearDisabled: true, // 禁用重置按钮
-      layers: this.baseConfig.layers, // 所有图层
-      selectLayers: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], // 选中图层
+      baseLayer: [],
+      layers: [
+        { 'id': 0, 'name': '商户', 'type': 'layer', 'domain': [35] },
+        { 'id': 1, 'name': '部件', 'type': 'layer', 'domain': [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 15, 16, 18, 19, 20, 21, 22, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45] }
+      ],
+      selectLayers: [0], // 选中图层
       maps: [], // 地图图层
       parts: [], // 部件图层
+      layerGroups: [], // 图层组，用于控制一组内容显示或者隐藏
       searchList: [], // 全部查询结果
       featureCollection: [], // 选中的图层和Feature
       featureCollectionLength: 0, // 选中的feature个数
@@ -60,9 +65,8 @@
     ...mapGetters([
       'baseUrl',
       'partsUrl',
-      'partsAllUrl',
-      'mapUrl',
-      'partsEditUrl'
+      'shopUrl',
+      'mapUrl'
     ])
   },
   destroyed() {
@@ -89,18 +93,17 @@
       } // 其他不予处理
       this.searchLoading = true
       const results = [] // 存放查询结果列表
-      // 遍历所有图层进行查询
-      const partsLength = this.parts.length // 全部部件图层数量
-      for (let i = 0; i < partsLength; i++) {
-        const part = this.parts[i]
-        var str = ['编码', '小类名称', '大类名称']
-        var query = esri.query({ url: part.options.url })
+
+      // 获取是查询部件还是查询商户
+      if (this.selectLayers.toString() === '0') {
+        // 查询商户
+        const str = ['objid', 'dutyname', 'position_'] // 查询条件属性
+        const query = esri.query({ url: `${this.baseUrl}${this.shopUrl}` })
         let queryString = '1=1' // 默认查询语句
         // 如果有关键字
         if (this.keyword) {
           // 拼接查询语句
           queryString = str.map(item => `(${item} like '%${this.keyword}%')`).join(' OR ')
-          console.log(queryString)
         } else {
           return
         }
@@ -119,18 +122,98 @@
           if (featuresLength > 0) {
             // 遍历所有查询结果，放入results
             for (const feature of featureCollection.features) {
+              const popupStr = '<div class="popup-div">' +
+                '<div class="popup-title">商户信息</div>' +
+                '<div class="dashed-line"></div>' +
+                '<div class="popup-item"><label>商户名称</label>' + feature.properties.dutyname + '</div>' +
+                '<div class="popup-item"><label>商户编号</label>' + feature.properties.objid + '</div>' +
+                // '<div class="popup-item"><label>所在社区</label>' + feature.properties.communame + '</div>' +
+                // '<div class="popup-item"><label>所在网格编号</label>' + feature.properties.bgid + '</div>' +
+                '<div class="popup-item"><label>三包责任单位</label>' + feature.properties.deptname + '</div>' +
+                '<div class="popup-item"><label>详细地址</label>' + feature.properties.position_ + '</div>' +
+                '</div>'
+
               results.push({
-                layer: part,
-                feature: feature
+                name: feature.properties.dutyname,
+                code: feature.properties.objid,
+                content: {
+                  title: '地址',
+                  text: feature.properties.position_
+                },
+                lng: feature.properties.x,
+                lat: feature.properties.y,
+                popupStr: popupStr
               })
             }
           }
-          // 如果是最后一个图层
-          if (i === (partsLength - 1)) {
-            this.searchList = results
-            this.searchLoading = false
-          }
+
+          this.searchList = results
+          this.searchLoading = false
         })
+      } else if (this.selectLayers.toString() === '1') {
+        // 查询部件
+        // 遍历所有图层进行查询
+        const partsLength = this.parts.length // 全部部件图层数量
+        for (let i = 0; i < partsLength; i++) {
+          const part = this.parts[i]
+          const str = ['objid', 'xl', 'dl']
+          const query = esri.query({ url: part.url })
+          let queryString = '1=1' // 默认查询语句
+          // 如果有关键字
+          if (this.keyword) {
+            // 拼接查询语句
+            queryString = str.map(item => `(${item} like '%${this.keyword}%')`).join(' OR ')
+          } else {
+            return
+          }
+          query.where(queryString)
+          // 如果有查询边界
+          if (this.bounds) {
+            query.within(this.bounds)
+          }
+          // 执行查询
+          query.run((error, featureCollection, response) => {
+            if (error) {
+              console.log(error)
+              return
+            }
+            const featuresLength = featureCollection.features.length
+            if (featuresLength > 0) {
+              // 遍历所有查询结果，放入results
+              for (const feature of featureCollection.features) {
+                const popupStr = '<div class="popup-div">' +
+                  '<div class="popup-title">部件信息</div>' +
+                  '<div class="dashed-line"></div>' +
+                  '<div class="popup-item"><label>部件类型</label>' + feature.properties.dl + ' / ' + feature.properties.xl + '</div>' +
+                  '<div class="popup-item"><label>部件编号</label>' + feature.properties.objid + '</div>' +
+                  '<div class="popup-item"><label>所在网格编号</label>' + feature.properties.bgid + '</div>' +
+                  '<div class="popup-item"><label>权属部门</label>' + feature.properties.deptname2 + '</div>' +
+                  '<div class="popup-item"><label>责任部门</label>' + feature.properties.deptname1 + '</div>' +
+                  '<div class="popup-item"><label>养护部门</label>' + feature.properties.deptname3 + '</div>' +
+                  '</div>'
+
+                results.push({
+                  name: feature.properties.dl + ' / ' + feature.properties.xl,
+                  code: feature.properties.objid,
+                  content: {
+                    title: '权属部门',
+                    text: feature.properties.deptname2
+                  },
+                  lng: feature.geometry.coordinates[0],
+                  lat: feature.geometry.coordinates[1],
+                  popupStr: popupStr
+                })
+              }
+            }
+            // 如果是最后一个图层
+            if (i === (partsLength - 1)) {
+              this.searchList = results
+              this.searchLoading = false
+            }
+          })
+        }
+      } else {
+        this.searchLoading = false
       }
     },
     // 清空查询
@@ -154,28 +237,16 @@
       // 赋予新的查询结果
       const currentMarkesLength = data.length
       for (let i = 0; i < currentMarkesLength; i++) {
-        const feature = data[i].feature
-        var icon = this.searchIconList[i]
-        const latlng = L.latLng([feature.geometry.coordinates[1], feature.geometry.coordinates[0]])
-        var item = L.marker(latlng, { icon: icon, layer: data[i].layer, properties: feature.properties }).addTo(this.map)
+        const icon = this.searchIconList[i]
+        const latlng = L.latLng([data[i].lat, data[i].lng])
+        const item = L.marker(latlng, { icon: icon }).addTo(this.map)
         item.on('click', e => {
           if (item.getPopup()) {
             item.unbindPopup()
           }
           // 绑定弹窗
-          const properties = feature.properties
-          var str = `<div class="pop-window">
-                        <div class="pop-title">
-                          ${properties['小类名称']}
-                        </div>
-                        <div class="pop-line"><col>大类：</col>${properties['大类名称']}</div>
-                        <div class="pop-line"><col>小类：</col>${properties['小类名称']}</div>
-                        <div class="pop-line"><col>部件编码：</col>${properties['编码']}</div>
-                        <div class="pop-line"><col>权属单位：</col>${properties['权属单位'] ? properties.权属单位 : '未知'}</div>
-                        <div class="pop-line"><col>详细地址：</col>${properties['详细地址'] ? properties.详细地址 : '未知'}</div>
-                      <div>`
-          var popup = L.popup().setContent(str)
-          item.bindPopup(popup).openPopup(e.latlng)
+          const popup = L.popup().setContent(data[i].popupStr)
+          item.bindPopup(popup).openPopup([data[i].lat, data[i].lng])
         })
         this.currentSearchMarkers.push(item)
       }
@@ -186,10 +257,8 @@
     },
     // 点击查询列表项，将位置放在中间
     clickSearchItem(item, index) {
-      console.log('clickItem')
       if (item) {
-        const feature = item.feature
-        const latlng = L.latLng([feature.geometry.coordinates[1], feature.geometry.coordinates[0]])
+        const latlng = L.latLng([item.lat, item.lng])
         let zoom = this.map.getZoom()
         if (zoom < 19) {
           zoom = 19
@@ -229,36 +298,18 @@
       })
     },
     // 部件图层切换
-    layerChange(node, checked) {
-      const selectItem = this.layers.filter(item => item.name === node.name)[0]
-      // 如果选中底图,选中添加，没选中移除
-      if (selectItem.type === 'map') {
-        if (!checked) {
-          for (const item of this.maps) {
-            this.map.removeLayer(item)
-          }
-        } else {
-          for (const item of this.maps) {
-            this.map.addLayer(item)
-          }
-        }
-      } else if (node.type === 'layer') { // 其他图层
-        if (!checked) {
-          for (let i = 0; i < selectItem.domain.length; i++) {
-            this.map.removeLayer(this.parts[selectItem.domain[i] - 1])
-          }
-        } else {
-          for (let i = 0; i < selectItem.domain.length; i++) {
-            this.map.addLayer(this.parts[selectItem.domain[i] - 1])
-          }
-        }
-      }
+    layerChange(node) {
+      this.$refs.layerRadio.$refs.layerTree.setCheckedKeys([node.id])
+      this.selectLayers = [node.id]
+
+      // 清除查询
+      this.clearSearch()
     },
     // 地图初始化
     init() {
       const map = L.map('map', {
-        minZoom: 4,
-        maxZoom: 21,
+        minZoom: 14,
+        maxZoom: 25,
         center: this.baseConfig.center,
         zoom: this.baseConfig.zoom,
         zoomControl: false,
@@ -268,40 +319,64 @@
       map.doubleClickZoom.disable() // 禁止双击
       this.map = map // data挂载map
       window.map = map
-      // 添加底图
-      for (let i = 0; i <= 21; i++) {
-        const item = { url: `${this.baseUrl}${this.mapUrl}/${i}` }
-        this.maps.push(esri.featureLayer(item).addTo(map))
+
+      // 加载天地图底图和标注
+      this.baseLayer.push(L.tileLayer(this.baseConfig.mapUrl).addTo(map))
+      this.baseLayer.push(L.tileLayer(this.baseConfig.labelUrl).addTo(map))
+
+      // 构建并加载layerGroup
+      /* eslint-disable new-cap */
+      this.addMapDtLyaer() // 底图
+
+      // 部件图层组
+      for (let i = 3; i < 10; i++) {
+        this.addPartsLayer(i)
       }
-      // 添加部件图层
-      const partsLayer = this.baseConfig.partsLayer
-      for (const parent of partsLayer) { // 遍历大类
-        const childs = parent.children
-        for (const child of childs) { // 遍历小类
-          const item = { url: `${this.baseUrl}${this.partsUrl}/${child.layer}`, minZoom: 18 }
-          console.log(item)
-          var layer = esri.featureLayer(item).addTo(map)
-          // 点击部件事件
-          layer.on('click', function(e) {
-            // 获取要素的属性
-            const properties = e.layer.feature.properties
-            // 弹窗样式
-            var str = `<div class="pop-window">
-                        <div class="pop-title">
-                          ${properties['小类名称']}
-                        </div>
-                        <div class="pop-line"><col>大类：</col>${properties['大类名称']}</div>
-                        <div class="pop-line"><col>小类：</col>${properties['小类名称']}</div>
-                        <div class="pop-line"><col>部件编码：</col>${properties['编码']}</div>
-                        <div class="pop-line"><col>权属单位：</col>${properties['权属单位'] ? properties.权属单位 : '未知'}</div>
-                        <div class="pop-line"><col>详细地址：</col>${properties['详细地址'] ? properties.详细地址 : '未知'}</div>
-                      <div>`
-            var popup = L.popup().setContent(str)
-            e.layer.dragging._marker.bindPopup(popup, { minWidth: 200 }).openPopup()
-          })
-          this.parts.push(layer)
-        }
-      }
+    },
+    // 添加底图图层
+    addMapDtLyaer: function() {
+      const mapDtGroup = new L.layerGroup() // 创建layerGroup
+
+      // 创建图层并加载到layerGroup中
+      const item = { url: `${this.baseUrl}${this.mapUrl}` }
+      esri.dynamicMapLayer(item).addTo(mapDtGroup)
+
+      this.layerGroups.push(mapDtGroup)
+      this.map.addLayer(mapDtGroup)
+    },
+    addPartsLayer: function(index) {
+      const that = this
+      const group = new L.layerGroup() // 创建layerGroup
+
+      const domains = this.baseConfig.layers[index].domain
+      domains.forEach(dom => {
+        // 创建图层并加载到layerGroup中
+        const item = { url: `${this.baseUrl}${this.partsUrl}/${dom}`, minZoom: 18 }
+        const layer = esri.featureLayer(item).addTo(group)
+        this.parts.push(item)
+
+        layer.on('click', function(e) {
+          // 获取要素的属性
+          const properties = e.layer.feature.properties
+
+          // 弹窗样式
+          const popupStr = '<div class="popup-div">' +
+            '<div class="popup-title">部件信息</div>' +
+            '<div class="dashed-line"></div>' +
+            '<div class="popup-item"><label>部件类型</label>' + properties.dl + ' / ' + properties.xl + '</div>' +
+            '<div class="popup-item"><label>部件编号</label>' + properties.objid + '</div>' +
+            '<div class="popup-item"><label>所在网格编号</label>' + properties.bgid + '</div>' +
+            '<div class="popup-item"><label>权属部门</label>' + properties.deptname2 + '</div>' +
+            '<div class="popup-item"><label>责任部门</label>' + properties.deptname1 + '</div>' +
+            '<div class="popup-item"><label>养护部门</label>' + properties.deptname3 + '</div>' +
+            '</div>'
+          // 弹出窗口
+          L.popup().setContent(popupStr).setLatLng(e.latlng).openOn(that.map)
+        })
+
+        that.layerGroups.push(group)
+      })
+      this.map.addLayer(group)
     },
     // 初始化图标
     initIcons() {
@@ -310,23 +385,17 @@
         const icon = L.icon({
           iconUrl: require(`@/assets/global_images/point${i}.png`),
           iconSize: [25, 25],
-          iconAnchor: [12.5, 25]
+          iconAnchor: [12, 25],
+          popupAnchor: [0, -25]
         })
         this.searchIconList.push(icon)
       }
     },
     handleCurrentChange(val) {
       this.offset = val
-      var num = 5 * val >= this.searchlist.length ? this.searchlist.length : 5 * val
-      this.showlist = this.searchlist.slice(5 * (val - 1), num)
+      const num = 5 * val >= this.searchList.length ? this.searchList.length : 5 * val
+      this.showlist = this.searchList.slice(5 * (val - 1), num)
       this.drawIcon()
-    },
-    // 根据url找到layer
-    searchLayerByUrl(url) {
-      const layer = this.parts.filter(item => item.options.url === url)[0]
-      if (layer) {
-        this.currentLayer = layer
-      }
     }
   }
 }
@@ -345,8 +414,9 @@
   /*}*/
   $tableTitleHeight:35px;
   .leaflet_container{
-    width: 100%;
-    height: 84vh;
+    width: calc( 100vw - 208px );
+    height: calc( 100vh - 158px );
+    background-color: white;
   }
   .search-total{
     background-color: white; width: 300px;height: 35px;
@@ -453,3 +523,33 @@
     }
   }
 </style>
+
+<style>
+  .leaflet-container a.leaflet-popup-close-button {
+    top: 5px; /* 修改弹窗关闭按钮样式 */
+    right: 10px; /* 修改弹窗关闭按钮样式 */
+  }
+
+  .leaflet-popup-content .popup-div {
+    font-size: 15px;
+    padding: 6px;
+  }
+
+  .leaflet-popup-content .popup-title {
+    font-weight: bold;
+  }
+
+  .leaflet-popup-content .dashed-line {
+    border-bottom: 1px dashed #dddddd;
+    margin: 10px -10px;
+  }
+
+  .leaflet-popup-content .popup-item {
+    padding-bottom: 6px;
+  }
+
+  .leaflet-popup-content .popup-item label {
+    font-weight: bold;
+    padding-right: 15px;
+  }
+</style>
diff --git a/src/views/baseSource/overview.vue b/src/views/baseSource/overview.vue
index 8a3f857..02267ef 100644
--- a/src/views/baseSource/overview.vue
+++ b/src/views/baseSource/overview.vue
@@ -20,9 +20,11 @@
   components: { LayerChoose, ToolsContainer },
   data() {
     return {
+      baseLayer: [],
       layers: this.baseConfig.layers, // 图层列表
-      selectLayers: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], // 选中图层列表
+      selectLayers: [0, 1, 2], // 选中图层列表
       map: null, // 地图对象
+      layerGroups: [], // 图层组，用于控制一组内容显示或者隐藏
       maps: [], // 地图图层
       parts: [] // 部件图层
     }
@@ -32,7 +34,10 @@
       'baseUrl',
       'partsUrl',
       'partsAllUrl',
-      'mapUrl'
+      'shopUrl',
+      'mapUrl',
+      'gridUrl',
+      'mapDtUrl'
     ])
   },
   mounted() {
@@ -42,34 +47,18 @@
     // 部件图层切换
     layerChange(node, checked) {
       const selectItem = this.layers.filter(item => item.name === node.name)[0]
-      // 如果选中底图,选中添加，没选中移除
-      if (selectItem.type === 'map') {
-        if (!checked) {
-          for (const item of this.maps) {
-            this.map.removeLayer(item)
-          }
-        } else {
-          for (const item of this.maps) {
-            this.map.addLayer(item)
-          }
-        }
-      } else if (node.type === 'layer') { // 其他图层
-        if (!checked) {
-          for (let i = 0; i < selectItem.domain.length; i++) {
-            this.map.removeLayer(this.parts[selectItem.domain[i] - 1])
-          }
-        } else {
-          for (let i = 0; i < selectItem.domain.length; i++) {
-            this.map.addLayer(this.parts[selectItem.domain[i] - 1])
-          }
-        }
+
+      if (!checked) {
+        this.map.removeLayer(this.layerGroups[selectItem.id])
+      } else {
+        this.map.addLayer(this.layerGroups[selectItem.id])
       }
     },
     // 地图初始化
     init() {
       const map = L.map('map', {
-        minZoom: 4,
-        maxZoom: 21,
+        minZoom: 14,
+        maxZoom: 25,
         center: this.baseConfig.center,
         zoom: this.baseConfig.zoom,
         zoomControl: false,
@@ -79,48 +68,147 @@
       map.doubleClickZoom.disable() // 禁止双击
       this.map = map // data挂载map
       window.map = map
-      // 添加底图图层
-      for (let i = 0; i <= 21; i++) {
-        const item = { url: `${this.baseUrl}${this.mapUrl}/${i}` }
-        this.maps.push(esri.featureLayer(item).addTo(map))
+
+      // 加载天地图底图和标注
+      this.baseLayer.push(L.tileLayer(this.baseConfig.mapUrl).addTo(map))
+      this.baseLayer.push(L.tileLayer(this.baseConfig.labelUrl).addTo(map))
+
+      // 构建并加载layerGroup
+      /* eslint-disable new-cap */
+      this.addMapDtLyaer() // 底图
+      this.addGridLayer() // 网格
+      this.addShopLayer() // 商户
+
+      // 部件图层组
+      for (let i = 3; i < 10; i++) {
+        this.addPartsLayer(i)
       }
-      // 添加部件图层
-      const partsLayer = this.baseConfig.partsLayer
-      for (const parent of partsLayer) { // 遍历大类
-        const childs = parent.children
-        for (const child of childs) { // 遍历小类
-          const item = { url: `${this.baseUrl}${this.partsUrl}/${child.layer}`, minZoom: 18 }
-          console.log(item)
-          var layer = esri.featureLayer(item).addTo(map)
-          // 点击部件事件
-          layer.on('click', function(e) {
-            // 获取要素的属性
-            const properties = e.layer.feature.properties
-            // 弹窗样式
-            var str = `<div class="pop-window">
-                        <div class="pop-title">
-                          ${properties['小类名称']}
-                        </div>
-                        <div class="pop-line"><col>大类：</col>${properties['大类名称']}</div>
-                        <div class="pop-line"><col>小类：</col>${properties['小类名称']}</div>
-                        <div class="pop-line"><col>部件编码：</col>${properties['编码']}</div>
-                        <div class="pop-line"><col>权属单位：</col>${properties['权属单位'] ? properties.权属单位 : '未知'}</div>
-                        <div class="pop-line"><col>详细地址：</col>${properties['详细地址'] ? properties.详细地址 : '未知'}</div>
-                      <div>`
-            var popup = L.popup().setContent(str)
-            e.layer.dragging._marker.bindPopup(popup, { minWidth: 200 }).openPopup()
-          })
-          this.parts.push(layer)
-        }
-      }
+
+      // 添加默认显示的图层
+      this.selectLayers.forEach(item => {
+        this.map.addLayer(this.layerGroups[item])
+      })
+    },
+    // 添加底图图层
+    addMapDtLyaer: function() {
+      const mapDtGroup = new L.layerGroup() // 创建layerGroup
+
+      // 创建图层并加载到layerGroup中
+      const item = { url: `${this.baseUrl}${this.mapDtUrl}` }
+      esri.dynamicMapLayer(item).addTo(mapDtGroup)
+
+      this.layerGroups.push(mapDtGroup)
+    },
+    // 添加网格图层
+    addGridLayer: function() {
+      const gridGroup = new L.layerGroup() // 创建layerGroup
+
+      // 创建图层并加载到layerGroup中
+      const item = { url: `${this.baseUrl}${this.gridUrl}` }
+      esri.featureLayer(item).addTo(gridGroup)
+
+      this.layerGroups.push(gridGroup)
+    },
+    // 添加商户图层
+    addShopLayer: function() {
+      const shopGroup = new L.layerGroup() // 创建layerGroup
+
+      // 创建图层并加载到layerGroup中
+      const item = { url: `${this.baseUrl}${this.shopUrl}` }
+      const layer = esri.featureLayer(item).addTo(shopGroup)
+
+      const that = this
+      layer.on('click', function(e) {
+        // 获取要素的属性
+        const properties = e.layer.feature.properties
+
+        // 弹窗样式
+        const popupStr = '<div class="popup-div">' +
+          '<div class="popup-title">商户信息</div>' +
+          '<div class="dashed-line"></div>' +
+          '<div class="popup-item"><label>商户名称</label>' + properties.dutyname + '</div>' +
+          '<div class="popup-item"><label>商户编号</label>' + properties.objid + '</div>' +
+          // '<div class="popup-item"><label>所在社区</label>' + properties.communame + '</div>' +
+          // '<div class="popup-item"><label>所在网格编号</label>' + properties.bgid + '</div>' +
+          '<div class="popup-item"><label>三包责任单位</label>' + properties.deptname + '</div>' +
+          '<div class="popup-item"><label>详细地址</label>' + properties.position_ + '</div>' +
+          '</div>'
+        // 弹出窗口
+        L.popup().setContent(popupStr).setLatLng(e.latlng).openOn(that.map)
+      })
+
+      this.layerGroups.push(shopGroup)
+    },
+    addPartsLayer: function(index) {
+      const that = this
+      const group = new L.layerGroup() // 创建layerGroup
+
+      const domains = this.baseConfig.layers[index].domain
+      const minZoom = this.baseConfig.layers[index].minZoom === undefined ? 18 : this.baseConfig.layers[index].minZoom
+      domains.forEach(dom => {
+        // 创建图层并加载到layerGroup中
+        const item = { url: `${this.baseUrl}${this.partsUrl}/${dom}`, minZoom: minZoom }
+        const layer = esri.featureLayer(item).addTo(group)
+
+        layer.on('click', function(e) {
+          // 获取要素的属性
+          const properties = e.layer.feature.properties
+
+          // 弹窗样式
+          const popupStr = '<div class="popup-div">' +
+            '<div class="popup-title">部件信息</div>' +
+            '<div class="dashed-line"></div>' +
+            '<div class="popup-item"><label>部件类型</label>' + properties.dl + ' / ' + properties.xl + '</div>' +
+            '<div class="popup-item"><label>部件编号</label>' + properties.objid + '</div>' +
+            '<div class="popup-item"><label>所在网格编号</label>' + properties.bgid + '</div>' +
+            '<div class="popup-item"><label>权属部门</label>' + properties.deptname2 + '</div>' +
+            '<div class="popup-item"><label>责任部门</label>' + properties.deptname1 + '</div>' +
+            '<div class="popup-item"><label>养护部门</label>' + properties.deptname3 + '</div>' +
+            '</div>'
+          // 弹出窗口
+          L.popup().setContent(popupStr).setLatLng(e.latlng).openOn(that.map)
+        })
+
+        that.layerGroups.push(group)
+      })
     }
   }
 }
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
   .leaflet_container{
-    width: calc( 100% - 158px );
-    height: 83vh;
+    width: calc( 100vw - 208px );
+    height: calc( 100vh - 158px );
     background-color: white;
   }
 </style>
+
+<style>
+  .leaflet-container a.leaflet-popup-close-button {
+    top: 5px; /* 修改弹窗关闭按钮样式 */
+    right: 10px; /* 修改弹窗关闭按钮样式 */
+  }
+
+  .leaflet-popup-content .popup-div {
+    font-size: 15px;
+    padding: 6px;
+  }
+
+  .leaflet-popup-content .popup-title {
+    font-weight: bold;
+  }
+
+  .leaflet-popup-content .dashed-line {
+    border-bottom: 1px dashed #dddddd;
+    margin: 10px -10px;
+  }
+
+  .leaflet-popup-content .popup-item {
+    padding-bottom: 6px;
+  }
+
+  .leaflet-popup-content .popup-item label {
+    font-weight: bold;
+    padding-right: 15px;
+  }
+</style>
diff --git a/src/views/supControl/supControl.vue b/src/views/supControl/supControl.vue
index 490ec1c..b6c153f 100644
--- a/src/views/supControl/supControl.vue
+++ b/src/views/supControl/supControl.vue
@@ -607,7 +607,7 @@
     // 初始化地图
     initMap: function() {
       const map = Leaflet.map(this.$refs.mapDiv, {
-        minZoom: 4,
+        minZoom: 14,
         maxZoom: 25,
         center: this.baseConfig.center,
         zoom: this.baseConfig.zoom,
@@ -615,18 +615,13 @@
         attributionControl: false,
         crs: Leaflet.CRS.EPSG3857
       })
+      map.doubleClickZoom.disable() // 禁止双击
       this.map = map // data上需要挂载
       window.map = map
 
       // 加载天地图底图和标注
-      this.baseLayer.push(Leaflet.tileLayer(
-        this.baseConfig.mapUrl,
-        { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
-      ).addTo(map))
-      this.baseLayer.push(Leaflet.tileLayer(
-        this.baseConfig.labelUrl,
-        { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
-      ).addTo(map))
+      this.baseLayer.push(Leaflet.tileLayer(this.baseConfig.mapUrl).addTo(map))
+      this.baseLayer.push(Leaflet.tileLayer(this.baseConfig.labelUrl).addTo(map))
 
       // 加载部件分层的图层
       const bjfcLayer = esri.dynamicMapLayer({
diff --git a/static/project.config.json b/static/project.config.json
index b81dd3b..f829f5a 100644
--- a/static/project.config.json
+++ b/static/project.config.json
@@ -12,24 +12,85 @@
       "code":"01",
       "name":"公共设施",
       "children":[
-
-        {"code": "05","name": "电力井盖","layer": 4},
-        {"code": "06","name": "路灯井盖","layer": 3},
-        {"code": "07","name": "通信井盖","layer": 1},
-        {"code": "12","name": "公安井盖","layer": 2}
+        {"code": "01","name": "上水井盖","layer": 12},
+        {"code": "02","name": "污水井盖","layer": 13},
+        {"code": "03","name": "雨水井盖","layer": 14},
+        {"code": "04","name": "雨水篦子","layer": 15},
+        {"code": "05","name": "电力井盖","layer": 0},
+        {"code": "06","name": "路灯井盖","layer": 1},
+        {"code": "07","name": "通信井盖","layer": 2},
+        {"code": "08","name": "电视井盖","layer": 3},
+        {"code": "09","name": "网络井盖","layer": 4},
+        {"code": "11","name": "燃气井盖","layer": 5},
+        {"code": "12","name": "公安井盖","layer": 6},
+        {"code": "13","name": "消防设施","layer": 7},
+        {"code": "18","name": "化粪池井盖","layer": 8},
+        {"code": "23","name": "不明井盖","layer": 9},
+        {"code": "27","name": "通信交接箱","layer": 10},
+        {"code": "28","name": "电力设施","layer": 11},
+        {"code": "30","name": "电力立杆","layer": 16},
+        {"code": "37","name": "路灯","layer": 17},
+        {"code": "38","name": "地灯","layer": 18},
+        {"code": "39","name": "景观灯","layer": 19},
+        {"code": "40","name": "报刊亭","layer": 20},
+        {"code": "41","name": "电话亭","layer": 21},
+        {"code": "42","name": "邮筒","layer": 22},
+        {"code": "50","name": "监控电子眼","layer": 23},
+        {"code": "51","name": "岗亭岗楼","layer": 24}
+      ]
+    }, {
+      "code":"02",
+      "name":"交通设施",
+      "children":[
+        {"code": "01","name": "停车场","layer": 25},
+        {"code": "03","name": "停车咪表","layer": 26},
+        {"code": "04","name": "公交站亭","layer": 27},
+        {"code": "08","name": "立交桥","layer": 28},
+        {"code": "09","name": "跨河桥","layer": 29},
+        {"code": "10","name": "交通标志牌","layer": 30},
+        {"code": "12","name": "路名牌","layer": 31},
+        {"code": "14","name": "交通信号灯","layer": 32},
+        {"code": "15","name": "交通控制箱","layer": 33}
+      ]
+    }, {
+      "code":"03",
+      "name":"市容环境设施",
+      "children":[
+        {"code": "01","name": "公共厕所","layer": 34},
+        {"code": "05","name": "垃圾箱","layer": 35},
+        {"code": "06","name": "户外广告","layer": 36},
+        {"code": "07","name": "牌匾标识","layer": 37},
+        {"code": "08","name": "宣传栏","layer": 38},
+        {"code": "10","name": "环保监测站","layer": 39}
+      ]
+    }, {
+      "code":"04",
+      "name":"园林绿化设施",
+      "children":[
+        {"code": "05","name": "花架花钵","layer": 40},
+        {"code": "06","name": "雕塑","layer": 41},
+        {"code": "07","name": "街头座椅","layer": 42},
+        {"code": "09","name": "绿地附属设施","layer": 43}
+      ]
+    }, {
+      "code":"05",
+      "name":"其他部件",
+      "children":[
+        {"code": "01","name": "人防工事","layer": 44},
+        {"code": "05","name": "重大危险源","layer": 45}
       ]
     }
   ],
   "layers": [
-    { "id": 0, "name": "底图", "type": "map", "domain":  [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21] },
+    { "id": 0, "name": "底图", "type": "map", "domain":  [] },
     { "id": 1, "name": "网格", "type": "layer", "domain":  [] },
     { "id": 2, "name": "商户", "type": "layer", "domain":  [] },
-    { "id": 3, "name": "视频监控点", "type": "layer", "domain":  [35] },
-    { "id": 4, "name": "路灯杆和灯箱", "type": "layer", "domain":  [1, 3, 4, 22, 25, 34] },
+    { "id": 3, "name": "视频监控点", "type": "layer", "domain":  [23] },
+    { "id": 4, "name": "路灯杆和灯箱", "type": "layer", "domain":  [17] },
     { "id": 5, "name": "雨水井盖", "type": "layer", "domain":  [14] },
-    { "id": 6, "name": "污水井盖", "type": "layer", "domain":  [37] },
-    { "id": 7, "name": "公共厕所", "type": "layer", "domain":  [12, 13] },
-    { "id": 8, "name": "垃圾箱", "type": "layer", "domain":  [24] },
-    { "id": 9, "name": "其他部件", "type": "layer", "domain":  [2, 5, 6, 7, 8, 9, 10, 11, 15, 16, 17, 18, 19, 20, 21, 23, 26, 27, 28, 29, 30, 31, 32, 33, 35, 36, 38, 39, 40] }
+    { "id": 6, "name": "污水井盖", "type": "layer", "domain":  [13] },
+    { "id": 7, "name": "公共厕所", "type": "layer", "domain":  [34], "minZoom": 14 },
+    { "id": 8, "name": "垃圾箱", "type": "layer", "domain":  [35]},
+    { "id": 9, "name": "其他部件", "type": "layer", "domain":  [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 15, 16, 18, 19, 20, 21, 22, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45] }
   ]
 }