diff --git a/src/components/Map/arcgisMap.vue b/src/components/Map/arcgisMap.vue
index 0d98798..a233cec 100644
--- a/src/components/Map/arcgisMap.vue
+++ b/src/components/Map/arcgisMap.vue
@@ -1,19 +1,21 @@
 <template>
   <div>
     <el-row :gutter="20">
-      <el-col :span="4">
-        <el-input v-model="keywords" size="small" type="text" placeholder="兴趣点关键字" clearable />
-      </el-col>
-      <el-col :span="4">
-        <el-button type="primary" size="small" @click="queryOnMap">查询</el-button>
-        <el-button type="info" size="small" @click="clearMap"> 清除地图 </el-button>
-      </el-col>
+      <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 :span="8" style="text-align: center;">
+      <el-col :span="8" :offset="8" style="text-align: center;">
         <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 label="2">兴趣点属性</el-radio-button>
+          <el-radio-button v-show="showpoi" label="2">兴趣点属性</el-radio-button>
         </el-radio-group>
       </el-col>
 
@@ -93,7 +95,8 @@
       communityName: '', // 社区名称
       gridId: '', // 单元网格ID
       componentId: '', // 部件ID
-      componentName: '' // 部件名称
+      componentName: '', // 部件名称
+      showpoi: false
     }
   },
   mounted() {
@@ -188,7 +191,7 @@
       this.view.on('click', function(event) {
         // 清除地图上已有的事件/部件查询点
         that.clearEOrCPoint()
-        console.log('event.mapPoint', event.mapPoint)
+        console.log('event.mapPoint', event.mapPoint, that.queryEventSwitch)
 
         const lon = event.mapPoint.longitude
         const lat = event.mapPoint.latitude
@@ -259,10 +262,8 @@
               .then(function(response) {
                 if (response.features.length > 0) {
                   const results = response.features
-                  console.log('results',results)
+                  console.log('results', results)
                   that.compListOpts = []
-
-                  // todo 部件名称、部件编码
                   let content = ''
                   results.forEach((item, index) => {
                     content += '<p>部件' + (index + 1) + '：' + item.attributes.大类名称 + '-' + item.attributes.小类名称 + '-' + item.attributes.编码
@@ -282,18 +283,21 @@
                   // 查询所在社区和单元网格
                   const queryPos = that.layers.dx2wGrid.createQuery()
                   queryPos.geometry = that.view.toMap(event)
+                  queryPos.distance = 10
+                  queryPos.units = 'meters'
                   queryPos.returnGeometry = true
-                  queryPos.outFields = ['BGID', 'COMMUID', 'COMMUNAME']
+                  queryPos.outFields = ['CommuName ', 'CommuId ', 'Commuarea ', 'StreetId ', 'StreetName ']
                   that.layers.dx2wGrid.queryFeatures(queryPos)
                     .then(function(response) {
+                      console.log('response queryPos', response)
                       const result = response.features[0].attributes
 
                       // 赋值
                       that.longitude = lon
                       that.latitude = lat
-                      that.gridId = result.BGID
-                      that.communityId = result.COMMUID
-                      that.communityName = result.COMMUNAME
+                      that.gridId = result.CommuId
+                      that.communityId = result.CommuId
+                      that.communityName = result.CommuName
                     })
                 } else {
                   that.$message({
@@ -327,21 +331,21 @@
     addBjLayers: function() {
       // 此处可以优化
       this.layers.dxbjPoint = new this.esriObj.FeatureLayer({ // 可配置属性，见TileLayer类
-        url: serverConfig.mapUrlBj + '/2',
+        url: serverConfig.mapUrlBj + '/0',
         id: 'dxbjPoint'
       })
-      this.layers.dxbjLine = new this.esriObj.FeatureLayer({ // 可配置属性，见TileLayer类
-        url: serverConfig.mapUrlBj + '/1',
-        id: 'dxbjLine'
-      })
-      this.layers.dxbjXqd = new this.esriObj.FeatureLayer({ // 可配置属性，见TileLayer类
-        url: serverConfig.mapUrlBj + '/2',
-        id: 'dxbjXqd'
-      })
-      this.layers.dxbjMph = new this.esriObj.FeatureLayer({ // 可配置属性，见TileLayer类
-        url: serverConfig.mapUrlBj + '/3',
-        id: 'dxbjMph'
-      })
+      // this.layers.dxbjLine = new this.esriObj.FeatureLayer({ // 可配置属性，见TileLayer类
+      //   url: serverConfig.mapUrlBj + '/1',
+      //   id: 'dxbjLine'
+      // })
+      // this.layers.dxbjXqd = new this.esriObj.FeatureLayer({ // 可配置属性，见TileLayer类
+      //   url: serverConfig.mapUrlBj + '/2',
+      //   id: 'dxbjXqd'
+      // })
+      // this.layers.dxbjMph = new this.esriObj.FeatureLayer({ // 可配置属性，见TileLayer类
+      //   url: serverConfig.mapUrlBj + '/3',
+      //   id: 'dxbjMph'
+      // })
       this.layers.dx2wGrid = new this.esriObj.FeatureLayer({
         url: serverConfig.mapUrlBase + '/16',
         id: 'gridLayer'
@@ -349,9 +353,9 @@
 
       // 加载各图层
       this.map.add(this.layers.dxbjPoint)
-      this.map.add(this.layers.dxbjLine)
-      this.map.add(this.layers.dxbjXqd)
-      this.map.add(this.layers.dxbjMph)
+      // this.map.add(this.layers.dxbjLine)
+      // this.map.add(this.layers.dxbjXqd)
+      // this.map.add(this.layers.dxbjMph)
       this.map.add(this.layers.dx2wGrid)
     },
     // 在兴趣点图层查询关键字

diff --git a/src/components/Map/arcgisMap.vue b/src/components/Map/arcgisMap.vue
index 0d98798..a233cec 100644
--- a/src/components/Map/arcgisMap.vue
+++ b/src/components/Map/arcgisMap.vue
@@ -1,19 +1,21 @@
 <template>
   <div>
     <el-row :gutter="20">
-      <el-col :span="4">
-        <el-input v-model="keywords" size="small" type="text" placeholder="兴趣点关键字" clearable />
-      </el-col>
-      <el-col :span="4">
-        <el-button type="primary" size="small" @click="queryOnMap">查询</el-button>
-        <el-button type="info" size="small" @click="clearMap"> 清除地图 </el-button>
-      </el-col>
+      <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 :span="8" style="text-align: center;">
+      <el-col :span="8" :offset="8" style="text-align: center;">
         <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 label="2">兴趣点属性</el-radio-button>
+          <el-radio-button v-show="showpoi" label="2">兴趣点属性</el-radio-button>
         </el-radio-group>
       </el-col>
 
@@ -93,7 +95,8 @@
       communityName: '', // 社区名称
       gridId: '', // 单元网格ID
       componentId: '', // 部件ID
-      componentName: '' // 部件名称
+      componentName: '', // 部件名称
+      showpoi: false
     }
   },
   mounted() {
@@ -188,7 +191,7 @@
       this.view.on('click', function(event) {
         // 清除地图上已有的事件/部件查询点
         that.clearEOrCPoint()
-        console.log('event.mapPoint', event.mapPoint)
+        console.log('event.mapPoint', event.mapPoint, that.queryEventSwitch)
 
         const lon = event.mapPoint.longitude
         const lat = event.mapPoint.latitude
@@ -259,10 +262,8 @@
               .then(function(response) {
                 if (response.features.length > 0) {
                   const results = response.features
-                  console.log('results',results)
+                  console.log('results', results)
                   that.compListOpts = []
-
-                  // todo 部件名称、部件编码
                   let content = ''
                   results.forEach((item, index) => {
                     content += '<p>部件' + (index + 1) + '：' + item.attributes.大类名称 + '-' + item.attributes.小类名称 + '-' + item.attributes.编码
@@ -282,18 +283,21 @@
                   // 查询所在社区和单元网格
                   const queryPos = that.layers.dx2wGrid.createQuery()
                   queryPos.geometry = that.view.toMap(event)
+                  queryPos.distance = 10
+                  queryPos.units = 'meters'
                   queryPos.returnGeometry = true
-                  queryPos.outFields = ['BGID', 'COMMUID', 'COMMUNAME']
+                  queryPos.outFields = ['CommuName ', 'CommuId ', 'Commuarea ', 'StreetId ', 'StreetName ']
                   that.layers.dx2wGrid.queryFeatures(queryPos)
                     .then(function(response) {
+                      console.log('response queryPos', response)
                       const result = response.features[0].attributes
 
                       // 赋值
                       that.longitude = lon
                       that.latitude = lat
-                      that.gridId = result.BGID
-                      that.communityId = result.COMMUID
-                      that.communityName = result.COMMUNAME
+                      that.gridId = result.CommuId
+                      that.communityId = result.CommuId
+                      that.communityName = result.CommuName
                     })
                 } else {
                   that.$message({
@@ -327,21 +331,21 @@
     addBjLayers: function() {
       // 此处可以优化
       this.layers.dxbjPoint = new this.esriObj.FeatureLayer({ // 可配置属性，见TileLayer类
-        url: serverConfig.mapUrlBj + '/2',
+        url: serverConfig.mapUrlBj + '/0',
         id: 'dxbjPoint'
       })
-      this.layers.dxbjLine = new this.esriObj.FeatureLayer({ // 可配置属性，见TileLayer类
-        url: serverConfig.mapUrlBj + '/1',
-        id: 'dxbjLine'
-      })
-      this.layers.dxbjXqd = new this.esriObj.FeatureLayer({ // 可配置属性，见TileLayer类
-        url: serverConfig.mapUrlBj + '/2',
-        id: 'dxbjXqd'
-      })
-      this.layers.dxbjMph = new this.esriObj.FeatureLayer({ // 可配置属性，见TileLayer类
-        url: serverConfig.mapUrlBj + '/3',
-        id: 'dxbjMph'
-      })
+      // this.layers.dxbjLine = new this.esriObj.FeatureLayer({ // 可配置属性，见TileLayer类
+      //   url: serverConfig.mapUrlBj + '/1',
+      //   id: 'dxbjLine'
+      // })
+      // this.layers.dxbjXqd = new this.esriObj.FeatureLayer({ // 可配置属性，见TileLayer类
+      //   url: serverConfig.mapUrlBj + '/2',
+      //   id: 'dxbjXqd'
+      // })
+      // this.layers.dxbjMph = new this.esriObj.FeatureLayer({ // 可配置属性，见TileLayer类
+      //   url: serverConfig.mapUrlBj + '/3',
+      //   id: 'dxbjMph'
+      // })
       this.layers.dx2wGrid = new this.esriObj.FeatureLayer({
         url: serverConfig.mapUrlBase + '/16',
         id: 'gridLayer'
@@ -349,9 +353,9 @@
 
       // 加载各图层
       this.map.add(this.layers.dxbjPoint)
-      this.map.add(this.layers.dxbjLine)
-      this.map.add(this.layers.dxbjXqd)
-      this.map.add(this.layers.dxbjMph)
+      // this.map.add(this.layers.dxbjLine)
+      // this.map.add(this.layers.dxbjXqd)
+      // this.map.add(this.layers.dxbjMph)
       this.map.add(this.layers.dx2wGrid)
     },
     // 在兴趣点图层查询关键字
diff --git a/src/views/callCase/callCase.vue b/src/views/callCase/callCase.vue
index 94fd9f3..f30f748 100644
--- a/src/views/callCase/callCase.vue
+++ b/src/views/callCase/callCase.vue
@@ -602,7 +602,7 @@
     // 关闭地图查询对话框
     closeMapQueryDialogByComp: function(longitude, latitude, communityId, communityName, gridId, componentId, componentName) {
       this.mapDialogVisible = false
-
+      console.log(communityId, gridId)
       // 赋值
       this.caseForm.eorc = '2' // 部件点返回时案卷类别自动选择为部件
       this.caseForm.communityCode = communityId
@@ -613,8 +613,10 @@
       this.caseForm.componentId = componentId
       this.caseForm.componentName = componentName
 
-      this.caseForm.areaCode = communityId.substring(0, 6) // 区县代码
-      this.caseForm.streetCode = communityId.substring(0, 9) // 街道代码
+      // console.log(componentId,componentId.substring(6, 8),componentId.substring(8, 10))
+
+      this.caseForm.areaCode = gridId.substring(0, 6) // 区县代码
+      this.caseForm.streetCode = gridId.substring(0, 9) // 街道代码
       this.caseTypeCodeAuto = componentId.substring(6, 8) // 自动赋值部件大类
       this.caseTypeDetailCodeAuto = componentId.substring(8, 10) // 自动赋值部件小类
     },