diff --git a/src/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue
index 7d3cab5..49e0eaf 100644
--- a/src/components/CaseCommon/caseDetail.vue
+++ b/src/components/CaseCommon/caseDetail.vue
@@ -60,15 +60,15 @@
             </el-form-item>
           </div>
           <div class="detail-item">
-            <el-form-item label="所在街道">
+            <el-form-item label="所在乡镇">
               <el-input :value="caseDetail.streetName"/>
             </el-form-item>
           </div>
         </div>
         <div class="detail-row">
           <div class="detail-item">
-            <el-form-item label="所属网格">
-              <el-input :value="caseDetail.gridId"/>
+            <el-form-item label="所在社区">
+              <el-input :value="caseDetail.communityName"/>
             </el-form-item>
           </div>
           <div class="detail-item">
@@ -327,7 +327,9 @@
       :append-to-body="true"
       title="位置详情"
     >
-      <tian-di-tu-map-read :longitude="Number(caseDetail.lng)" :latitude="Number(caseDetail.lat)"/>
+      <!--<tian-di-tu-map-read :longitude="Number(caseDetail.lng)" :latitude="Number(caseDetail.lat)"/>-->
+      <arc-gis-map-read :longitude="Number(caseDetail.lng)" :latitude="Number(caseDetail.lat)"/>
+
     </el-dialog>
   </app-container>
 </template>
@@ -339,11 +341,12 @@
 import { getCommonLanguage, getFilingTypeList, getCaseLevelList, getEorc } from '@/api/coorBusiness/dict'
 import { historicalRecords, nextNodes, completeCaseTask } from '@/api/coorBusiness/process'
 import TianDiTuMapRead from '@/components/Map/tiandiMapRead'
+import ArcGisMapRead from '@/components/Map/arcgisMapRead'
 import { radioMap } from './radioMap'
 
 export default {
   name: 'CaseDetail',
-  components: { TianDiTuMapRead },
+  components: { TianDiTuMapRead,ArcGisMapRead },
   data() {
     const validateEmptyString = (rule, value, callback) => {
       if (!value.trim()) {

diff --git a/src/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue
index 7d3cab5..49e0eaf 100644
--- a/src/components/CaseCommon/caseDetail.vue
+++ b/src/components/CaseCommon/caseDetail.vue
@@ -60,15 +60,15 @@
             </el-form-item>
           </div>
           <div class="detail-item">
-            <el-form-item label="所在街道">
+            <el-form-item label="所在乡镇">
               <el-input :value="caseDetail.streetName"/>
             </el-form-item>
           </div>
         </div>
         <div class="detail-row">
           <div class="detail-item">
-            <el-form-item label="所属网格">
-              <el-input :value="caseDetail.gridId"/>
+            <el-form-item label="所在社区">
+              <el-input :value="caseDetail.communityName"/>
             </el-form-item>
           </div>
           <div class="detail-item">
@@ -327,7 +327,9 @@
       :append-to-body="true"
       title="位置详情"
     >
-      <tian-di-tu-map-read :longitude="Number(caseDetail.lng)" :latitude="Number(caseDetail.lat)"/>
+      <!--<tian-di-tu-map-read :longitude="Number(caseDetail.lng)" :latitude="Number(caseDetail.lat)"/>-->
+      <arc-gis-map-read :longitude="Number(caseDetail.lng)" :latitude="Number(caseDetail.lat)"/>
+
     </el-dialog>
   </app-container>
 </template>
@@ -339,11 +341,12 @@
 import { getCommonLanguage, getFilingTypeList, getCaseLevelList, getEorc } from '@/api/coorBusiness/dict'
 import { historicalRecords, nextNodes, completeCaseTask } from '@/api/coorBusiness/process'
 import TianDiTuMapRead from '@/components/Map/tiandiMapRead'
+import ArcGisMapRead from '@/components/Map/arcgisMapRead'
 import { radioMap } from './radioMap'
 
 export default {
   name: 'CaseDetail',
-  components: { TianDiTuMapRead },
+  components: { TianDiTuMapRead,ArcGisMapRead },
   data() {
     const validateEmptyString = (rule, value, callback) => {
       if (!value.trim()) {
diff --git a/src/views/callCase/callCase.vue b/src/views/callCase/callCase.vue
index 3cdceb7..5aa10b7 100644
--- a/src/views/callCase/callCase.vue
+++ b/src/views/callCase/callCase.vue
@@ -36,7 +36,7 @@
                 </el-select>
               </el-form-item>
             </div>
-            <div class="form-item" style="padding-left: 20px; display: block;">
+            <div class="form-item" style="padding-left: 10px; display: block;">
               <el-button type="primary" size="small" @click="showHistoryList">历史记录</el-button>
               <el-button type="primary" size="small" @click="openMapQueryDialog">地图查询</el-button>
             </div>
@@ -50,14 +50,14 @@
               </el-form-item>
             </div>
             <div class="form-item">
-              <el-form-item label="所在街镇" prop="streetCode">
+              <el-form-item label="所在乡镇" prop="streetCode">
                 <el-select v-model="caseForm.streetCode" placeholder="选择所在街镇" value="">
                   <el-option key="361024100" label="巴山镇" value="361024100"/>
                 </el-select>
               </el-form-item>
             </div>
             <div class="form-item">
-              <el-form-item label="所在网格" prop="communityName">
+              <el-form-item label="所在社区" prop="communityName">
                 <el-input v-model="caseForm.communityName" class="el-input--suffix" type="text" placeholder="必填" readonly />
               </el-form-item>
             </div>
@@ -117,22 +117,18 @@
             </div>
             <div class="form-item">
               <el-form-item label="是否核实">
-                <div>
-                  <el-radio-group v-model="caseForm.isNeedVerify" size="small" @change="changeNeedVerify()">
-                    <el-radio-button label="1">需要</el-radio-button>
-                    <el-radio-button label="0">不需要</el-radio-button>
-                  </el-radio-group>
-                </div>
+                <el-radio-group v-model="caseForm.isNeedVerify" size="small" @change="changeNeedVerify()">
+                  <el-radio-button label="1">需要</el-radio-button>
+                  <el-radio-button label="0">不需要</el-radio-button>
+                </el-radio-group>
               </el-form-item>
             </div>
             <div class="form-item">
               <el-form-item label="是否回访">
-                <div>
-                  <el-radio-group v-model="caseForm.isNeedRevisit" size="small">
-                    <el-radio-button label="1">需要</el-radio-button>
-                    <el-radio-button label="0">不需要</el-radio-button>
-                  </el-radio-group>
-                </div>
+                <el-radio-group v-model="caseForm.isNeedRevisit" size="small">
+                  <el-radio-button label="1">需要</el-radio-button>
+                  <el-radio-button label="0">不需要</el-radio-button>
+                </el-radio-group>
               </el-form-item>
             </div>
           </div>
@@ -217,7 +213,11 @@
         width="80%"
         append-to-body>
 
-        <tian-di-tu-map ref="map" @closeMapQueryDialogByEvent="closeMapQueryDialogByEvent" />
+        <!--<tian-di-tu-map ref="map" @closeMapQueryDialogByEvent="closeMapQueryDialogByEvent" />-->
+        <arcgis-map-comp
+          ref="mapComp"
+          @closeMapQueryDialogByEvent="closeMapQueryDialogByEvent"
+          @closeMapQueryDialogByComp="closeMapQueryDialogByComp"/>
 
       </el-dialog>
 
@@ -230,11 +230,13 @@
 import { getDeptList } from '@/api/coorBusiness/case'
 import { Uploadimg } from '@/api/common'
 import TianDiTuMap from '@/components/Map/tiandiMap'
+import ArcgisMapComp from '@/components/Map/arcGISMap'
 
 export default {
   name: 'CallCase',
   components: {// 注册组件
-    TianDiTuMap: TianDiTuMap
+    TianDiTuMap: TianDiTuMap,
+    ArcgisMapComp: ArcgisMapComp
   },
   data() {
     const phoneValidator = (rule, value, callback) => {
@@ -538,7 +540,7 @@
     // 关闭地图查询对话框
     closeMapQueryDialogByEvent: function(longitude, latitude, communityId, communityName, gridId) {
       this.mapDialogVisible = false
-
+      debugger
       // 赋值
       this.caseForm.eorc = '1' // 事件点返回时案卷类别自动选择为事件
       this.caseForm.communityCode = communityId

diff --git a/src/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue
index 7d3cab5..49e0eaf 100644
--- a/src/components/CaseCommon/caseDetail.vue
+++ b/src/components/CaseCommon/caseDetail.vue
@@ -60,15 +60,15 @@
             </el-form-item>
           </div>
           <div class="detail-item">
-            <el-form-item label="所在街道">
+            <el-form-item label="所在乡镇">
               <el-input :value="caseDetail.streetName"/>
             </el-form-item>
           </div>
         </div>
         <div class="detail-row">
           <div class="detail-item">
-            <el-form-item label="所属网格">
-              <el-input :value="caseDetail.gridId"/>
+            <el-form-item label="所在社区">
+              <el-input :value="caseDetail.communityName"/>
             </el-form-item>
           </div>
           <div class="detail-item">
@@ -327,7 +327,9 @@
       :append-to-body="true"
       title="位置详情"
     >
-      <tian-di-tu-map-read :longitude="Number(caseDetail.lng)" :latitude="Number(caseDetail.lat)"/>
+      <!--<tian-di-tu-map-read :longitude="Number(caseDetail.lng)" :latitude="Number(caseDetail.lat)"/>-->
+      <arc-gis-map-read :longitude="Number(caseDetail.lng)" :latitude="Number(caseDetail.lat)"/>
+
     </el-dialog>
   </app-container>
 </template>
@@ -339,11 +341,12 @@
 import { getCommonLanguage, getFilingTypeList, getCaseLevelList, getEorc } from '@/api/coorBusiness/dict'
 import { historicalRecords, nextNodes, completeCaseTask } from '@/api/coorBusiness/process'
 import TianDiTuMapRead from '@/components/Map/tiandiMapRead'
+import ArcGisMapRead from '@/components/Map/arcgisMapRead'
 import { radioMap } from './radioMap'
 
 export default {
   name: 'CaseDetail',
-  components: { TianDiTuMapRead },
+  components: { TianDiTuMapRead,ArcGisMapRead },
   data() {
     const validateEmptyString = (rule, value, callback) => {
       if (!value.trim()) {
diff --git a/src/views/callCase/callCase.vue b/src/views/callCase/callCase.vue
index 3cdceb7..5aa10b7 100644
--- a/src/views/callCase/callCase.vue
+++ b/src/views/callCase/callCase.vue
@@ -36,7 +36,7 @@
                 </el-select>
               </el-form-item>
             </div>
-            <div class="form-item" style="padding-left: 20px; display: block;">
+            <div class="form-item" style="padding-left: 10px; display: block;">
               <el-button type="primary" size="small" @click="showHistoryList">历史记录</el-button>
               <el-button type="primary" size="small" @click="openMapQueryDialog">地图查询</el-button>
             </div>
@@ -50,14 +50,14 @@
               </el-form-item>
             </div>
             <div class="form-item">
-              <el-form-item label="所在街镇" prop="streetCode">
+              <el-form-item label="所在乡镇" prop="streetCode">
                 <el-select v-model="caseForm.streetCode" placeholder="选择所在街镇" value="">
                   <el-option key="361024100" label="巴山镇" value="361024100"/>
                 </el-select>
               </el-form-item>
             </div>
             <div class="form-item">
-              <el-form-item label="所在网格" prop="communityName">
+              <el-form-item label="所在社区" prop="communityName">
                 <el-input v-model="caseForm.communityName" class="el-input--suffix" type="text" placeholder="必填" readonly />
               </el-form-item>
             </div>
@@ -117,22 +117,18 @@
             </div>
             <div class="form-item">
               <el-form-item label="是否核实">
-                <div>
-                  <el-radio-group v-model="caseForm.isNeedVerify" size="small" @change="changeNeedVerify()">
-                    <el-radio-button label="1">需要</el-radio-button>
-                    <el-radio-button label="0">不需要</el-radio-button>
-                  </el-radio-group>
-                </div>
+                <el-radio-group v-model="caseForm.isNeedVerify" size="small" @change="changeNeedVerify()">
+                  <el-radio-button label="1">需要</el-radio-button>
+                  <el-radio-button label="0">不需要</el-radio-button>
+                </el-radio-group>
               </el-form-item>
             </div>
             <div class="form-item">
               <el-form-item label="是否回访">
-                <div>
-                  <el-radio-group v-model="caseForm.isNeedRevisit" size="small">
-                    <el-radio-button label="1">需要</el-radio-button>
-                    <el-radio-button label="0">不需要</el-radio-button>
-                  </el-radio-group>
-                </div>
+                <el-radio-group v-model="caseForm.isNeedRevisit" size="small">
+                  <el-radio-button label="1">需要</el-radio-button>
+                  <el-radio-button label="0">不需要</el-radio-button>
+                </el-radio-group>
               </el-form-item>
             </div>
           </div>
@@ -217,7 +213,11 @@
         width="80%"
         append-to-body>
 
-        <tian-di-tu-map ref="map" @closeMapQueryDialogByEvent="closeMapQueryDialogByEvent" />
+        <!--<tian-di-tu-map ref="map" @closeMapQueryDialogByEvent="closeMapQueryDialogByEvent" />-->
+        <arcgis-map-comp
+          ref="mapComp"
+          @closeMapQueryDialogByEvent="closeMapQueryDialogByEvent"
+          @closeMapQueryDialogByComp="closeMapQueryDialogByComp"/>
 
       </el-dialog>
 
@@ -230,11 +230,13 @@
 import { getDeptList } from '@/api/coorBusiness/case'
 import { Uploadimg } from '@/api/common'
 import TianDiTuMap from '@/components/Map/tiandiMap'
+import ArcgisMapComp from '@/components/Map/arcGISMap'
 
 export default {
   name: 'CallCase',
   components: {// 注册组件
-    TianDiTuMap: TianDiTuMap
+    TianDiTuMap: TianDiTuMap,
+    ArcgisMapComp: ArcgisMapComp
   },
   data() {
     const phoneValidator = (rule, value, callback) => {
@@ -538,7 +540,7 @@
     // 关闭地图查询对话框
     closeMapQueryDialogByEvent: function(longitude, latitude, communityId, communityName, gridId) {
       this.mapDialogVisible = false
-
+      debugger
       // 赋值
       this.caseForm.eorc = '1' // 事件点返回时案卷类别自动选择为事件
       this.caseForm.communityCode = communityId
diff --git a/src/views/caseCommon/caseDetailRead.vue b/src/views/caseCommon/caseDetailRead.vue
index beaa000..c3161a7 100644
--- a/src/views/caseCommon/caseDetailRead.vue
+++ b/src/views/caseCommon/caseDetailRead.vue
@@ -61,15 +61,15 @@
             </el-form-item>
           </div>
           <div class="detail-item">
-            <el-form-item label="所在街道">
+            <el-form-item label="所在乡镇">
               <el-input :value="caseDetail.streetName"/>
             </el-form-item>
           </div>
         </div>
         <div class="detail-row">
           <div class="detail-item">
-            <el-form-item label="所属网格">
-              <el-input :value="caseDetail.gridId"/>
+            <el-form-item label="所在社区">
+              <el-input :value="caseDetail.communityName"/>
             </el-form-item>
           </div>
           <div class="detail-item">