diff --git a/mock/system/user.js b/mock/system/user.js
index 43c5f16..abd593d 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -163,6 +163,7 @@
     { 'code': 'well_update', 'icon': '', 'id': '1138615123652091905', 'ismenu': '0', 'levels': 2, 'name': '修改窨井', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '04', 'url': '/well/update' },
     { 'code': 'liquid_config_export', 'icon': '', 'id': '1138691921802915842', 'ismenu': '0', 'levels': 2, 'name': '液位配置批量导出', 'num': 0, 'parentId': '1138690889324654593', 'resourceType': '04', 'url': '/busConfig/liquidConfig/batchExport' },
     { 'code': 'well_list', 'icon': '', 'id': '1138615485519863810', 'ismenu': '1', 'levels': 2, 'name': '窨井列表', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '03', 'url': '/well/list' },
+    { 'code': 'well_list', 'icon': '', 'id': '1138615485519863812', 'ismenu': '1', 'levels': 2, 'name': '窨井位置纠偏', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '03', 'url': '/well/location' },
     { 'code': 'gas_config_config', 'icon': '', 'id': '1177427682888646657', 'ismenu': '0', 'levels': 2, 'name': '燃气下发配置', 'num': 0, 'parentId': '1138690889324654593', 'resourceType': '04', 'url': '/busConfig/gasConfig/config' },
     { 'code': 'well_batchexport', 'icon': '', 'id': '1138615953230897154', 'ismenu': '0', 'levels': 2, 'name': '批量导出窨井', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '04', 'url': '/well/batchExport' },
     { 'code': 'dig_config_list', 'icon': '', 'id': '1177429930704240641', 'ismenu': '0', 'levels': 2, 'name': '开挖监测仪配置列表', 'num': 0, 'parentId': '1138690889324654593', 'resourceType': '04', 'url': '/busConfig/digConfig/list' },

diff --git a/mock/system/user.js b/mock/system/user.js
index 43c5f16..abd593d 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -163,6 +163,7 @@
     { 'code': 'well_update', 'icon': '', 'id': '1138615123652091905', 'ismenu': '0', 'levels': 2, 'name': '修改窨井', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '04', 'url': '/well/update' },
     { 'code': 'liquid_config_export', 'icon': '', 'id': '1138691921802915842', 'ismenu': '0', 'levels': 2, 'name': '液位配置批量导出', 'num': 0, 'parentId': '1138690889324654593', 'resourceType': '04', 'url': '/busConfig/liquidConfig/batchExport' },
     { 'code': 'well_list', 'icon': '', 'id': '1138615485519863810', 'ismenu': '1', 'levels': 2, 'name': '窨井列表', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '03', 'url': '/well/list' },
+    { 'code': 'well_list', 'icon': '', 'id': '1138615485519863812', 'ismenu': '1', 'levels': 2, 'name': '窨井位置纠偏', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '03', 'url': '/well/location' },
     { 'code': 'gas_config_config', 'icon': '', 'id': '1177427682888646657', 'ismenu': '0', 'levels': 2, 'name': '燃气下发配置', 'num': 0, 'parentId': '1138690889324654593', 'resourceType': '04', 'url': '/busConfig/gasConfig/config' },
     { 'code': 'well_batchexport', 'icon': '', 'id': '1138615953230897154', 'ismenu': '0', 'levels': 2, 'name': '批量导出窨井', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '04', 'url': '/well/batchExport' },
     { 'code': 'dig_config_list', 'icon': '', 'id': '1177429930704240641', 'ismenu': '0', 'levels': 2, 'name': '开挖监测仪配置列表', 'num': 0, 'parentId': '1138690889324654593', 'resourceType': '04', 'url': '/busConfig/digConfig/list' },
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 14860e4..b5b6e82 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -101,6 +101,12 @@
         name: 'AddWell',
         component: () => import('@/views/wellManage/addWell'),
         meta: { title: '新增窨井', icon: 'icon-config', permission: ['/well/add'] }
+      },
+      {
+        path: '/wellLocation',
+        name: 'WellLocation',
+        component: () => import('@/views/wellManage/postionCorrectWell'),
+        meta: { title: '窨井位置纠偏', icon: 'icon-config', permission: ['/well/location'] }
       }
     ]
   },

diff --git a/mock/system/user.js b/mock/system/user.js
index 43c5f16..abd593d 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -163,6 +163,7 @@
     { 'code': 'well_update', 'icon': '', 'id': '1138615123652091905', 'ismenu': '0', 'levels': 2, 'name': '修改窨井', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '04', 'url': '/well/update' },
     { 'code': 'liquid_config_export', 'icon': '', 'id': '1138691921802915842', 'ismenu': '0', 'levels': 2, 'name': '液位配置批量导出', 'num': 0, 'parentId': '1138690889324654593', 'resourceType': '04', 'url': '/busConfig/liquidConfig/batchExport' },
     { 'code': 'well_list', 'icon': '', 'id': '1138615485519863810', 'ismenu': '1', 'levels': 2, 'name': '窨井列表', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '03', 'url': '/well/list' },
+    { 'code': 'well_list', 'icon': '', 'id': '1138615485519863812', 'ismenu': '1', 'levels': 2, 'name': '窨井位置纠偏', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '03', 'url': '/well/location' },
     { 'code': 'gas_config_config', 'icon': '', 'id': '1177427682888646657', 'ismenu': '0', 'levels': 2, 'name': '燃气下发配置', 'num': 0, 'parentId': '1138690889324654593', 'resourceType': '04', 'url': '/busConfig/gasConfig/config' },
     { 'code': 'well_batchexport', 'icon': '', 'id': '1138615953230897154', 'ismenu': '0', 'levels': 2, 'name': '批量导出窨井', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '04', 'url': '/well/batchExport' },
     { 'code': 'dig_config_list', 'icon': '', 'id': '1177429930704240641', 'ismenu': '0', 'levels': 2, 'name': '开挖监测仪配置列表', 'num': 0, 'parentId': '1138690889324654593', 'resourceType': '04', 'url': '/busConfig/digConfig/list' },
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 14860e4..b5b6e82 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -101,6 +101,12 @@
         name: 'AddWell',
         component: () => import('@/views/wellManage/addWell'),
         meta: { title: '新增窨井', icon: 'icon-config', permission: ['/well/add'] }
+      },
+      {
+        path: '/wellLocation',
+        name: 'WellLocation',
+        component: () => import('@/views/wellManage/postionCorrectWell'),
+        meta: { title: '窨井位置纠偏', icon: 'icon-config', permission: ['/well/location'] }
       }
     ]
   },
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index f6c3f24..71fa2d9 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -180,6 +180,6 @@
     width: 100%;
   }
   .el-date-editor{
-    width: 100%;
+    width: 100%;display: flex;
   }
 </style>

diff --git a/mock/system/user.js b/mock/system/user.js
index 43c5f16..abd593d 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -163,6 +163,7 @@
     { 'code': 'well_update', 'icon': '', 'id': '1138615123652091905', 'ismenu': '0', 'levels': 2, 'name': '修改窨井', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '04', 'url': '/well/update' },
     { 'code': 'liquid_config_export', 'icon': '', 'id': '1138691921802915842', 'ismenu': '0', 'levels': 2, 'name': '液位配置批量导出', 'num': 0, 'parentId': '1138690889324654593', 'resourceType': '04', 'url': '/busConfig/liquidConfig/batchExport' },
     { 'code': 'well_list', 'icon': '', 'id': '1138615485519863810', 'ismenu': '1', 'levels': 2, 'name': '窨井列表', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '03', 'url': '/well/list' },
+    { 'code': 'well_list', 'icon': '', 'id': '1138615485519863812', 'ismenu': '1', 'levels': 2, 'name': '窨井位置纠偏', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '03', 'url': '/well/location' },
     { 'code': 'gas_config_config', 'icon': '', 'id': '1177427682888646657', 'ismenu': '0', 'levels': 2, 'name': '燃气下发配置', 'num': 0, 'parentId': '1138690889324654593', 'resourceType': '04', 'url': '/busConfig/gasConfig/config' },
     { 'code': 'well_batchexport', 'icon': '', 'id': '1138615953230897154', 'ismenu': '0', 'levels': 2, 'name': '批量导出窨井', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '04', 'url': '/well/batchExport' },
     { 'code': 'dig_config_list', 'icon': '', 'id': '1177429930704240641', 'ismenu': '0', 'levels': 2, 'name': '开挖监测仪配置列表', 'num': 0, 'parentId': '1138690889324654593', 'resourceType': '04', 'url': '/busConfig/digConfig/list' },
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 14860e4..b5b6e82 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -101,6 +101,12 @@
         name: 'AddWell',
         component: () => import('@/views/wellManage/addWell'),
         meta: { title: '新增窨井', icon: 'icon-config', permission: ['/well/add'] }
+      },
+      {
+        path: '/wellLocation',
+        name: 'WellLocation',
+        component: () => import('@/views/wellManage/postionCorrectWell'),
+        meta: { title: '窨井位置纠偏', icon: 'icon-config', permission: ['/well/location'] }
       }
     ]
   },
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index f6c3f24..71fa2d9 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -180,6 +180,6 @@
     width: 100%;
   }
   .el-date-editor{
-    width: 100%;
+    width: 100%;display: flex;
   }
 </style>
diff --git a/src/views/wellManage/components/infoWindowWell.vue b/src/views/wellManage/components/infoWindowWell.vue
new file mode 100644
index 0000000..b18edf3
--- /dev/null
+++ b/src/views/wellManage/components/infoWindowWell.vue
@@ -0,0 +1,47 @@
+<!--
+ * @Description: 井信息弹窗
+ * @Author: 王晓颖
+ * @Date: 2022-05-13
+ -->
+<template>
+  <div class="info-window">
+    <div class="info-header">
+      {{ wellInfo.wellCode }}
+    </div>
+    <div class="info-body">
+      <div>井类型：{{ wellInfo.wellTypeName }}</div>
+      <div>权属单位：{{ wellInfo.deptName }}</div>
+      <div>详细地址：{{ wellInfo.position }}</div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'WellInfoWindow',
+  props: {
+    wellInfo: {
+      type: Object,
+      required: true
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.info-window{
+  max-width: 260px;
+  min-width: 200px;
+  .info-header{
+    padding: 10px 10px 5px 10px;
+    line-height: 30px;
+    font-weight: bold;
+    /*background-color: #eaf4ff;*/
+  }
+  .info-body{
+    padding: 5px 10px 10px 10px;
+    line-height: 23px;
+    font-size: 14px;
+  }
+}
+</style>

diff --git a/mock/system/user.js b/mock/system/user.js
index 43c5f16..abd593d 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -163,6 +163,7 @@
     { 'code': 'well_update', 'icon': '', 'id': '1138615123652091905', 'ismenu': '0', 'levels': 2, 'name': '修改窨井', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '04', 'url': '/well/update' },
     { 'code': 'liquid_config_export', 'icon': '', 'id': '1138691921802915842', 'ismenu': '0', 'levels': 2, 'name': '液位配置批量导出', 'num': 0, 'parentId': '1138690889324654593', 'resourceType': '04', 'url': '/busConfig/liquidConfig/batchExport' },
     { 'code': 'well_list', 'icon': '', 'id': '1138615485519863810', 'ismenu': '1', 'levels': 2, 'name': '窨井列表', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '03', 'url': '/well/list' },
+    { 'code': 'well_list', 'icon': '', 'id': '1138615485519863812', 'ismenu': '1', 'levels': 2, 'name': '窨井位置纠偏', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '03', 'url': '/well/location' },
     { 'code': 'gas_config_config', 'icon': '', 'id': '1177427682888646657', 'ismenu': '0', 'levels': 2, 'name': '燃气下发配置', 'num': 0, 'parentId': '1138690889324654593', 'resourceType': '04', 'url': '/busConfig/gasConfig/config' },
     { 'code': 'well_batchexport', 'icon': '', 'id': '1138615953230897154', 'ismenu': '0', 'levels': 2, 'name': '批量导出窨井', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '04', 'url': '/well/batchExport' },
     { 'code': 'dig_config_list', 'icon': '', 'id': '1177429930704240641', 'ismenu': '0', 'levels': 2, 'name': '开挖监测仪配置列表', 'num': 0, 'parentId': '1138690889324654593', 'resourceType': '04', 'url': '/busConfig/digConfig/list' },
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 14860e4..b5b6e82 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -101,6 +101,12 @@
         name: 'AddWell',
         component: () => import('@/views/wellManage/addWell'),
         meta: { title: '新增窨井', icon: 'icon-config', permission: ['/well/add'] }
+      },
+      {
+        path: '/wellLocation',
+        name: 'WellLocation',
+        component: () => import('@/views/wellManage/postionCorrectWell'),
+        meta: { title: '窨井位置纠偏', icon: 'icon-config', permission: ['/well/location'] }
       }
     ]
   },
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index f6c3f24..71fa2d9 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -180,6 +180,6 @@
     width: 100%;
   }
   .el-date-editor{
-    width: 100%;
+    width: 100%;display: flex;
   }
 </style>
diff --git a/src/views/wellManage/components/infoWindowWell.vue b/src/views/wellManage/components/infoWindowWell.vue
new file mode 100644
index 0000000..b18edf3
--- /dev/null
+++ b/src/views/wellManage/components/infoWindowWell.vue
@@ -0,0 +1,47 @@
+<!--
+ * @Description: 井信息弹窗
+ * @Author: 王晓颖
+ * @Date: 2022-05-13
+ -->
+<template>
+  <div class="info-window">
+    <div class="info-header">
+      {{ wellInfo.wellCode }}
+    </div>
+    <div class="info-body">
+      <div>井类型：{{ wellInfo.wellTypeName }}</div>
+      <div>权属单位：{{ wellInfo.deptName }}</div>
+      <div>详细地址：{{ wellInfo.position }}</div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'WellInfoWindow',
+  props: {
+    wellInfo: {
+      type: Object,
+      required: true
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.info-window{
+  max-width: 260px;
+  min-width: 200px;
+  .info-header{
+    padding: 10px 10px 5px 10px;
+    line-height: 30px;
+    font-weight: bold;
+    /*background-color: #eaf4ff;*/
+  }
+  .info-body{
+    padding: 5px 10px 10px 10px;
+    line-height: 23px;
+    font-size: 14px;
+  }
+}
+</style>
diff --git a/src/views/wellManage/components/mapSearchComp.vue b/src/views/wellManage/components/mapSearchComp.vue
new file mode 100644
index 0000000..22ef568
--- /dev/null
+++ b/src/views/wellManage/components/mapSearchComp.vue
@@ -0,0 +1,134 @@
+<!--
+ * @Description: 搜索组件
+ * @Author: 王晓颖
+ * @Date: 2022-05-18
+ -->
+<template>
+  <div class="map-search-div">
+    <!--搜索条件-->
+    <div>
+      <el-input v-model.trim="keywords" :placeholder="placeholder" clearable>
+        <el-button slot="append" class="filter-item" type="primary" icon="el-icon-search" @click="search">
+          搜索
+        </el-button>
+      </el-input>
+    </div>
+    <!--搜索结果弹出框-->
+    <el-popover
+      v-show="list.length>0"
+      v-model="resultShow"
+      placement="bottom-end"
+      width="311"
+      trigger="manual"
+    >
+      <div slot="reference" class="select-answer" @click="resultShow = !resultShow">
+        共找到 {{ list.length }} 个符合条件的{{ name }}
+      </div>
+      <div class="list-div">
+        <map-search-item v-for="(data,index) in currentPageList" :key="'search-item-'+index" :data="data" :index="index" @click="clickItem" />
+      </div>
+      <el-pagination
+        :total="list.length"
+        :current-page="pageNum"
+        :page-size="pageSize"
+        :hide-on-single-page="true"
+        small
+        layout="prev, pager, next"
+        @current-change="changePage"
+      />
+    </el-popover>
+  </div>
+</template>
+
+<script>
+import MapSearchItem from './mapSearchItem'
+export default {
+  name: 'SearchComp',
+  components: { MapSearchItem },
+  props: {
+    name: {
+      type: String,
+      default: '井'
+    }, // 结果展示类型
+    placeholder: {
+      type: String,
+      default: '关键字'
+    },
+    list: {
+      type: Array,
+      default: () => []
+    } // 结果列表
+  },
+  data() {
+    return {
+      resultShow: false, // 是否显示查询结果
+      keywords: '', // 查询条件
+      currentPageList: [], // 当前页数据
+      pageSize: 5, // 页面容量
+      pageNum: 1 // 页码
+    }
+  },
+  watch: {
+    keywords(val) {
+      if (val === '') {
+        this.currentPageList = []
+        this.pageNum = 1
+        this.resultShow = false
+        this.$emit('clear')
+      }
+    },
+    list(val) { // 监控list的数量，为0时不显示
+      if (val && val.length > 0) {
+        this.resultShow = true
+        this.changePage(1)
+      } else {
+        this.resultShow = false
+        this.currentPageList = []
+      }
+    }
+  },
+  methods: {
+    // 点击搜索按钮
+    search() {
+      this.$emit('search', this.keywords)
+    },
+    // 切换页码
+    changePage(val) {
+      const offset = val
+      const start = (offset - 1) * this.pageSize
+      const end = start + this.pageSize
+      this.currentPageList = this.list.slice(start, end)
+      this.$emit('change-page', this.currentPageList)
+    },
+    // 点击结果项
+    clickItem(item) {
+      this.$emit('click-item', item)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.map-search-div{
+  position: absolute;
+  z-index: 100;
+  left: 30px;
+  top: 5px;
+  .select-answer{
+    position: relative;
+    margin-top: 5px;
+    font-size:14px;
+    padding: 10px 20px;
+    width: 311px;
+    color: #606266;
+    background-color: #FFFFFF;
+    border: 1px solid #EBEEF5;
+    border-radius: 4px;
+    box-shadow: 0 2px 12px 0 rgba(0,0,0,.1)
+  }
+  .list-div{
+    background-color: #FFFFFF;
+  }
+}
+
+</style>

diff --git a/mock/system/user.js b/mock/system/user.js
index 43c5f16..abd593d 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -163,6 +163,7 @@
     { 'code': 'well_update', 'icon': '', 'id': '1138615123652091905', 'ismenu': '0', 'levels': 2, 'name': '修改窨井', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '04', 'url': '/well/update' },
     { 'code': 'liquid_config_export', 'icon': '', 'id': '1138691921802915842', 'ismenu': '0', 'levels': 2, 'name': '液位配置批量导出', 'num': 0, 'parentId': '1138690889324654593', 'resourceType': '04', 'url': '/busConfig/liquidConfig/batchExport' },
     { 'code': 'well_list', 'icon': '', 'id': '1138615485519863810', 'ismenu': '1', 'levels': 2, 'name': '窨井列表', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '03', 'url': '/well/list' },
+    { 'code': 'well_list', 'icon': '', 'id': '1138615485519863812', 'ismenu': '1', 'levels': 2, 'name': '窨井位置纠偏', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '03', 'url': '/well/location' },
     { 'code': 'gas_config_config', 'icon': '', 'id': '1177427682888646657', 'ismenu': '0', 'levels': 2, 'name': '燃气下发配置', 'num': 0, 'parentId': '1138690889324654593', 'resourceType': '04', 'url': '/busConfig/gasConfig/config' },
     { 'code': 'well_batchexport', 'icon': '', 'id': '1138615953230897154', 'ismenu': '0', 'levels': 2, 'name': '批量导出窨井', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '04', 'url': '/well/batchExport' },
     { 'code': 'dig_config_list', 'icon': '', 'id': '1177429930704240641', 'ismenu': '0', 'levels': 2, 'name': '开挖监测仪配置列表', 'num': 0, 'parentId': '1138690889324654593', 'resourceType': '04', 'url': '/busConfig/digConfig/list' },
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 14860e4..b5b6e82 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -101,6 +101,12 @@
         name: 'AddWell',
         component: () => import('@/views/wellManage/addWell'),
         meta: { title: '新增窨井', icon: 'icon-config', permission: ['/well/add'] }
+      },
+      {
+        path: '/wellLocation',
+        name: 'WellLocation',
+        component: () => import('@/views/wellManage/postionCorrectWell'),
+        meta: { title: '窨井位置纠偏', icon: 'icon-config', permission: ['/well/location'] }
       }
     ]
   },
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index f6c3f24..71fa2d9 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -180,6 +180,6 @@
     width: 100%;
   }
   .el-date-editor{
-    width: 100%;
+    width: 100%;display: flex;
   }
 </style>
diff --git a/src/views/wellManage/components/infoWindowWell.vue b/src/views/wellManage/components/infoWindowWell.vue
new file mode 100644
index 0000000..b18edf3
--- /dev/null
+++ b/src/views/wellManage/components/infoWindowWell.vue
@@ -0,0 +1,47 @@
+<!--
+ * @Description: 井信息弹窗
+ * @Author: 王晓颖
+ * @Date: 2022-05-13
+ -->
+<template>
+  <div class="info-window">
+    <div class="info-header">
+      {{ wellInfo.wellCode }}
+    </div>
+    <div class="info-body">
+      <div>井类型：{{ wellInfo.wellTypeName }}</div>
+      <div>权属单位：{{ wellInfo.deptName }}</div>
+      <div>详细地址：{{ wellInfo.position }}</div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'WellInfoWindow',
+  props: {
+    wellInfo: {
+      type: Object,
+      required: true
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.info-window{
+  max-width: 260px;
+  min-width: 200px;
+  .info-header{
+    padding: 10px 10px 5px 10px;
+    line-height: 30px;
+    font-weight: bold;
+    /*background-color: #eaf4ff;*/
+  }
+  .info-body{
+    padding: 5px 10px 10px 10px;
+    line-height: 23px;
+    font-size: 14px;
+  }
+}
+</style>
diff --git a/src/views/wellManage/components/mapSearchComp.vue b/src/views/wellManage/components/mapSearchComp.vue
new file mode 100644
index 0000000..22ef568
--- /dev/null
+++ b/src/views/wellManage/components/mapSearchComp.vue
@@ -0,0 +1,134 @@
+<!--
+ * @Description: 搜索组件
+ * @Author: 王晓颖
+ * @Date: 2022-05-18
+ -->
+<template>
+  <div class="map-search-div">
+    <!--搜索条件-->
+    <div>
+      <el-input v-model.trim="keywords" :placeholder="placeholder" clearable>
+        <el-button slot="append" class="filter-item" type="primary" icon="el-icon-search" @click="search">
+          搜索
+        </el-button>
+      </el-input>
+    </div>
+    <!--搜索结果弹出框-->
+    <el-popover
+      v-show="list.length>0"
+      v-model="resultShow"
+      placement="bottom-end"
+      width="311"
+      trigger="manual"
+    >
+      <div slot="reference" class="select-answer" @click="resultShow = !resultShow">
+        共找到 {{ list.length }} 个符合条件的{{ name }}
+      </div>
+      <div class="list-div">
+        <map-search-item v-for="(data,index) in currentPageList" :key="'search-item-'+index" :data="data" :index="index" @click="clickItem" />
+      </div>
+      <el-pagination
+        :total="list.length"
+        :current-page="pageNum"
+        :page-size="pageSize"
+        :hide-on-single-page="true"
+        small
+        layout="prev, pager, next"
+        @current-change="changePage"
+      />
+    </el-popover>
+  </div>
+</template>
+
+<script>
+import MapSearchItem from './mapSearchItem'
+export default {
+  name: 'SearchComp',
+  components: { MapSearchItem },
+  props: {
+    name: {
+      type: String,
+      default: '井'
+    }, // 结果展示类型
+    placeholder: {
+      type: String,
+      default: '关键字'
+    },
+    list: {
+      type: Array,
+      default: () => []
+    } // 结果列表
+  },
+  data() {
+    return {
+      resultShow: false, // 是否显示查询结果
+      keywords: '', // 查询条件
+      currentPageList: [], // 当前页数据
+      pageSize: 5, // 页面容量
+      pageNum: 1 // 页码
+    }
+  },
+  watch: {
+    keywords(val) {
+      if (val === '') {
+        this.currentPageList = []
+        this.pageNum = 1
+        this.resultShow = false
+        this.$emit('clear')
+      }
+    },
+    list(val) { // 监控list的数量，为0时不显示
+      if (val && val.length > 0) {
+        this.resultShow = true
+        this.changePage(1)
+      } else {
+        this.resultShow = false
+        this.currentPageList = []
+      }
+    }
+  },
+  methods: {
+    // 点击搜索按钮
+    search() {
+      this.$emit('search', this.keywords)
+    },
+    // 切换页码
+    changePage(val) {
+      const offset = val
+      const start = (offset - 1) * this.pageSize
+      const end = start + this.pageSize
+      this.currentPageList = this.list.slice(start, end)
+      this.$emit('change-page', this.currentPageList)
+    },
+    // 点击结果项
+    clickItem(item) {
+      this.$emit('click-item', item)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.map-search-div{
+  position: absolute;
+  z-index: 100;
+  left: 30px;
+  top: 5px;
+  .select-answer{
+    position: relative;
+    margin-top: 5px;
+    font-size:14px;
+    padding: 10px 20px;
+    width: 311px;
+    color: #606266;
+    background-color: #FFFFFF;
+    border: 1px solid #EBEEF5;
+    border-radius: 4px;
+    box-shadow: 0 2px 12px 0 rgba(0,0,0,.1)
+  }
+  .list-div{
+    background-color: #FFFFFF;
+  }
+}
+
+</style>
diff --git a/src/views/wellManage/components/mapSearchItem.vue b/src/views/wellManage/components/mapSearchItem.vue
new file mode 100644
index 0000000..5cdce0d
--- /dev/null
+++ b/src/views/wellManage/components/mapSearchItem.vue
@@ -0,0 +1,89 @@
+<!--
+ * @Description: 搜索结果项组件
+ * @Author: 王晓颖
+ * @Date: 2022-05-18
+ -->
+<template>
+  <div :key="data[props.label]" class="search-card" @click="clickItem()">
+    <div class="card-left">
+      <span class="index">{{ index+1 }}</span>
+    </div>
+    <div class="card-right">
+      <div class="card-title">
+        {{ data[props.label] }}-{{ data[props.name] }}
+      </div>
+      <div class="card-content">
+        <span class="card-detail">{{ data[props.detail] }}</span>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'SearchItem',
+  props: {
+    data: {
+      type: Object,
+      required: true
+    },
+    index: {
+      type: Number | String,
+      required: true
+    },
+    props: {
+      type: Object,
+      default: () => {
+        return {
+          label: 'wellCode',
+          name: 'wellName',
+          detail: 'position'
+        }
+      }
+    }
+  },
+  data() {
+    return {
+    }
+  },
+  methods: {
+    clickItem() {
+      this.$emit('click', this.data)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.search-card{
+  padding:5px 10px;
+  overflow: auto;
+  display: flex;
+  .card-left{
+    .index{
+      display: inline-block;
+      width: 20px;
+      line-height: 20px;
+      background-color: #cfe3fa;
+      text-align: center;
+      border-radius: 20px;
+      margin: 3px 10px 0px 0px;
+    }
+  }
+  .card-right{
+    flex:1
+  }
+  .card-title{
+    font-size:16px;
+    font-weight: bold;
+    line-height: 25px;
+  }
+  .card-detail{
+    line-height:25px;
+  }
+  &:hover{
+    cursor:pointer;
+    background-color: #fafafa;
+  }
+}
+</style>

diff --git a/mock/system/user.js b/mock/system/user.js
index 43c5f16..abd593d 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -163,6 +163,7 @@
     { 'code': 'well_update', 'icon': '', 'id': '1138615123652091905', 'ismenu': '0', 'levels': 2, 'name': '修改窨井', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '04', 'url': '/well/update' },
     { 'code': 'liquid_config_export', 'icon': '', 'id': '1138691921802915842', 'ismenu': '0', 'levels': 2, 'name': '液位配置批量导出', 'num': 0, 'parentId': '1138690889324654593', 'resourceType': '04', 'url': '/busConfig/liquidConfig/batchExport' },
     { 'code': 'well_list', 'icon': '', 'id': '1138615485519863810', 'ismenu': '1', 'levels': 2, 'name': '窨井列表', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '03', 'url': '/well/list' },
+    { 'code': 'well_list', 'icon': '', 'id': '1138615485519863812', 'ismenu': '1', 'levels': 2, 'name': '窨井位置纠偏', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '03', 'url': '/well/location' },
     { 'code': 'gas_config_config', 'icon': '', 'id': '1177427682888646657', 'ismenu': '0', 'levels': 2, 'name': '燃气下发配置', 'num': 0, 'parentId': '1138690889324654593', 'resourceType': '04', 'url': '/busConfig/gasConfig/config' },
     { 'code': 'well_batchexport', 'icon': '', 'id': '1138615953230897154', 'ismenu': '0', 'levels': 2, 'name': '批量导出窨井', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '04', 'url': '/well/batchExport' },
     { 'code': 'dig_config_list', 'icon': '', 'id': '1177429930704240641', 'ismenu': '0', 'levels': 2, 'name': '开挖监测仪配置列表', 'num': 0, 'parentId': '1138690889324654593', 'resourceType': '04', 'url': '/busConfig/digConfig/list' },
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 14860e4..b5b6e82 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -101,6 +101,12 @@
         name: 'AddWell',
         component: () => import('@/views/wellManage/addWell'),
         meta: { title: '新增窨井', icon: 'icon-config', permission: ['/well/add'] }
+      },
+      {
+        path: '/wellLocation',
+        name: 'WellLocation',
+        component: () => import('@/views/wellManage/postionCorrectWell'),
+        meta: { title: '窨井位置纠偏', icon: 'icon-config', permission: ['/well/location'] }
       }
     ]
   },
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index f6c3f24..71fa2d9 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -180,6 +180,6 @@
     width: 100%;
   }
   .el-date-editor{
-    width: 100%;
+    width: 100%;display: flex;
   }
 </style>
diff --git a/src/views/wellManage/components/infoWindowWell.vue b/src/views/wellManage/components/infoWindowWell.vue
new file mode 100644
index 0000000..b18edf3
--- /dev/null
+++ b/src/views/wellManage/components/infoWindowWell.vue
@@ -0,0 +1,47 @@
+<!--
+ * @Description: 井信息弹窗
+ * @Author: 王晓颖
+ * @Date: 2022-05-13
+ -->
+<template>
+  <div class="info-window">
+    <div class="info-header">
+      {{ wellInfo.wellCode }}
+    </div>
+    <div class="info-body">
+      <div>井类型：{{ wellInfo.wellTypeName }}</div>
+      <div>权属单位：{{ wellInfo.deptName }}</div>
+      <div>详细地址：{{ wellInfo.position }}</div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'WellInfoWindow',
+  props: {
+    wellInfo: {
+      type: Object,
+      required: true
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.info-window{
+  max-width: 260px;
+  min-width: 200px;
+  .info-header{
+    padding: 10px 10px 5px 10px;
+    line-height: 30px;
+    font-weight: bold;
+    /*background-color: #eaf4ff;*/
+  }
+  .info-body{
+    padding: 5px 10px 10px 10px;
+    line-height: 23px;
+    font-size: 14px;
+  }
+}
+</style>
diff --git a/src/views/wellManage/components/mapSearchComp.vue b/src/views/wellManage/components/mapSearchComp.vue
new file mode 100644
index 0000000..22ef568
--- /dev/null
+++ b/src/views/wellManage/components/mapSearchComp.vue
@@ -0,0 +1,134 @@
+<!--
+ * @Description: 搜索组件
+ * @Author: 王晓颖
+ * @Date: 2022-05-18
+ -->
+<template>
+  <div class="map-search-div">
+    <!--搜索条件-->
+    <div>
+      <el-input v-model.trim="keywords" :placeholder="placeholder" clearable>
+        <el-button slot="append" class="filter-item" type="primary" icon="el-icon-search" @click="search">
+          搜索
+        </el-button>
+      </el-input>
+    </div>
+    <!--搜索结果弹出框-->
+    <el-popover
+      v-show="list.length>0"
+      v-model="resultShow"
+      placement="bottom-end"
+      width="311"
+      trigger="manual"
+    >
+      <div slot="reference" class="select-answer" @click="resultShow = !resultShow">
+        共找到 {{ list.length }} 个符合条件的{{ name }}
+      </div>
+      <div class="list-div">
+        <map-search-item v-for="(data,index) in currentPageList" :key="'search-item-'+index" :data="data" :index="index" @click="clickItem" />
+      </div>
+      <el-pagination
+        :total="list.length"
+        :current-page="pageNum"
+        :page-size="pageSize"
+        :hide-on-single-page="true"
+        small
+        layout="prev, pager, next"
+        @current-change="changePage"
+      />
+    </el-popover>
+  </div>
+</template>
+
+<script>
+import MapSearchItem from './mapSearchItem'
+export default {
+  name: 'SearchComp',
+  components: { MapSearchItem },
+  props: {
+    name: {
+      type: String,
+      default: '井'
+    }, // 结果展示类型
+    placeholder: {
+      type: String,
+      default: '关键字'
+    },
+    list: {
+      type: Array,
+      default: () => []
+    } // 结果列表
+  },
+  data() {
+    return {
+      resultShow: false, // 是否显示查询结果
+      keywords: '', // 查询条件
+      currentPageList: [], // 当前页数据
+      pageSize: 5, // 页面容量
+      pageNum: 1 // 页码
+    }
+  },
+  watch: {
+    keywords(val) {
+      if (val === '') {
+        this.currentPageList = []
+        this.pageNum = 1
+        this.resultShow = false
+        this.$emit('clear')
+      }
+    },
+    list(val) { // 监控list的数量，为0时不显示
+      if (val && val.length > 0) {
+        this.resultShow = true
+        this.changePage(1)
+      } else {
+        this.resultShow = false
+        this.currentPageList = []
+      }
+    }
+  },
+  methods: {
+    // 点击搜索按钮
+    search() {
+      this.$emit('search', this.keywords)
+    },
+    // 切换页码
+    changePage(val) {
+      const offset = val
+      const start = (offset - 1) * this.pageSize
+      const end = start + this.pageSize
+      this.currentPageList = this.list.slice(start, end)
+      this.$emit('change-page', this.currentPageList)
+    },
+    // 点击结果项
+    clickItem(item) {
+      this.$emit('click-item', item)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.map-search-div{
+  position: absolute;
+  z-index: 100;
+  left: 30px;
+  top: 5px;
+  .select-answer{
+    position: relative;
+    margin-top: 5px;
+    font-size:14px;
+    padding: 10px 20px;
+    width: 311px;
+    color: #606266;
+    background-color: #FFFFFF;
+    border: 1px solid #EBEEF5;
+    border-radius: 4px;
+    box-shadow: 0 2px 12px 0 rgba(0,0,0,.1)
+  }
+  .list-div{
+    background-color: #FFFFFF;
+  }
+}
+
+</style>
diff --git a/src/views/wellManage/components/mapSearchItem.vue b/src/views/wellManage/components/mapSearchItem.vue
new file mode 100644
index 0000000..5cdce0d
--- /dev/null
+++ b/src/views/wellManage/components/mapSearchItem.vue
@@ -0,0 +1,89 @@
+<!--
+ * @Description: 搜索结果项组件
+ * @Author: 王晓颖
+ * @Date: 2022-05-18
+ -->
+<template>
+  <div :key="data[props.label]" class="search-card" @click="clickItem()">
+    <div class="card-left">
+      <span class="index">{{ index+1 }}</span>
+    </div>
+    <div class="card-right">
+      <div class="card-title">
+        {{ data[props.label] }}-{{ data[props.name] }}
+      </div>
+      <div class="card-content">
+        <span class="card-detail">{{ data[props.detail] }}</span>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'SearchItem',
+  props: {
+    data: {
+      type: Object,
+      required: true
+    },
+    index: {
+      type: Number | String,
+      required: true
+    },
+    props: {
+      type: Object,
+      default: () => {
+        return {
+          label: 'wellCode',
+          name: 'wellName',
+          detail: 'position'
+        }
+      }
+    }
+  },
+  data() {
+    return {
+    }
+  },
+  methods: {
+    clickItem() {
+      this.$emit('click', this.data)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.search-card{
+  padding:5px 10px;
+  overflow: auto;
+  display: flex;
+  .card-left{
+    .index{
+      display: inline-block;
+      width: 20px;
+      line-height: 20px;
+      background-color: #cfe3fa;
+      text-align: center;
+      border-radius: 20px;
+      margin: 3px 10px 0px 0px;
+    }
+  }
+  .card-right{
+    flex:1
+  }
+  .card-title{
+    font-size:16px;
+    font-weight: bold;
+    line-height: 25px;
+  }
+  .card-detail{
+    line-height:25px;
+  }
+  &:hover{
+    cursor:pointer;
+    background-color: #fafafa;
+  }
+}
+</style>
diff --git a/src/views/wellManage/components/movePostion.vue b/src/views/wellManage/components/movePostion.vue
new file mode 100644
index 0000000..34f9af8
--- /dev/null
+++ b/src/views/wellManage/components/movePostion.vue
@@ -0,0 +1,98 @@
+<!--
+ * @Description: 井信息弹窗
+ * @Author: 王晓颖
+ * @Date: 2022-05-13
+ -->
+<template>
+  <div class="info-window">
+    <div class="info-header">
+      {{ wellInfo.wellCode }}
+    </div>
+    <div class="info-body">
+      <el-row v-if="showMoveBtn">
+        <el-col>
+          <el-button @click="moveLonLatClick">
+            位置纠偏
+          </el-button>
+        </el-col>
+      </el-row>
+      <el-row v-else>
+        <el-row :gutter="10">
+          <el-col :span="12">
+            <el-input v-model.trim="deviceForm.lng" placeholder="经度" clearable />
+          </el-col>
+          <el-col :span="12">
+            <el-input v-model.trim="deviceForm.lat" placeholder="纬度" clearable />
+          </el-col>
+        </el-row>
+        <el-row style="margin:10px 0">
+          <el-col>
+            <el-input v-model.trim="deviceForm.address" placeholder="详细地址" clearable />
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-button @click="sureClick">
+            保存
+          </el-button>
+          <el-button @click="cancelClick">
+            取消
+          </el-button>
+        </el-row>
+      </el-row>
+    </div>
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: 'MovePostion',
+  props: {
+    wellInfo: {
+      type: Object,
+      required: true
+    }
+  },
+  data() {
+    return {
+      showMoveBtn: true,
+      deviceForm: {
+        lng: '',
+        lat: '',
+        address: ''
+      }
+    }
+  },
+  methods: {
+    moveLonLatClick() {
+      this.showMoveBtn = false
+      this.$emit('sure-moveLonLat', true)
+    },
+    cancelClick() {
+      this.showMoveBtn = true
+      this.$emit('cancel-moveLonLat', false)
+    },
+    sureClick() {
+      this.showMoveBtn = true
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.info-window{
+  max-width: 260px;
+  min-width: 200px;
+  .info-header{
+    padding: 10px 10px 5px 10px;
+    line-height: 30px;
+    font-weight: bold;
+    /*background-color: #eaf4ff;*/
+  }
+  .info-body{
+    padding: 5px 10px 10px 10px;
+    line-height: 23px;
+    font-size: 14px;
+  }
+}
+</style>

diff --git a/mock/system/user.js b/mock/system/user.js
index 43c5f16..abd593d 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -163,6 +163,7 @@
     { 'code': 'well_update', 'icon': '', 'id': '1138615123652091905', 'ismenu': '0', 'levels': 2, 'name': '修改窨井', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '04', 'url': '/well/update' },
     { 'code': 'liquid_config_export', 'icon': '', 'id': '1138691921802915842', 'ismenu': '0', 'levels': 2, 'name': '液位配置批量导出', 'num': 0, 'parentId': '1138690889324654593', 'resourceType': '04', 'url': '/busConfig/liquidConfig/batchExport' },
     { 'code': 'well_list', 'icon': '', 'id': '1138615485519863810', 'ismenu': '1', 'levels': 2, 'name': '窨井列表', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '03', 'url': '/well/list' },
+    { 'code': 'well_list', 'icon': '', 'id': '1138615485519863812', 'ismenu': '1', 'levels': 2, 'name': '窨井位置纠偏', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '03', 'url': '/well/location' },
     { 'code': 'gas_config_config', 'icon': '', 'id': '1177427682888646657', 'ismenu': '0', 'levels': 2, 'name': '燃气下发配置', 'num': 0, 'parentId': '1138690889324654593', 'resourceType': '04', 'url': '/busConfig/gasConfig/config' },
     { 'code': 'well_batchexport', 'icon': '', 'id': '1138615953230897154', 'ismenu': '0', 'levels': 2, 'name': '批量导出窨井', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '04', 'url': '/well/batchExport' },
     { 'code': 'dig_config_list', 'icon': '', 'id': '1177429930704240641', 'ismenu': '0', 'levels': 2, 'name': '开挖监测仪配置列表', 'num': 0, 'parentId': '1138690889324654593', 'resourceType': '04', 'url': '/busConfig/digConfig/list' },
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 14860e4..b5b6e82 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -101,6 +101,12 @@
         name: 'AddWell',
         component: () => import('@/views/wellManage/addWell'),
         meta: { title: '新增窨井', icon: 'icon-config', permission: ['/well/add'] }
+      },
+      {
+        path: '/wellLocation',
+        name: 'WellLocation',
+        component: () => import('@/views/wellManage/postionCorrectWell'),
+        meta: { title: '窨井位置纠偏', icon: 'icon-config', permission: ['/well/location'] }
       }
     ]
   },
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index f6c3f24..71fa2d9 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -180,6 +180,6 @@
     width: 100%;
   }
   .el-date-editor{
-    width: 100%;
+    width: 100%;display: flex;
   }
 </style>
diff --git a/src/views/wellManage/components/infoWindowWell.vue b/src/views/wellManage/components/infoWindowWell.vue
new file mode 100644
index 0000000..b18edf3
--- /dev/null
+++ b/src/views/wellManage/components/infoWindowWell.vue
@@ -0,0 +1,47 @@
+<!--
+ * @Description: 井信息弹窗
+ * @Author: 王晓颖
+ * @Date: 2022-05-13
+ -->
+<template>
+  <div class="info-window">
+    <div class="info-header">
+      {{ wellInfo.wellCode }}
+    </div>
+    <div class="info-body">
+      <div>井类型：{{ wellInfo.wellTypeName }}</div>
+      <div>权属单位：{{ wellInfo.deptName }}</div>
+      <div>详细地址：{{ wellInfo.position }}</div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'WellInfoWindow',
+  props: {
+    wellInfo: {
+      type: Object,
+      required: true
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.info-window{
+  max-width: 260px;
+  min-width: 200px;
+  .info-header{
+    padding: 10px 10px 5px 10px;
+    line-height: 30px;
+    font-weight: bold;
+    /*background-color: #eaf4ff;*/
+  }
+  .info-body{
+    padding: 5px 10px 10px 10px;
+    line-height: 23px;
+    font-size: 14px;
+  }
+}
+</style>
diff --git a/src/views/wellManage/components/mapSearchComp.vue b/src/views/wellManage/components/mapSearchComp.vue
new file mode 100644
index 0000000..22ef568
--- /dev/null
+++ b/src/views/wellManage/components/mapSearchComp.vue
@@ -0,0 +1,134 @@
+<!--
+ * @Description: 搜索组件
+ * @Author: 王晓颖
+ * @Date: 2022-05-18
+ -->
+<template>
+  <div class="map-search-div">
+    <!--搜索条件-->
+    <div>
+      <el-input v-model.trim="keywords" :placeholder="placeholder" clearable>
+        <el-button slot="append" class="filter-item" type="primary" icon="el-icon-search" @click="search">
+          搜索
+        </el-button>
+      </el-input>
+    </div>
+    <!--搜索结果弹出框-->
+    <el-popover
+      v-show="list.length>0"
+      v-model="resultShow"
+      placement="bottom-end"
+      width="311"
+      trigger="manual"
+    >
+      <div slot="reference" class="select-answer" @click="resultShow = !resultShow">
+        共找到 {{ list.length }} 个符合条件的{{ name }}
+      </div>
+      <div class="list-div">
+        <map-search-item v-for="(data,index) in currentPageList" :key="'search-item-'+index" :data="data" :index="index" @click="clickItem" />
+      </div>
+      <el-pagination
+        :total="list.length"
+        :current-page="pageNum"
+        :page-size="pageSize"
+        :hide-on-single-page="true"
+        small
+        layout="prev, pager, next"
+        @current-change="changePage"
+      />
+    </el-popover>
+  </div>
+</template>
+
+<script>
+import MapSearchItem from './mapSearchItem'
+export default {
+  name: 'SearchComp',
+  components: { MapSearchItem },
+  props: {
+    name: {
+      type: String,
+      default: '井'
+    }, // 结果展示类型
+    placeholder: {
+      type: String,
+      default: '关键字'
+    },
+    list: {
+      type: Array,
+      default: () => []
+    } // 结果列表
+  },
+  data() {
+    return {
+      resultShow: false, // 是否显示查询结果
+      keywords: '', // 查询条件
+      currentPageList: [], // 当前页数据
+      pageSize: 5, // 页面容量
+      pageNum: 1 // 页码
+    }
+  },
+  watch: {
+    keywords(val) {
+      if (val === '') {
+        this.currentPageList = []
+        this.pageNum = 1
+        this.resultShow = false
+        this.$emit('clear')
+      }
+    },
+    list(val) { // 监控list的数量，为0时不显示
+      if (val && val.length > 0) {
+        this.resultShow = true
+        this.changePage(1)
+      } else {
+        this.resultShow = false
+        this.currentPageList = []
+      }
+    }
+  },
+  methods: {
+    // 点击搜索按钮
+    search() {
+      this.$emit('search', this.keywords)
+    },
+    // 切换页码
+    changePage(val) {
+      const offset = val
+      const start = (offset - 1) * this.pageSize
+      const end = start + this.pageSize
+      this.currentPageList = this.list.slice(start, end)
+      this.$emit('change-page', this.currentPageList)
+    },
+    // 点击结果项
+    clickItem(item) {
+      this.$emit('click-item', item)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.map-search-div{
+  position: absolute;
+  z-index: 100;
+  left: 30px;
+  top: 5px;
+  .select-answer{
+    position: relative;
+    margin-top: 5px;
+    font-size:14px;
+    padding: 10px 20px;
+    width: 311px;
+    color: #606266;
+    background-color: #FFFFFF;
+    border: 1px solid #EBEEF5;
+    border-radius: 4px;
+    box-shadow: 0 2px 12px 0 rgba(0,0,0,.1)
+  }
+  .list-div{
+    background-color: #FFFFFF;
+  }
+}
+
+</style>
diff --git a/src/views/wellManage/components/mapSearchItem.vue b/src/views/wellManage/components/mapSearchItem.vue
new file mode 100644
index 0000000..5cdce0d
--- /dev/null
+++ b/src/views/wellManage/components/mapSearchItem.vue
@@ -0,0 +1,89 @@
+<!--
+ * @Description: 搜索结果项组件
+ * @Author: 王晓颖
+ * @Date: 2022-05-18
+ -->
+<template>
+  <div :key="data[props.label]" class="search-card" @click="clickItem()">
+    <div class="card-left">
+      <span class="index">{{ index+1 }}</span>
+    </div>
+    <div class="card-right">
+      <div class="card-title">
+        {{ data[props.label] }}-{{ data[props.name] }}
+      </div>
+      <div class="card-content">
+        <span class="card-detail">{{ data[props.detail] }}</span>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'SearchItem',
+  props: {
+    data: {
+      type: Object,
+      required: true
+    },
+    index: {
+      type: Number | String,
+      required: true
+    },
+    props: {
+      type: Object,
+      default: () => {
+        return {
+          label: 'wellCode',
+          name: 'wellName',
+          detail: 'position'
+        }
+      }
+    }
+  },
+  data() {
+    return {
+    }
+  },
+  methods: {
+    clickItem() {
+      this.$emit('click', this.data)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.search-card{
+  padding:5px 10px;
+  overflow: auto;
+  display: flex;
+  .card-left{
+    .index{
+      display: inline-block;
+      width: 20px;
+      line-height: 20px;
+      background-color: #cfe3fa;
+      text-align: center;
+      border-radius: 20px;
+      margin: 3px 10px 0px 0px;
+    }
+  }
+  .card-right{
+    flex:1
+  }
+  .card-title{
+    font-size:16px;
+    font-weight: bold;
+    line-height: 25px;
+  }
+  .card-detail{
+    line-height:25px;
+  }
+  &:hover{
+    cursor:pointer;
+    background-color: #fafafa;
+  }
+}
+</style>
diff --git a/src/views/wellManage/components/movePostion.vue b/src/views/wellManage/components/movePostion.vue
new file mode 100644
index 0000000..34f9af8
--- /dev/null
+++ b/src/views/wellManage/components/movePostion.vue
@@ -0,0 +1,98 @@
+<!--
+ * @Description: 井信息弹窗
+ * @Author: 王晓颖
+ * @Date: 2022-05-13
+ -->
+<template>
+  <div class="info-window">
+    <div class="info-header">
+      {{ wellInfo.wellCode }}
+    </div>
+    <div class="info-body">
+      <el-row v-if="showMoveBtn">
+        <el-col>
+          <el-button @click="moveLonLatClick">
+            位置纠偏
+          </el-button>
+        </el-col>
+      </el-row>
+      <el-row v-else>
+        <el-row :gutter="10">
+          <el-col :span="12">
+            <el-input v-model.trim="deviceForm.lng" placeholder="经度" clearable />
+          </el-col>
+          <el-col :span="12">
+            <el-input v-model.trim="deviceForm.lat" placeholder="纬度" clearable />
+          </el-col>
+        </el-row>
+        <el-row style="margin:10px 0">
+          <el-col>
+            <el-input v-model.trim="deviceForm.address" placeholder="详细地址" clearable />
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-button @click="sureClick">
+            保存
+          </el-button>
+          <el-button @click="cancelClick">
+            取消
+          </el-button>
+        </el-row>
+      </el-row>
+    </div>
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: 'MovePostion',
+  props: {
+    wellInfo: {
+      type: Object,
+      required: true
+    }
+  },
+  data() {
+    return {
+      showMoveBtn: true,
+      deviceForm: {
+        lng: '',
+        lat: '',
+        address: ''
+      }
+    }
+  },
+  methods: {
+    moveLonLatClick() {
+      this.showMoveBtn = false
+      this.$emit('sure-moveLonLat', true)
+    },
+    cancelClick() {
+      this.showMoveBtn = true
+      this.$emit('cancel-moveLonLat', false)
+    },
+    sureClick() {
+      this.showMoveBtn = true
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.info-window{
+  max-width: 260px;
+  min-width: 200px;
+  .info-header{
+    padding: 10px 10px 5px 10px;
+    line-height: 30px;
+    font-weight: bold;
+    /*background-color: #eaf4ff;*/
+  }
+  .info-body{
+    padding: 5px 10px 10px 10px;
+    line-height: 23px;
+    font-size: 14px;
+  }
+}
+</style>
diff --git a/src/views/wellManage/editWell copy 2.vue b/src/views/wellManage/editWell copy 2.vue
deleted file mode 100644
index 76ad5e6..0000000
--- a/src/views/wellManage/editWell copy 2.vue
+++ /dev/null
@@ -1,54 +0,0 @@
-<template>
-  <el-dialog :visible.sync="dialogFormVisible" class="editDialog" append-to-body>
-    <el-row>
-      <el-col class="overview-map-container">
-        <a-map-container
-          ref="map"
-          :center="center"
-          :zoom="zoom"
-          :base-layer="baseLayer"
-          :style="{height:(bodyHeight-200)+'px'}"
-          vid="overview"
-          class="map-demo"
-          @ready="mapReady"
-        />
-      </el-col>
-    </el-row>
-  </el-dialog>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-import AMapContainer from '@/components/Amap/AMapContainer'
-export default {
-  components: { AMapContainer },
-  data() {
-    return {
-      dialogFormVisible: false,
-      map: null, // 地图对象
-      baseLayer: 'gaode_vec', // 底图图层
-      center: [this.$store.getters.lng, this.$store.getters.lat], // 地图中心
-      zoom: 12
-    }
-  },
-  computed: {
-    ...mapGetters([
-      'bodyHeight'
-    ])
-  },
-  methods: {
-    // 初始化放这里
-    mapReady(map) {
-      this.map = map
-      map.on('click', function(e) {
-        console.log(e)
-      })
-    },
-    // 初始化对话框
-    initDialog: function(dialogFormVisible, row = null) {
-      this.dialogFormVisible = dialogFormVisible
-    }
-  }
-}
-</script>
-

diff --git a/mock/system/user.js b/mock/system/user.js
index 43c5f16..abd593d 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -163,6 +163,7 @@
     { 'code': 'well_update', 'icon': '', 'id': '1138615123652091905', 'ismenu': '0', 'levels': 2, 'name': '修改窨井', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '04', 'url': '/well/update' },
     { 'code': 'liquid_config_export', 'icon': '', 'id': '1138691921802915842', 'ismenu': '0', 'levels': 2, 'name': '液位配置批量导出', 'num': 0, 'parentId': '1138690889324654593', 'resourceType': '04', 'url': '/busConfig/liquidConfig/batchExport' },
     { 'code': 'well_list', 'icon': '', 'id': '1138615485519863810', 'ismenu': '1', 'levels': 2, 'name': '窨井列表', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '03', 'url': '/well/list' },
+    { 'code': 'well_list', 'icon': '', 'id': '1138615485519863812', 'ismenu': '1', 'levels': 2, 'name': '窨井位置纠偏', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '03', 'url': '/well/location' },
     { 'code': 'gas_config_config', 'icon': '', 'id': '1177427682888646657', 'ismenu': '0', 'levels': 2, 'name': '燃气下发配置', 'num': 0, 'parentId': '1138690889324654593', 'resourceType': '04', 'url': '/busConfig/gasConfig/config' },
     { 'code': 'well_batchexport', 'icon': '', 'id': '1138615953230897154', 'ismenu': '0', 'levels': 2, 'name': '批量导出窨井', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '04', 'url': '/well/batchExport' },
     { 'code': 'dig_config_list', 'icon': '', 'id': '1177429930704240641', 'ismenu': '0', 'levels': 2, 'name': '开挖监测仪配置列表', 'num': 0, 'parentId': '1138690889324654593', 'resourceType': '04', 'url': '/busConfig/digConfig/list' },
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 14860e4..b5b6e82 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -101,6 +101,12 @@
         name: 'AddWell',
         component: () => import('@/views/wellManage/addWell'),
         meta: { title: '新增窨井', icon: 'icon-config', permission: ['/well/add'] }
+      },
+      {
+        path: '/wellLocation',
+        name: 'WellLocation',
+        component: () => import('@/views/wellManage/postionCorrectWell'),
+        meta: { title: '窨井位置纠偏', icon: 'icon-config', permission: ['/well/location'] }
       }
     ]
   },
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index f6c3f24..71fa2d9 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -180,6 +180,6 @@
     width: 100%;
   }
   .el-date-editor{
-    width: 100%;
+    width: 100%;display: flex;
   }
 </style>
diff --git a/src/views/wellManage/components/infoWindowWell.vue b/src/views/wellManage/components/infoWindowWell.vue
new file mode 100644
index 0000000..b18edf3
--- /dev/null
+++ b/src/views/wellManage/components/infoWindowWell.vue
@@ -0,0 +1,47 @@
+<!--
+ * @Description: 井信息弹窗
+ * @Author: 王晓颖
+ * @Date: 2022-05-13
+ -->
+<template>
+  <div class="info-window">
+    <div class="info-header">
+      {{ wellInfo.wellCode }}
+    </div>
+    <div class="info-body">
+      <div>井类型：{{ wellInfo.wellTypeName }}</div>
+      <div>权属单位：{{ wellInfo.deptName }}</div>
+      <div>详细地址：{{ wellInfo.position }}</div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'WellInfoWindow',
+  props: {
+    wellInfo: {
+      type: Object,
+      required: true
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.info-window{
+  max-width: 260px;
+  min-width: 200px;
+  .info-header{
+    padding: 10px 10px 5px 10px;
+    line-height: 30px;
+    font-weight: bold;
+    /*background-color: #eaf4ff;*/
+  }
+  .info-body{
+    padding: 5px 10px 10px 10px;
+    line-height: 23px;
+    font-size: 14px;
+  }
+}
+</style>
diff --git a/src/views/wellManage/components/mapSearchComp.vue b/src/views/wellManage/components/mapSearchComp.vue
new file mode 100644
index 0000000..22ef568
--- /dev/null
+++ b/src/views/wellManage/components/mapSearchComp.vue
@@ -0,0 +1,134 @@
+<!--
+ * @Description: 搜索组件
+ * @Author: 王晓颖
+ * @Date: 2022-05-18
+ -->
+<template>
+  <div class="map-search-div">
+    <!--搜索条件-->
+    <div>
+      <el-input v-model.trim="keywords" :placeholder="placeholder" clearable>
+        <el-button slot="append" class="filter-item" type="primary" icon="el-icon-search" @click="search">
+          搜索
+        </el-button>
+      </el-input>
+    </div>
+    <!--搜索结果弹出框-->
+    <el-popover
+      v-show="list.length>0"
+      v-model="resultShow"
+      placement="bottom-end"
+      width="311"
+      trigger="manual"
+    >
+      <div slot="reference" class="select-answer" @click="resultShow = !resultShow">
+        共找到 {{ list.length }} 个符合条件的{{ name }}
+      </div>
+      <div class="list-div">
+        <map-search-item v-for="(data,index) in currentPageList" :key="'search-item-'+index" :data="data" :index="index" @click="clickItem" />
+      </div>
+      <el-pagination
+        :total="list.length"
+        :current-page="pageNum"
+        :page-size="pageSize"
+        :hide-on-single-page="true"
+        small
+        layout="prev, pager, next"
+        @current-change="changePage"
+      />
+    </el-popover>
+  </div>
+</template>
+
+<script>
+import MapSearchItem from './mapSearchItem'
+export default {
+  name: 'SearchComp',
+  components: { MapSearchItem },
+  props: {
+    name: {
+      type: String,
+      default: '井'
+    }, // 结果展示类型
+    placeholder: {
+      type: String,
+      default: '关键字'
+    },
+    list: {
+      type: Array,
+      default: () => []
+    } // 结果列表
+  },
+  data() {
+    return {
+      resultShow: false, // 是否显示查询结果
+      keywords: '', // 查询条件
+      currentPageList: [], // 当前页数据
+      pageSize: 5, // 页面容量
+      pageNum: 1 // 页码
+    }
+  },
+  watch: {
+    keywords(val) {
+      if (val === '') {
+        this.currentPageList = []
+        this.pageNum = 1
+        this.resultShow = false
+        this.$emit('clear')
+      }
+    },
+    list(val) { // 监控list的数量，为0时不显示
+      if (val && val.length > 0) {
+        this.resultShow = true
+        this.changePage(1)
+      } else {
+        this.resultShow = false
+        this.currentPageList = []
+      }
+    }
+  },
+  methods: {
+    // 点击搜索按钮
+    search() {
+      this.$emit('search', this.keywords)
+    },
+    // 切换页码
+    changePage(val) {
+      const offset = val
+      const start = (offset - 1) * this.pageSize
+      const end = start + this.pageSize
+      this.currentPageList = this.list.slice(start, end)
+      this.$emit('change-page', this.currentPageList)
+    },
+    // 点击结果项
+    clickItem(item) {
+      this.$emit('click-item', item)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.map-search-div{
+  position: absolute;
+  z-index: 100;
+  left: 30px;
+  top: 5px;
+  .select-answer{
+    position: relative;
+    margin-top: 5px;
+    font-size:14px;
+    padding: 10px 20px;
+    width: 311px;
+    color: #606266;
+    background-color: #FFFFFF;
+    border: 1px solid #EBEEF5;
+    border-radius: 4px;
+    box-shadow: 0 2px 12px 0 rgba(0,0,0,.1)
+  }
+  .list-div{
+    background-color: #FFFFFF;
+  }
+}
+
+</style>
diff --git a/src/views/wellManage/components/mapSearchItem.vue b/src/views/wellManage/components/mapSearchItem.vue
new file mode 100644
index 0000000..5cdce0d
--- /dev/null
+++ b/src/views/wellManage/components/mapSearchItem.vue
@@ -0,0 +1,89 @@
+<!--
+ * @Description: 搜索结果项组件
+ * @Author: 王晓颖
+ * @Date: 2022-05-18
+ -->
+<template>
+  <div :key="data[props.label]" class="search-card" @click="clickItem()">
+    <div class="card-left">
+      <span class="index">{{ index+1 }}</span>
+    </div>
+    <div class="card-right">
+      <div class="card-title">
+        {{ data[props.label] }}-{{ data[props.name] }}
+      </div>
+      <div class="card-content">
+        <span class="card-detail">{{ data[props.detail] }}</span>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'SearchItem',
+  props: {
+    data: {
+      type: Object,
+      required: true
+    },
+    index: {
+      type: Number | String,
+      required: true
+    },
+    props: {
+      type: Object,
+      default: () => {
+        return {
+          label: 'wellCode',
+          name: 'wellName',
+          detail: 'position'
+        }
+      }
+    }
+  },
+  data() {
+    return {
+    }
+  },
+  methods: {
+    clickItem() {
+      this.$emit('click', this.data)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.search-card{
+  padding:5px 10px;
+  overflow: auto;
+  display: flex;
+  .card-left{
+    .index{
+      display: inline-block;
+      width: 20px;
+      line-height: 20px;
+      background-color: #cfe3fa;
+      text-align: center;
+      border-radius: 20px;
+      margin: 3px 10px 0px 0px;
+    }
+  }
+  .card-right{
+    flex:1
+  }
+  .card-title{
+    font-size:16px;
+    font-weight: bold;
+    line-height: 25px;
+  }
+  .card-detail{
+    line-height:25px;
+  }
+  &:hover{
+    cursor:pointer;
+    background-color: #fafafa;
+  }
+}
+</style>
diff --git a/src/views/wellManage/components/movePostion.vue b/src/views/wellManage/components/movePostion.vue
new file mode 100644
index 0000000..34f9af8
--- /dev/null
+++ b/src/views/wellManage/components/movePostion.vue
@@ -0,0 +1,98 @@
+<!--
+ * @Description: 井信息弹窗
+ * @Author: 王晓颖
+ * @Date: 2022-05-13
+ -->
+<template>
+  <div class="info-window">
+    <div class="info-header">
+      {{ wellInfo.wellCode }}
+    </div>
+    <div class="info-body">
+      <el-row v-if="showMoveBtn">
+        <el-col>
+          <el-button @click="moveLonLatClick">
+            位置纠偏
+          </el-button>
+        </el-col>
+      </el-row>
+      <el-row v-else>
+        <el-row :gutter="10">
+          <el-col :span="12">
+            <el-input v-model.trim="deviceForm.lng" placeholder="经度" clearable />
+          </el-col>
+          <el-col :span="12">
+            <el-input v-model.trim="deviceForm.lat" placeholder="纬度" clearable />
+          </el-col>
+        </el-row>
+        <el-row style="margin:10px 0">
+          <el-col>
+            <el-input v-model.trim="deviceForm.address" placeholder="详细地址" clearable />
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-button @click="sureClick">
+            保存
+          </el-button>
+          <el-button @click="cancelClick">
+            取消
+          </el-button>
+        </el-row>
+      </el-row>
+    </div>
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: 'MovePostion',
+  props: {
+    wellInfo: {
+      type: Object,
+      required: true
+    }
+  },
+  data() {
+    return {
+      showMoveBtn: true,
+      deviceForm: {
+        lng: '',
+        lat: '',
+        address: ''
+      }
+    }
+  },
+  methods: {
+    moveLonLatClick() {
+      this.showMoveBtn = false
+      this.$emit('sure-moveLonLat', true)
+    },
+    cancelClick() {
+      this.showMoveBtn = true
+      this.$emit('cancel-moveLonLat', false)
+    },
+    sureClick() {
+      this.showMoveBtn = true
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.info-window{
+  max-width: 260px;
+  min-width: 200px;
+  .info-header{
+    padding: 10px 10px 5px 10px;
+    line-height: 30px;
+    font-weight: bold;
+    /*background-color: #eaf4ff;*/
+  }
+  .info-body{
+    padding: 5px 10px 10px 10px;
+    line-height: 23px;
+    font-size: 14px;
+  }
+}
+</style>
diff --git a/src/views/wellManage/editWell copy 2.vue b/src/views/wellManage/editWell copy 2.vue
deleted file mode 100644
index 76ad5e6..0000000
--- a/src/views/wellManage/editWell copy 2.vue
+++ /dev/null
@@ -1,54 +0,0 @@
-<template>
-  <el-dialog :visible.sync="dialogFormVisible" class="editDialog" append-to-body>
-    <el-row>
-      <el-col class="overview-map-container">
-        <a-map-container
-          ref="map"
-          :center="center"
-          :zoom="zoom"
-          :base-layer="baseLayer"
-          :style="{height:(bodyHeight-200)+'px'}"
-          vid="overview"
-          class="map-demo"
-          @ready="mapReady"
-        />
-      </el-col>
-    </el-row>
-  </el-dialog>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-import AMapContainer from '@/components/Amap/AMapContainer'
-export default {
-  components: { AMapContainer },
-  data() {
-    return {
-      dialogFormVisible: false,
-      map: null, // 地图对象
-      baseLayer: 'gaode_vec', // 底图图层
-      center: [this.$store.getters.lng, this.$store.getters.lat], // 地图中心
-      zoom: 12
-    }
-  },
-  computed: {
-    ...mapGetters([
-      'bodyHeight'
-    ])
-  },
-  methods: {
-    // 初始化放这里
-    mapReady(map) {
-      this.map = map
-      map.on('click', function(e) {
-        console.log(e)
-      })
-    },
-    // 初始化对话框
-    initDialog: function(dialogFormVisible, row = null) {
-      this.dialogFormVisible = dialogFormVisible
-    }
-  }
-}
-</script>
-
diff --git a/src/views/wellManage/editWell copy.vue b/src/views/wellManage/editWell copy.vue
deleted file mode 100644
index dd624c3..0000000
--- a/src/views/wellManage/editWell copy.vue
+++ /dev/null
@@ -1,606 +0,0 @@
-<template>
-  <el-dialog :visible.sync="dialogFormVisible" class="editDialog" title="编辑井" append-to-body @close="cancel">
-    <el-scrollbar :native="false">
-      <el-form ref="dataForm" :label-position="labelPosition" :rules="rules" :model="wellForm" label-width="120px">
-        <el-row>
-          <el-col :span="10">
-            <el-form-item label="井名称" prop="wellName">
-              <el-input v-model.trim="wellForm.wellName" type="text" placeholder="必填" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="10" :offset="1">
-            <el-form-item label="井编号" prop="wellCode">
-              <el-input v-model.trim="wellForm.wellCode" :disabled="isEditMode" type="text" placeholder="必填" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="10">
-            <el-form-item label="井类型" prop="wellType">
-              <el-select v-model="wellForm.wellType" placeholder="点击选择井类型" clearable>
-                <el-option
-                  v-for="item in wellTypeList"
-                  :key="item.value"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="10" :offset="1">
-            <el-form-item label="权属单位" prop="deptid">
-              <dept-select v-model="wellForm.deptid" :need-top="deptShowTop" :dept-show="deptShow" dept-type="03" placeholder="选择权属单位" @change="deptChanged" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="10">
-            <el-form-item label="井深(m)" prop="deep">
-              <el-input v-model.trim="wellForm.deep" type="text" placeholder="需要装液位监测仪的井必填" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col class="overview-map-container">
-            <a-map-container
-              ref="map"
-              :center="center"
-              :zoom="zoom"
-              :base-layer="baseLayer"
-              :style="{height:(bodyHeight-200)+'px'}"
-              vid="overview"
-              class="map-demo"
-              @ready="mapReady"
-            />
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="10">
-            <el-form-item label="经度" prop="coordinateX">
-              <el-input v-model.trim="wellForm.coordinateX" type="text" placeholder="必填" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="10" :offset="1">
-            <el-form-item label="纬度" prop="coordinateY">
-              <el-input v-model.trim="wellForm.coordinateY" type="text" placeholder="必填" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="路标图片" prop="images">
-              <el-upload
-                ref="upload"
-                :before-upload="handleBeforeUpload"
-                :on-preview="handlePictureCardPreview"
-                :on-remove="handleRemove"
-                :on-exceed="handleExceed"
-                :on-change="handleChange"
-                :http-request="uploadFile"
-                :file-list="imageList"
-                :limit="4"
-                :class="{hide:hideUpload}"
-                multiple
-                action="string"
-                accept=".jpg,.jpeg,.png "
-                list-type="picture-card"
-              >
-                <i class="el-icon-plus" />
-              </el-upload>
-              <el-dialog :visible.sync="dialogVisible" title="图片预览" append-to-body>
-                <div class="imgBox">
-                  <img :src="dialogImageUrl" max-height="400px;" alt="" style="margin: 0 auto;">
-                </div>
-              </el-dialog>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="1">
-          <el-form-item label="所在区域" required>
-            <el-col :span="5">
-              <el-form-item prop="qu">
-                <el-select v-model="wellForm.qu" :disabled="showResponseDept" placeholder="请选择所在区/县" clearable @change="quChanged">
-                  <el-option
-                    v-for="item in quList"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="1" class="line">
-              区/县
-            </el-col>
-            <el-col :span="5">
-              <el-form-item prop="area">
-                <el-select v-model="wellForm.area" :disabled="showResponseDept" placeholder="请选择所在街道/镇" clearable>
-                  <el-option
-                    v-for="item in jiedaoList"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="1" class="line">
-              街道/镇
-            </el-col>
-          </el-form-item>
-        </el-row>
-        <el-row>
-          <el-col :span="15">
-            <el-form-item label="详细地址" prop="position">
-              <el-input v-model.trim="wellForm.position" type="text" placeholder="必填" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row v-show="secondDeptTreeList.length>=1" :gutter="20">
-          <el-col :span="13">
-            <el-form-item label="井维护机构" prop="responsibleDept">
-              <el-select v-if="secondDeptTreeList.length>=1" v-model="wellForm.responsibleDept" :disabled="showResponseDept" placeholder="选择维护组织，不选默认为权属单位" clearable>
-                <el-option
-                  v-for="item in secondDeptTreeList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-              <el-input v-else v-model="wellForm.responsibleDeptName" type="text" placeholder="未知" disabled />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="15" style="margin-left: 120px; margin-bottom: 40px;">
-            <el-button size="medium" @click="cancel">
-              取消
-            </el-button>
-            <el-button type="primary" size="medium" style="margin-left: 10px;" @click="saveData">
-              保存
-            </el-button>
-          </el-col>
-        </el-row>
-      </el-form>
-    </el-scrollbar>
-  </el-dialog>
-</template>
-
-<script>
-import { toTreeList } from '@/utils/structure'
-import { getDeptTreeList } from '@/api/system/dept'
-import { getAreaList, getAreaByDept } from '@/api/system/area'
-import { getWellType, updateWell } from '@/api/well/well'
-import { Uploadimg } from '@/api/common'
-import DeptSelect from '@/components/DeptSelect'
-import { mapGetters } from 'vuex'
-import AMapContainer from '@/components/Amap/AMapContainer'
-import AMapLoader from '@amap/amap-jsapi-loader'
-
-export default {
-  name: 'EditWell',
-  components: { DeptSelect, AMapContainer },
-  data() {
-    const validateDeep = (rule, value, callback) => {
-      if (value !== '') {
-        if ((/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/).test(value) === false) {
-          callback(new Error('请填写大于0的数字'))
-        } else {
-          const deep = parseFloat(value)
-          if (deep > 10 || deep < 0) {
-            callback(new Error('请填写0到10数值'))
-          } else {
-            callback()
-          }
-        }
-      } else {
-        callback()
-      }
-    }
-    const validateLng = (rule, value, callback) => {
-      if (value !== '') {
-        if ((/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/).test(value) === false) {
-          callback(new Error('请填写大于0的数字'))
-        } else {
-          callback()
-        }
-      } else {
-        callback(new Error('经度不能为空'))
-      }
-    }
-    const validateLat = (rule, value, callback) => {
-      if (value !== '') {
-        if ((/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/).test(value) === false) {
-          callback(new Error('请填写大于0的数字'))
-        } else {
-          callback()
-        }
-      } else {
-        callback(new Error('纬度不能为空'))
-      }
-    }
-    return {
-      map: null, // 地图对象
-      baseLayer: 'gaode_vec', // 底图图层
-      center: [this.$store.getters.lng, this.$store.getters.lat], // 地图中心
-      zoom: 12,
-      dialogFormVisible: false, // 对话框是否显示
-      wellForm: {
-        id: null, // 井id
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
-        wellType: '', // 井类型
-        deptid: '', // 权属单位
-        deep: '', // 井深，
-        position: '', // 位置描述
-        coordinateX: '', // 经度
-        coordinateY: '', // 纬度
-        photos: '', // 照片路径
-        notes: '', // 备注,
-        qu: '',
-        area: '', // 街道
-        responsibleDept: '', // 维护人员部门
-        responsibleDeptName: '' // 维护人员部门
-      }, // 表单
-      deptProps: {
-        parent: 'pid',
-        value: 'id',
-        label: 'name',
-        children: 'children'
-      },
-      hideUpload: false,
-      imageList: [],
-      secondDeptTreeList: [], // 二级组织树列表
-      wellTypeList: [],
-      quList: [],
-      jiedaoList: [],
-      textMap: {
-        update: '编辑',
-        create: '新增'
-      }, // 表头显示标题
-      rules: {
-        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
-        wellName: [{ required: true, message: '井名称不能为空', trigger: ['blur', 'change'] }],
-        position: [{ required: true, message: '井详细地址不能为空', trigger: ['blur', 'change'] }],
-        deep: [{ required: false, trigger: ['blur', 'change'], validator: validateDeep }],
-        coordinateX: [{ required: true, trigger: ['blur', 'change'], validator: validateLat }],
-        coordinateY: [{ required: true, trigger: ['blur', 'change'], validator: validateLng }],
-        deptid: [{ required: true, message: '权属单位必选', trigger: 'change' }],
-        wellType: [{ required: true, message: '井类型必选', trigger: 'change' }],
-        qu: [{ required: true, message: '所在区/县必选', trigger: 'change' }],
-        area: [{ required: true, message: '所在街道/镇必选', trigger: 'change' }]
-      },
-      deptShowTop: false, // 权属单位下拉是否显示顶级
-      dialogImageUrl: '',
-      dialogVisible: false,
-      labelPosition: 'right',
-      responseAssignShow: false,
-      isEditMode: true,
-      deptShow: true
-    }
-  },
-  computed: {
-    ...mapGetters([
-      'bodyHeight'
-    ]),
-    showResponseDept() {
-      if (this.wellForm.deptid === '') {
-        return true
-      } else {
-        return false
-      }
-    },
-    qu() { // 获取区
-      return this.wellForm.qu
-    },
-    area() { // 获取街道
-      return this.wellForm.area
-    },
-    lonLat() {
-      return this.wellForm.coordinateX + ',' + this.wellForm.coordinateY
-    }
-  },
-  watch: {
-    lonLat(val) {
-      var _this = this
-      window._AMapSecurityConfig = {
-        securityJsCode: this.$store.getters.amapSecurityCode
-      }
-      AMapLoader.load({
-        key: this.$store.getters.amapKey // 秘钥，从store中取
-      }).then((AMap) => {
-        AMap.plugin('AMap.Geocoder', function() {
-          var geocoder = new AMap.Geocoder({
-            city: ''
-          })
-          var lnglat = val.split(',')
-          geocoder.getAddress(lnglat, function(status, result) {
-            if (status === 'complete' && result.info === 'OK') {
-              _this.wellForm.qu = result.regeocode.addressComponent.district
-              _this.wellForm.area = result.regeocode.addressComponent.township
-              _this.wellForm.position = result.regeocode.formattedAddress
-            // result为对应的地理位置详细信息
-            } else {
-              _this.wellForm.position = ''
-              _this.wellForm.qu = ''
-              _this.wellForm.area = ''
-            }
-          })
-        })
-      })
-    },
-    'wellForm.deptid'(val, oldVal) { // 监控权属单位变化
-      if (oldVal !== '' && val !== '') {
-        this.wellForm.responsibleDept = ''
-        this.wellForm.responsibleDeptName = ''
-        this.wellForm.area = ''
-        this.wellForm.qu = ''
-        this.fetchSecondDeptTree()
-        this.fetchArea1()
-      } else {
-        if (val !== '') {
-          this.fetchSecondDeptTree()
-          this.fetchArea1()
-        }
-      }
-    },
-    qu(val) { // 监控区变化
-      if (val !== '') {
-        this.fetchArea2()
-      }
-    }
-  },
-  mounted: function() {
-    this.fetchWellType()
-    this.imageList = []
-  },
-  methods: {
-    // 地图初始化放这里
-    mapReady(map) {
-      this.map = map
-    },
-    // 初始化对话框
-    initDialog: function(dialogFormVisible, row = null) {
-      this.imageList = []
-      // if (row.photos.length === 0 && this.$refs.upload) this.$refs.upload.clearFiles()
-      this.dialogFormVisible = dialogFormVisible
-      this.fetchWellType()
-      this.wellForm = {
-        id: row.id, // 井id
-        wellCode: row.wellCode, // 井编号
-        wellName: row.wellName, // 井名称
-        wellType: row.wellType, // 井类型
-        deptid: row.deptid, // 权属单位
-        deep: row.deep, // 井深，
-        position: row.position, // 位置描述
-        coordinateX: row.coordinateX, // 经度
-        coordinateY: row.coordinateY, // 纬度
-        photos: row.photos, // 照片路径
-        notes: row.notes, // 备注,
-        qu: row.qu,
-        area: row.area, // 街道
-        responsibleDept: row.responsibleDept, // 维护人员部门
-        responsibleDeptName: row.responsibleDeptName // 维护人员部门
-      }
-      if (row.deptid && row.deptid !== '') {
-        this.fetchArea1(row.deptid)
-        this.fetchArea2()
-        this.fetchSecondDeptTree()
-        this.loading = false
-      }
-      // 处理图片
-      const base_url = process.env.BASE_API + '/static/'
-      const urls = row.photos.split(';')
-      for (const url of urls) {
-        if (url) {
-          this.imageList.push({ name: url, url: base_url + url })
-        }
-      }
-      this.handleChange(null, this.imageList)
-    },
-    // 加载组织机构树形下拉菜单
-    fetchSecondDeptTree: function() {
-      const listQuery = {
-        pid: this.wellForm.deptid,
-        deptType: '04'
-      }
-      getDeptTreeList(listQuery).then(response => {
-        console.log(response.data)
-        if (response.data.list) {
-          this.secondDeptTreeList = toTreeList(response.data.list, this.wellForm.deptid)
-        }
-      })
-    },
-    // 获取井类型
-    fetchWellType() {
-      getWellType().then(response => {
-        this.wellTypeList = []
-        const wellTypes = this.$store.getters.wellTypes
-        for (const wellType of response.data) {
-          if (wellTypes.indexOf(wellType.value) !== -1) {
-            this.wellTypeList.push(wellType)
-          }
-        }
-        if (this.wellTypeList.length <= 1) {
-          this.showWellType = false
-        }
-      })
-    },
-    // 获取区域1
-    fetchArea1(deptid) {
-      getAreaByDept(this.wellForm.deptid).then(response => {
-        if (response.code === 200) {
-          const pid = response.data.area
-          getAreaList(pid).then(response => {
-            this.quList = response.data
-          })
-        }
-      })
-    },
-    // 改变权属单位选项时
-    deptChanged() {
-      console.log('deptChanged')
-      this.wellForm.responsibleDept = ''
-      this.wellForm.area = ''
-      this.wellForm.qu = ''
-    },
-    // 改变区选项时的操作
-    quChanged() {
-      this.wellForm.area = ''
-    },
-    // 获取区域2
-    fetchArea2() {
-      getAreaList(this.wellForm.qu).then(response => {
-        this.jiedaoList = response.data
-      })
-    },
-    // 取消
-    cancel() {
-      this.dialogFormVisible = false
-      this.imageList = []
-      this.wellForm.deptid = ''
-      this.$emit('watchChild')
-      // 清除验证
-      this.$nextTick(() => {
-        this.$refs['dataForm'].clearValidate()
-      })
-    },
-    // 保存数据
-    saveData: function() {
-      this.wellForm.photos = ''
-      if (this.wellForm.responsibleDept === '') {
-        if (this.secondDeptTreeList.length > 0) {
-          this.$message.warning('必须选择维护机构')
-          return
-        } else {
-          this.wellForm.responsibleDept = this.wellForm.deptid
-        }
-      }
-      for (const image of this.imageList) {
-        let index = image.url.indexOf('/static/')
-        if (index !== -1) {
-          index += 8
-        }
-        this.wellForm.photos += image.url.substring(index) + ';'
-      }
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateWell(this.wellForm).then(response => {
-            console.log('修改井')
-            if (response.code === 200) {
-              this.$message.success('修改成功!')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-              this.imageList = []
-            }
-            // 清除验证
-            this.$nextTick(() => {
-              this.$refs['dataForm'].clearValidate()
-            })
-          })
-        }
-      })
-    },
-    uploadFile(file) {
-      console.log('uploadFile:' + file.file.name)
-      const base_url = process.env.BASE_API + '/static/'
-      Uploadimg(file).then(res => {
-        if (res.code === 200) {
-          this.imageList.push({ name: file.file.name, url: base_url + res.data })
-        }
-      })
-    },
-    handleBeforeUpload(file) {
-      const isJPG = (file.type === 'image/jpeg') || (file.type === 'image/png')
-      let res = true
-      const isLt2M = file.size / 1024 / 1024 < 5
-      if (!isJPG) {
-        this.$message.error('上传图片只能是 JPG 或 PNG 格式!')
-        res = false
-      }
-      if (!isLt2M) {
-        this.$message.error('上传图片大小不能超过 5MB!')
-        res = false
-      }
-      for (const i in this.fileList) {
-        if (this.fileList[i].name === file.name) {
-          this.$message.error('该图片已上传过，请选择其他图片')
-          res = false
-        }
-      }
-      return res
-    },
-    // 文件列表移除文件时的钩子
-    handleRemove(file, fileList) {
-      console.log('handleRemove')
-      for (const i in this.imageList) {
-        if (this.imageList[i].name === file.name) {
-          this.imageList.splice(i, 1)
-          this.hideUpload = this.imageList.length >= 4
-          return
-        }
-      }
-    },
-    handleExceed(files, fileList) {
-      this.$message.warning(`限制选择 4 张图片，本次选择了 ${files.length} 张图片，共选择了 ${files.length + fileList.length} 张图片`)
-    },
-    // 点击文件列表中已上传的文件时的钩子
-    handlePictureCardPreview(file) {
-      console.log('handlePictureCardPreview')
-      this.dialogImageUrl = file.url
-      this.dialogVisible = true
-    },
-    handleChange(file, fileList) {
-      console.log('handleChange')
-      if (fileList) {
-        this.hideUpload = fileList.length >= 4
-      } else {
-        this.hideUpload = false
-      }
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss">
-  .hide .el-upload--picture-card {
-    display: none;
-  }
-
-  .editDialog {
-    .el-dialog {
-      width: 900px;
-      margin-top: 10vh !important;
-      .el-scrollbar {
-        height: 410px;
-        width: 100%;
-      }
-      .el-scrollbar__wrap {
-        /*overflow: scroll;*/
-        overflow-x: auto;
-        overflow-y: auto;
-      }
-      .el-scrollbar__view {
-        width: 98%;
-      }
-    }
-  }
-
-  .el-select {
-    width: 100%;
-  }
-
-  .line {
-    width: 50px;
-    margin-left: 5px;
-  }
-
-  .hide .el-upload-–picture-card {
-    display: none;
-  }
-
-  .imgBox {
-    width: 100%;
-    text-align: center;
-  }
-</style>

diff --git a/mock/system/user.js b/mock/system/user.js
index 43c5f16..abd593d 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -163,6 +163,7 @@
     { 'code': 'well_update', 'icon': '', 'id': '1138615123652091905', 'ismenu': '0', 'levels': 2, 'name': '修改窨井', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '04', 'url': '/well/update' },
     { 'code': 'liquid_config_export', 'icon': '', 'id': '1138691921802915842', 'ismenu': '0', 'levels': 2, 'name': '液位配置批量导出', 'num': 0, 'parentId': '1138690889324654593', 'resourceType': '04', 'url': '/busConfig/liquidConfig/batchExport' },
     { 'code': 'well_list', 'icon': '', 'id': '1138615485519863810', 'ismenu': '1', 'levels': 2, 'name': '窨井列表', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '03', 'url': '/well/list' },
+    { 'code': 'well_list', 'icon': '', 'id': '1138615485519863812', 'ismenu': '1', 'levels': 2, 'name': '窨井位置纠偏', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '03', 'url': '/well/location' },
     { 'code': 'gas_config_config', 'icon': '', 'id': '1177427682888646657', 'ismenu': '0', 'levels': 2, 'name': '燃气下发配置', 'num': 0, 'parentId': '1138690889324654593', 'resourceType': '04', 'url': '/busConfig/gasConfig/config' },
     { 'code': 'well_batchexport', 'icon': '', 'id': '1138615953230897154', 'ismenu': '0', 'levels': 2, 'name': '批量导出窨井', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '04', 'url': '/well/batchExport' },
     { 'code': 'dig_config_list', 'icon': '', 'id': '1177429930704240641', 'ismenu': '0', 'levels': 2, 'name': '开挖监测仪配置列表', 'num': 0, 'parentId': '1138690889324654593', 'resourceType': '04', 'url': '/busConfig/digConfig/list' },
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 14860e4..b5b6e82 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -101,6 +101,12 @@
         name: 'AddWell',
         component: () => import('@/views/wellManage/addWell'),
         meta: { title: '新增窨井', icon: 'icon-config', permission: ['/well/add'] }
+      },
+      {
+        path: '/wellLocation',
+        name: 'WellLocation',
+        component: () => import('@/views/wellManage/postionCorrectWell'),
+        meta: { title: '窨井位置纠偏', icon: 'icon-config', permission: ['/well/location'] }
       }
     ]
   },
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index f6c3f24..71fa2d9 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -180,6 +180,6 @@
     width: 100%;
   }
   .el-date-editor{
-    width: 100%;
+    width: 100%;display: flex;
   }
 </style>
diff --git a/src/views/wellManage/components/infoWindowWell.vue b/src/views/wellManage/components/infoWindowWell.vue
new file mode 100644
index 0000000..b18edf3
--- /dev/null
+++ b/src/views/wellManage/components/infoWindowWell.vue
@@ -0,0 +1,47 @@
+<!--
+ * @Description: 井信息弹窗
+ * @Author: 王晓颖
+ * @Date: 2022-05-13
+ -->
+<template>
+  <div class="info-window">
+    <div class="info-header">
+      {{ wellInfo.wellCode }}
+    </div>
+    <div class="info-body">
+      <div>井类型：{{ wellInfo.wellTypeName }}</div>
+      <div>权属单位：{{ wellInfo.deptName }}</div>
+      <div>详细地址：{{ wellInfo.position }}</div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'WellInfoWindow',
+  props: {
+    wellInfo: {
+      type: Object,
+      required: true
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.info-window{
+  max-width: 260px;
+  min-width: 200px;
+  .info-header{
+    padding: 10px 10px 5px 10px;
+    line-height: 30px;
+    font-weight: bold;
+    /*background-color: #eaf4ff;*/
+  }
+  .info-body{
+    padding: 5px 10px 10px 10px;
+    line-height: 23px;
+    font-size: 14px;
+  }
+}
+</style>
diff --git a/src/views/wellManage/components/mapSearchComp.vue b/src/views/wellManage/components/mapSearchComp.vue
new file mode 100644
index 0000000..22ef568
--- /dev/null
+++ b/src/views/wellManage/components/mapSearchComp.vue
@@ -0,0 +1,134 @@
+<!--
+ * @Description: 搜索组件
+ * @Author: 王晓颖
+ * @Date: 2022-05-18
+ -->
+<template>
+  <div class="map-search-div">
+    <!--搜索条件-->
+    <div>
+      <el-input v-model.trim="keywords" :placeholder="placeholder" clearable>
+        <el-button slot="append" class="filter-item" type="primary" icon="el-icon-search" @click="search">
+          搜索
+        </el-button>
+      </el-input>
+    </div>
+    <!--搜索结果弹出框-->
+    <el-popover
+      v-show="list.length>0"
+      v-model="resultShow"
+      placement="bottom-end"
+      width="311"
+      trigger="manual"
+    >
+      <div slot="reference" class="select-answer" @click="resultShow = !resultShow">
+        共找到 {{ list.length }} 个符合条件的{{ name }}
+      </div>
+      <div class="list-div">
+        <map-search-item v-for="(data,index) in currentPageList" :key="'search-item-'+index" :data="data" :index="index" @click="clickItem" />
+      </div>
+      <el-pagination
+        :total="list.length"
+        :current-page="pageNum"
+        :page-size="pageSize"
+        :hide-on-single-page="true"
+        small
+        layout="prev, pager, next"
+        @current-change="changePage"
+      />
+    </el-popover>
+  </div>
+</template>
+
+<script>
+import MapSearchItem from './mapSearchItem'
+export default {
+  name: 'SearchComp',
+  components: { MapSearchItem },
+  props: {
+    name: {
+      type: String,
+      default: '井'
+    }, // 结果展示类型
+    placeholder: {
+      type: String,
+      default: '关键字'
+    },
+    list: {
+      type: Array,
+      default: () => []
+    } // 结果列表
+  },
+  data() {
+    return {
+      resultShow: false, // 是否显示查询结果
+      keywords: '', // 查询条件
+      currentPageList: [], // 当前页数据
+      pageSize: 5, // 页面容量
+      pageNum: 1 // 页码
+    }
+  },
+  watch: {
+    keywords(val) {
+      if (val === '') {
+        this.currentPageList = []
+        this.pageNum = 1
+        this.resultShow = false
+        this.$emit('clear')
+      }
+    },
+    list(val) { // 监控list的数量，为0时不显示
+      if (val && val.length > 0) {
+        this.resultShow = true
+        this.changePage(1)
+      } else {
+        this.resultShow = false
+        this.currentPageList = []
+      }
+    }
+  },
+  methods: {
+    // 点击搜索按钮
+    search() {
+      this.$emit('search', this.keywords)
+    },
+    // 切换页码
+    changePage(val) {
+      const offset = val
+      const start = (offset - 1) * this.pageSize
+      const end = start + this.pageSize
+      this.currentPageList = this.list.slice(start, end)
+      this.$emit('change-page', this.currentPageList)
+    },
+    // 点击结果项
+    clickItem(item) {
+      this.$emit('click-item', item)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.map-search-div{
+  position: absolute;
+  z-index: 100;
+  left: 30px;
+  top: 5px;
+  .select-answer{
+    position: relative;
+    margin-top: 5px;
+    font-size:14px;
+    padding: 10px 20px;
+    width: 311px;
+    color: #606266;
+    background-color: #FFFFFF;
+    border: 1px solid #EBEEF5;
+    border-radius: 4px;
+    box-shadow: 0 2px 12px 0 rgba(0,0,0,.1)
+  }
+  .list-div{
+    background-color: #FFFFFF;
+  }
+}
+
+</style>
diff --git a/src/views/wellManage/components/mapSearchItem.vue b/src/views/wellManage/components/mapSearchItem.vue
new file mode 100644
index 0000000..5cdce0d
--- /dev/null
+++ b/src/views/wellManage/components/mapSearchItem.vue
@@ -0,0 +1,89 @@
+<!--
+ * @Description: 搜索结果项组件
+ * @Author: 王晓颖
+ * @Date: 2022-05-18
+ -->
+<template>
+  <div :key="data[props.label]" class="search-card" @click="clickItem()">
+    <div class="card-left">
+      <span class="index">{{ index+1 }}</span>
+    </div>
+    <div class="card-right">
+      <div class="card-title">
+        {{ data[props.label] }}-{{ data[props.name] }}
+      </div>
+      <div class="card-content">
+        <span class="card-detail">{{ data[props.detail] }}</span>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'SearchItem',
+  props: {
+    data: {
+      type: Object,
+      required: true
+    },
+    index: {
+      type: Number | String,
+      required: true
+    },
+    props: {
+      type: Object,
+      default: () => {
+        return {
+          label: 'wellCode',
+          name: 'wellName',
+          detail: 'position'
+        }
+      }
+    }
+  },
+  data() {
+    return {
+    }
+  },
+  methods: {
+    clickItem() {
+      this.$emit('click', this.data)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.search-card{
+  padding:5px 10px;
+  overflow: auto;
+  display: flex;
+  .card-left{
+    .index{
+      display: inline-block;
+      width: 20px;
+      line-height: 20px;
+      background-color: #cfe3fa;
+      text-align: center;
+      border-radius: 20px;
+      margin: 3px 10px 0px 0px;
+    }
+  }
+  .card-right{
+    flex:1
+  }
+  .card-title{
+    font-size:16px;
+    font-weight: bold;
+    line-height: 25px;
+  }
+  .card-detail{
+    line-height:25px;
+  }
+  &:hover{
+    cursor:pointer;
+    background-color: #fafafa;
+  }
+}
+</style>
diff --git a/src/views/wellManage/components/movePostion.vue b/src/views/wellManage/components/movePostion.vue
new file mode 100644
index 0000000..34f9af8
--- /dev/null
+++ b/src/views/wellManage/components/movePostion.vue
@@ -0,0 +1,98 @@
+<!--
+ * @Description: 井信息弹窗
+ * @Author: 王晓颖
+ * @Date: 2022-05-13
+ -->
+<template>
+  <div class="info-window">
+    <div class="info-header">
+      {{ wellInfo.wellCode }}
+    </div>
+    <div class="info-body">
+      <el-row v-if="showMoveBtn">
+        <el-col>
+          <el-button @click="moveLonLatClick">
+            位置纠偏
+          </el-button>
+        </el-col>
+      </el-row>
+      <el-row v-else>
+        <el-row :gutter="10">
+          <el-col :span="12">
+            <el-input v-model.trim="deviceForm.lng" placeholder="经度" clearable />
+          </el-col>
+          <el-col :span="12">
+            <el-input v-model.trim="deviceForm.lat" placeholder="纬度" clearable />
+          </el-col>
+        </el-row>
+        <el-row style="margin:10px 0">
+          <el-col>
+            <el-input v-model.trim="deviceForm.address" placeholder="详细地址" clearable />
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-button @click="sureClick">
+            保存
+          </el-button>
+          <el-button @click="cancelClick">
+            取消
+          </el-button>
+        </el-row>
+      </el-row>
+    </div>
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: 'MovePostion',
+  props: {
+    wellInfo: {
+      type: Object,
+      required: true
+    }
+  },
+  data() {
+    return {
+      showMoveBtn: true,
+      deviceForm: {
+        lng: '',
+        lat: '',
+        address: ''
+      }
+    }
+  },
+  methods: {
+    moveLonLatClick() {
+      this.showMoveBtn = false
+      this.$emit('sure-moveLonLat', true)
+    },
+    cancelClick() {
+      this.showMoveBtn = true
+      this.$emit('cancel-moveLonLat', false)
+    },
+    sureClick() {
+      this.showMoveBtn = true
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.info-window{
+  max-width: 260px;
+  min-width: 200px;
+  .info-header{
+    padding: 10px 10px 5px 10px;
+    line-height: 30px;
+    font-weight: bold;
+    /*background-color: #eaf4ff;*/
+  }
+  .info-body{
+    padding: 5px 10px 10px 10px;
+    line-height: 23px;
+    font-size: 14px;
+  }
+}
+</style>
diff --git a/src/views/wellManage/editWell copy 2.vue b/src/views/wellManage/editWell copy 2.vue
deleted file mode 100644
index 76ad5e6..0000000
--- a/src/views/wellManage/editWell copy 2.vue
+++ /dev/null
@@ -1,54 +0,0 @@
-<template>
-  <el-dialog :visible.sync="dialogFormVisible" class="editDialog" append-to-body>
-    <el-row>
-      <el-col class="overview-map-container">
-        <a-map-container
-          ref="map"
-          :center="center"
-          :zoom="zoom"
-          :base-layer="baseLayer"
-          :style="{height:(bodyHeight-200)+'px'}"
-          vid="overview"
-          class="map-demo"
-          @ready="mapReady"
-        />
-      </el-col>
-    </el-row>
-  </el-dialog>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-import AMapContainer from '@/components/Amap/AMapContainer'
-export default {
-  components: { AMapContainer },
-  data() {
-    return {
-      dialogFormVisible: false,
-      map: null, // 地图对象
-      baseLayer: 'gaode_vec', // 底图图层
-      center: [this.$store.getters.lng, this.$store.getters.lat], // 地图中心
-      zoom: 12
-    }
-  },
-  computed: {
-    ...mapGetters([
-      'bodyHeight'
-    ])
-  },
-  methods: {
-    // 初始化放这里
-    mapReady(map) {
-      this.map = map
-      map.on('click', function(e) {
-        console.log(e)
-      })
-    },
-    // 初始化对话框
-    initDialog: function(dialogFormVisible, row = null) {
-      this.dialogFormVisible = dialogFormVisible
-    }
-  }
-}
-</script>
-
diff --git a/src/views/wellManage/editWell copy.vue b/src/views/wellManage/editWell copy.vue
deleted file mode 100644
index dd624c3..0000000
--- a/src/views/wellManage/editWell copy.vue
+++ /dev/null
@@ -1,606 +0,0 @@
-<template>
-  <el-dialog :visible.sync="dialogFormVisible" class="editDialog" title="编辑井" append-to-body @close="cancel">
-    <el-scrollbar :native="false">
-      <el-form ref="dataForm" :label-position="labelPosition" :rules="rules" :model="wellForm" label-width="120px">
-        <el-row>
-          <el-col :span="10">
-            <el-form-item label="井名称" prop="wellName">
-              <el-input v-model.trim="wellForm.wellName" type="text" placeholder="必填" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="10" :offset="1">
-            <el-form-item label="井编号" prop="wellCode">
-              <el-input v-model.trim="wellForm.wellCode" :disabled="isEditMode" type="text" placeholder="必填" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="10">
-            <el-form-item label="井类型" prop="wellType">
-              <el-select v-model="wellForm.wellType" placeholder="点击选择井类型" clearable>
-                <el-option
-                  v-for="item in wellTypeList"
-                  :key="item.value"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="10" :offset="1">
-            <el-form-item label="权属单位" prop="deptid">
-              <dept-select v-model="wellForm.deptid" :need-top="deptShowTop" :dept-show="deptShow" dept-type="03" placeholder="选择权属单位" @change="deptChanged" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="10">
-            <el-form-item label="井深(m)" prop="deep">
-              <el-input v-model.trim="wellForm.deep" type="text" placeholder="需要装液位监测仪的井必填" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col class="overview-map-container">
-            <a-map-container
-              ref="map"
-              :center="center"
-              :zoom="zoom"
-              :base-layer="baseLayer"
-              :style="{height:(bodyHeight-200)+'px'}"
-              vid="overview"
-              class="map-demo"
-              @ready="mapReady"
-            />
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="10">
-            <el-form-item label="经度" prop="coordinateX">
-              <el-input v-model.trim="wellForm.coordinateX" type="text" placeholder="必填" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="10" :offset="1">
-            <el-form-item label="纬度" prop="coordinateY">
-              <el-input v-model.trim="wellForm.coordinateY" type="text" placeholder="必填" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="路标图片" prop="images">
-              <el-upload
-                ref="upload"
-                :before-upload="handleBeforeUpload"
-                :on-preview="handlePictureCardPreview"
-                :on-remove="handleRemove"
-                :on-exceed="handleExceed"
-                :on-change="handleChange"
-                :http-request="uploadFile"
-                :file-list="imageList"
-                :limit="4"
-                :class="{hide:hideUpload}"
-                multiple
-                action="string"
-                accept=".jpg,.jpeg,.png "
-                list-type="picture-card"
-              >
-                <i class="el-icon-plus" />
-              </el-upload>
-              <el-dialog :visible.sync="dialogVisible" title="图片预览" append-to-body>
-                <div class="imgBox">
-                  <img :src="dialogImageUrl" max-height="400px;" alt="" style="margin: 0 auto;">
-                </div>
-              </el-dialog>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="1">
-          <el-form-item label="所在区域" required>
-            <el-col :span="5">
-              <el-form-item prop="qu">
-                <el-select v-model="wellForm.qu" :disabled="showResponseDept" placeholder="请选择所在区/县" clearable @change="quChanged">
-                  <el-option
-                    v-for="item in quList"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="1" class="line">
-              区/县
-            </el-col>
-            <el-col :span="5">
-              <el-form-item prop="area">
-                <el-select v-model="wellForm.area" :disabled="showResponseDept" placeholder="请选择所在街道/镇" clearable>
-                  <el-option
-                    v-for="item in jiedaoList"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="1" class="line">
-              街道/镇
-            </el-col>
-          </el-form-item>
-        </el-row>
-        <el-row>
-          <el-col :span="15">
-            <el-form-item label="详细地址" prop="position">
-              <el-input v-model.trim="wellForm.position" type="text" placeholder="必填" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row v-show="secondDeptTreeList.length>=1" :gutter="20">
-          <el-col :span="13">
-            <el-form-item label="井维护机构" prop="responsibleDept">
-              <el-select v-if="secondDeptTreeList.length>=1" v-model="wellForm.responsibleDept" :disabled="showResponseDept" placeholder="选择维护组织，不选默认为权属单位" clearable>
-                <el-option
-                  v-for="item in secondDeptTreeList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-              <el-input v-else v-model="wellForm.responsibleDeptName" type="text" placeholder="未知" disabled />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="15" style="margin-left: 120px; margin-bottom: 40px;">
-            <el-button size="medium" @click="cancel">
-              取消
-            </el-button>
-            <el-button type="primary" size="medium" style="margin-left: 10px;" @click="saveData">
-              保存
-            </el-button>
-          </el-col>
-        </el-row>
-      </el-form>
-    </el-scrollbar>
-  </el-dialog>
-</template>
-
-<script>
-import { toTreeList } from '@/utils/structure'
-import { getDeptTreeList } from '@/api/system/dept'
-import { getAreaList, getAreaByDept } from '@/api/system/area'
-import { getWellType, updateWell } from '@/api/well/well'
-import { Uploadimg } from '@/api/common'
-import DeptSelect from '@/components/DeptSelect'
-import { mapGetters } from 'vuex'
-import AMapContainer from '@/components/Amap/AMapContainer'
-import AMapLoader from '@amap/amap-jsapi-loader'
-
-export default {
-  name: 'EditWell',
-  components: { DeptSelect, AMapContainer },
-  data() {
-    const validateDeep = (rule, value, callback) => {
-      if (value !== '') {
-        if ((/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/).test(value) === false) {
-          callback(new Error('请填写大于0的数字'))
-        } else {
-          const deep = parseFloat(value)
-          if (deep > 10 || deep < 0) {
-            callback(new Error('请填写0到10数值'))
-          } else {
-            callback()
-          }
-        }
-      } else {
-        callback()
-      }
-    }
-    const validateLng = (rule, value, callback) => {
-      if (value !== '') {
-        if ((/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/).test(value) === false) {
-          callback(new Error('请填写大于0的数字'))
-        } else {
-          callback()
-        }
-      } else {
-        callback(new Error('经度不能为空'))
-      }
-    }
-    const validateLat = (rule, value, callback) => {
-      if (value !== '') {
-        if ((/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/).test(value) === false) {
-          callback(new Error('请填写大于0的数字'))
-        } else {
-          callback()
-        }
-      } else {
-        callback(new Error('纬度不能为空'))
-      }
-    }
-    return {
-      map: null, // 地图对象
-      baseLayer: 'gaode_vec', // 底图图层
-      center: [this.$store.getters.lng, this.$store.getters.lat], // 地图中心
-      zoom: 12,
-      dialogFormVisible: false, // 对话框是否显示
-      wellForm: {
-        id: null, // 井id
-        wellCode: '', // 井编号
-        wellName: '', // 井名称
-        wellType: '', // 井类型
-        deptid: '', // 权属单位
-        deep: '', // 井深，
-        position: '', // 位置描述
-        coordinateX: '', // 经度
-        coordinateY: '', // 纬度
-        photos: '', // 照片路径
-        notes: '', // 备注,
-        qu: '',
-        area: '', // 街道
-        responsibleDept: '', // 维护人员部门
-        responsibleDeptName: '' // 维护人员部门
-      }, // 表单
-      deptProps: {
-        parent: 'pid',
-        value: 'id',
-        label: 'name',
-        children: 'children'
-      },
-      hideUpload: false,
-      imageList: [],
-      secondDeptTreeList: [], // 二级组织树列表
-      wellTypeList: [],
-      quList: [],
-      jiedaoList: [],
-      textMap: {
-        update: '编辑',
-        create: '新增'
-      }, // 表头显示标题
-      rules: {
-        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
-        wellName: [{ required: true, message: '井名称不能为空', trigger: ['blur', 'change'] }],
-        position: [{ required: true, message: '井详细地址不能为空', trigger: ['blur', 'change'] }],
-        deep: [{ required: false, trigger: ['blur', 'change'], validator: validateDeep }],
-        coordinateX: [{ required: true, trigger: ['blur', 'change'], validator: validateLat }],
-        coordinateY: [{ required: true, trigger: ['blur', 'change'], validator: validateLng }],
-        deptid: [{ required: true, message: '权属单位必选', trigger: 'change' }],
-        wellType: [{ required: true, message: '井类型必选', trigger: 'change' }],
-        qu: [{ required: true, message: '所在区/县必选', trigger: 'change' }],
-        area: [{ required: true, message: '所在街道/镇必选', trigger: 'change' }]
-      },
-      deptShowTop: false, // 权属单位下拉是否显示顶级
-      dialogImageUrl: '',
-      dialogVisible: false,
-      labelPosition: 'right',
-      responseAssignShow: false,
-      isEditMode: true,
-      deptShow: true
-    }
-  },
-  computed: {
-    ...mapGetters([
-      'bodyHeight'
-    ]),
-    showResponseDept() {
-      if (this.wellForm.deptid === '') {
-        return true
-      } else {
-        return false
-      }
-    },
-    qu() { // 获取区
-      return this.wellForm.qu
-    },
-    area() { // 获取街道
-      return this.wellForm.area
-    },
-    lonLat() {
-      return this.wellForm.coordinateX + ',' + this.wellForm.coordinateY
-    }
-  },
-  watch: {
-    lonLat(val) {
-      var _this = this
-      window._AMapSecurityConfig = {
-        securityJsCode: this.$store.getters.amapSecurityCode
-      }
-      AMapLoader.load({
-        key: this.$store.getters.amapKey // 秘钥，从store中取
-      }).then((AMap) => {
-        AMap.plugin('AMap.Geocoder', function() {
-          var geocoder = new AMap.Geocoder({
-            city: ''
-          })
-          var lnglat = val.split(',')
-          geocoder.getAddress(lnglat, function(status, result) {
-            if (status === 'complete' && result.info === 'OK') {
-              _this.wellForm.qu = result.regeocode.addressComponent.district
-              _this.wellForm.area = result.regeocode.addressComponent.township
-              _this.wellForm.position = result.regeocode.formattedAddress
-            // result为对应的地理位置详细信息
-            } else {
-              _this.wellForm.position = ''
-              _this.wellForm.qu = ''
-              _this.wellForm.area = ''
-            }
-          })
-        })
-      })
-    },
-    'wellForm.deptid'(val, oldVal) { // 监控权属单位变化
-      if (oldVal !== '' && val !== '') {
-        this.wellForm.responsibleDept = ''
-        this.wellForm.responsibleDeptName = ''
-        this.wellForm.area = ''
-        this.wellForm.qu = ''
-        this.fetchSecondDeptTree()
-        this.fetchArea1()
-      } else {
-        if (val !== '') {
-          this.fetchSecondDeptTree()
-          this.fetchArea1()
-        }
-      }
-    },
-    qu(val) { // 监控区变化
-      if (val !== '') {
-        this.fetchArea2()
-      }
-    }
-  },
-  mounted: function() {
-    this.fetchWellType()
-    this.imageList = []
-  },
-  methods: {
-    // 地图初始化放这里
-    mapReady(map) {
-      this.map = map
-    },
-    // 初始化对话框
-    initDialog: function(dialogFormVisible, row = null) {
-      this.imageList = []
-      // if (row.photos.length === 0 && this.$refs.upload) this.$refs.upload.clearFiles()
-      this.dialogFormVisible = dialogFormVisible
-      this.fetchWellType()
-      this.wellForm = {
-        id: row.id, // 井id
-        wellCode: row.wellCode, // 井编号
-        wellName: row.wellName, // 井名称
-        wellType: row.wellType, // 井类型
-        deptid: row.deptid, // 权属单位
-        deep: row.deep, // 井深，
-        position: row.position, // 位置描述
-        coordinateX: row.coordinateX, // 经度
-        coordinateY: row.coordinateY, // 纬度
-        photos: row.photos, // 照片路径
-        notes: row.notes, // 备注,
-        qu: row.qu,
-        area: row.area, // 街道
-        responsibleDept: row.responsibleDept, // 维护人员部门
-        responsibleDeptName: row.responsibleDeptName // 维护人员部门
-      }
-      if (row.deptid && row.deptid !== '') {
-        this.fetchArea1(row.deptid)
-        this.fetchArea2()
-        this.fetchSecondDeptTree()
-        this.loading = false
-      }
-      // 处理图片
-      const base_url = process.env.BASE_API + '/static/'
-      const urls = row.photos.split(';')
-      for (const url of urls) {
-        if (url) {
-          this.imageList.push({ name: url, url: base_url + url })
-        }
-      }
-      this.handleChange(null, this.imageList)
-    },
-    // 加载组织机构树形下拉菜单
-    fetchSecondDeptTree: function() {
-      const listQuery = {
-        pid: this.wellForm.deptid,
-        deptType: '04'
-      }
-      getDeptTreeList(listQuery).then(response => {
-        console.log(response.data)
-        if (response.data.list) {
-          this.secondDeptTreeList = toTreeList(response.data.list, this.wellForm.deptid)
-        }
-      })
-    },
-    // 获取井类型
-    fetchWellType() {
-      getWellType().then(response => {
-        this.wellTypeList = []
-        const wellTypes = this.$store.getters.wellTypes
-        for (const wellType of response.data) {
-          if (wellTypes.indexOf(wellType.value) !== -1) {
-            this.wellTypeList.push(wellType)
-          }
-        }
-        if (this.wellTypeList.length <= 1) {
-          this.showWellType = false
-        }
-      })
-    },
-    // 获取区域1
-    fetchArea1(deptid) {
-      getAreaByDept(this.wellForm.deptid).then(response => {
-        if (response.code === 200) {
-          const pid = response.data.area
-          getAreaList(pid).then(response => {
-            this.quList = response.data
-          })
-        }
-      })
-    },
-    // 改变权属单位选项时
-    deptChanged() {
-      console.log('deptChanged')
-      this.wellForm.responsibleDept = ''
-      this.wellForm.area = ''
-      this.wellForm.qu = ''
-    },
-    // 改变区选项时的操作
-    quChanged() {
-      this.wellForm.area = ''
-    },
-    // 获取区域2
-    fetchArea2() {
-      getAreaList(this.wellForm.qu).then(response => {
-        this.jiedaoList = response.data
-      })
-    },
-    // 取消
-    cancel() {
-      this.dialogFormVisible = false
-      this.imageList = []
-      this.wellForm.deptid = ''
-      this.$emit('watchChild')
-      // 清除验证
-      this.$nextTick(() => {
-        this.$refs['dataForm'].clearValidate()
-      })
-    },
-    // 保存数据
-    saveData: function() {
-      this.wellForm.photos = ''
-      if (this.wellForm.responsibleDept === '') {
-        if (this.secondDeptTreeList.length > 0) {
-          this.$message.warning('必须选择维护机构')
-          return
-        } else {
-          this.wellForm.responsibleDept = this.wellForm.deptid
-        }
-      }
-      for (const image of this.imageList) {
-        let index = image.url.indexOf('/static/')
-        if (index !== -1) {
-          index += 8
-        }
-        this.wellForm.photos += image.url.substring(index) + ';'
-      }
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateWell(this.wellForm).then(response => {
-            console.log('修改井')
-            if (response.code === 200) {
-              this.$message.success('修改成功!')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-              this.imageList = []
-            }
-            // 清除验证
-            this.$nextTick(() => {
-              this.$refs['dataForm'].clearValidate()
-            })
-          })
-        }
-      })
-    },
-    uploadFile(file) {
-      console.log('uploadFile:' + file.file.name)
-      const base_url = process.env.BASE_API + '/static/'
-      Uploadimg(file).then(res => {
-        if (res.code === 200) {
-          this.imageList.push({ name: file.file.name, url: base_url + res.data })
-        }
-      })
-    },
-    handleBeforeUpload(file) {
-      const isJPG = (file.type === 'image/jpeg') || (file.type === 'image/png')
-      let res = true
-      const isLt2M = file.size / 1024 / 1024 < 5
-      if (!isJPG) {
-        this.$message.error('上传图片只能是 JPG 或 PNG 格式!')
-        res = false
-      }
-      if (!isLt2M) {
-        this.$message.error('上传图片大小不能超过 5MB!')
-        res = false
-      }
-      for (const i in this.fileList) {
-        if (this.fileList[i].name === file.name) {
-          this.$message.error('该图片已上传过，请选择其他图片')
-          res = false
-        }
-      }
-      return res
-    },
-    // 文件列表移除文件时的钩子
-    handleRemove(file, fileList) {
-      console.log('handleRemove')
-      for (const i in this.imageList) {
-        if (this.imageList[i].name === file.name) {
-          this.imageList.splice(i, 1)
-          this.hideUpload = this.imageList.length >= 4
-          return
-        }
-      }
-    },
-    handleExceed(files, fileList) {
-      this.$message.warning(`限制选择 4 张图片，本次选择了 ${files.length} 张图片，共选择了 ${files.length + fileList.length} 张图片`)
-    },
-    // 点击文件列表中已上传的文件时的钩子
-    handlePictureCardPreview(file) {
-      console.log('handlePictureCardPreview')
-      this.dialogImageUrl = file.url
-      this.dialogVisible = true
-    },
-    handleChange(file, fileList) {
-      console.log('handleChange')
-      if (fileList) {
-        this.hideUpload = fileList.length >= 4
-      } else {
-        this.hideUpload = false
-      }
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss">
-  .hide .el-upload--picture-card {
-    display: none;
-  }
-
-  .editDialog {
-    .el-dialog {
-      width: 900px;
-      margin-top: 10vh !important;
-      .el-scrollbar {
-        height: 410px;
-        width: 100%;
-      }
-      .el-scrollbar__wrap {
-        /*overflow: scroll;*/
-        overflow-x: auto;
-        overflow-y: auto;
-      }
-      .el-scrollbar__view {
-        width: 98%;
-      }
-    }
-  }
-
-  .el-select {
-    width: 100%;
-  }
-
-  .line {
-    width: 50px;
-    margin-left: 5px;
-  }
-
-  .hide .el-upload-–picture-card {
-    display: none;
-  }
-
-  .imgBox {
-    width: 100%;
-    text-align: center;
-  }
-</style>
diff --git a/src/views/wellManage/postionCorrectWell.vue b/src/views/wellManage/postionCorrectWell.vue
new file mode 100644
index 0000000..55d9571
--- /dev/null
+++ b/src/views/wellManage/postionCorrectWell.vue
@@ -0,0 +1,450 @@
+<template>
+  <div>
+    <div class="overview-map-container">
+      <!--地图-->
+      <a-map-container
+        ref="map"
+        :center="center"
+        :zoom="zoom"
+        :base-layer="baseLayer"
+        :style="{height:(bodyHeight-20)+'px'}"
+        vid="overview"
+        class="map-demo"
+        @ready="mapReady"
+      >
+        <!--搜索结果点标注-->
+        <a-map-marker
+          v-for="(marker,index) of searchMarkers"
+          :key="index"
+          :position="marker.lnglat"
+        >
+          <div
+            class="search-marker"
+            :style="{'width':searchResultSize[0]+'px','height':searchResultSize[1]+'px'}"
+            @click="openInfoWindow(marker.id, marker.lnglat, searchResultOffset[1])"
+            @contextmenu.prevent="moveInfoShow(marker.id, marker.lnglat, searchResultOffset[1])"
+          >
+            <el-image
+              :src="searchResultIcon"
+              class="search-marker-image"
+              fit="fill"
+            />
+            <div class="search-marker-label">
+              {{ index+1 }}
+            </div>
+          </div>
+        </a-map-marker>
+      </a-map-container>
+      <!--搜索框-->
+      <map-search-comp
+        :list="resultList"
+        placeholder="井编号/名称/位置"
+        @search="search"
+        @change-page="searchPageChange"
+        @click-item="searchItemClick"
+        @clear="clearSearch"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import Vue from 'vue'
+import { mapGetters } from 'vuex'
+import AMapContainer from '@/components/Amap/AMapContainer'
+import AMapMarker from '@/components/Amap/AMapMarker'
+import MapSearchComp from '@/views/wellManage/components/mapSearchComp'
+import { getWellList, getWellInfo } from '@/api/overview/wellOverview'
+import { toPixel, toSize, toLngLat } from '@/components/Amap/utils/convert-helper'
+import WellInfoWindow from './components/infoWindowWell'
+import movePostion from './components/movePostion'
+import AMapLoader from '@amap/amap-jsapi-loader'
+
+export default {
+  name: 'PostionCorrectWell',
+  components: { AMapContainer, AMapMarker, MapSearchComp },
+  data() {
+    return {
+      map: null, // 地图对象
+      baseLayer: 'gaode_vec', // 底图图层
+      center: [this.$store.getters.lng, this.$store.getters.lat], // 地图中心
+      zoom: 12, // 地图缩放比例
+      searchMarkers: [], // 当前搜索页展示marker集合
+      resultList: [], // 搜索结果列表
+      markers: [], // 所有井的点原始数据
+      searchResultSize: [24, 30],
+      searchResultIcon: require('@/assets/overview/pure-position-icon.png'), // 报警图标
+      searchResultOffset: [-12, -30],
+      postionForm: {
+        longitude: '', // 经度
+        latitude: '', // 纬度
+        postion: '', // 详细地址
+        postionlatlon: ''
+      }
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'needRefresh',
+      'bodyHeight'
+    ])
+  },
+  watch: {
+    postionlatlon(val) {
+      var that = this
+      window._AMapSecurityConfig = {
+        securityJsCode: this.$store.getters.amapSecurityCode
+      }
+      AMapLoader.load({
+        key: this.$store.getters.amapKey // 秘钥，从store中取
+      }).then((AMap) => {
+        AMap.plugin('AMap.Geocoder', function() {
+          var geocoder = new AMap.Geocoder({
+            city: ''
+          })
+          var lnglat = val.split(',')
+          geocoder.getAddress(lnglat, function(status, result) {
+            if (status === 'complete' && result.info === 'OK') {
+              that.postionForm.postion = result.regeocode.formattedAddress
+            }
+          })
+        })
+      })
+    }
+  },
+  methods: {
+    // 初始化放这里
+    mapReady(map) {
+      this.map = map
+      var that = this
+      this.fetchWellList() // 加载全部井
+      map.on('click', function(e) {
+        console.log(e)
+        that.postionForm.longitude = e.lnglat.lng
+        that.postionForm.latitude = e.lnglat.lat
+        that.postionForm.postionlatlon = e.lnglat.lng + ',' + e.lnglat.lat
+      })
+    },
+    // 数据查询
+    search(keywords) {
+      if (keywords === '') {
+        this.$message.warning('搜索条件不能为空')
+      } else {
+        this.resultList = this.markers.filter(item => {
+          if (item.wellCode.includes(keywords) || item.wellName.includes(keywords) || item.position.includes(keywords)) {
+            return true
+          } else {
+            return false
+          }
+        })
+      }
+    },
+    // 搜索结果页面变化，触发地图展示列表中所有
+    searchPageChange(currentMarkers) {
+      // 增加查询展示图层
+      this.searchMarkers = currentMarkers
+    },
+    // 点击搜索结果项居中，弹窗
+    searchItemClick(marker) {
+      this.center = marker.lnglat
+      this.openInfoWindow(marker.wellId, marker.lnglat, this.searchResultOffset[1])
+    },
+    // 清空查询
+    clearSearch() {
+      this.searchMarkers = []
+      this.resultList = []
+    },
+    // 过滤海量点，给markers赋visible值
+    filterMassMarker(listQuery, showMessage = false) {
+      const hideWellIds = []// 要隐藏的井编号
+      let center = [] // 待移动到的地图中心
+      // 2. 整理查询条件
+      const keywords = listQuery.keywords // 关键字
+      const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 井类型
+      let deptids = [] // 所有权属
+      if (listQuery.deptid) {
+        deptids = this.fetchDeptList(listQuery.deptid) // 获取所有下级
+      }
+      // 3.查询全部井，是否匹配，只要有一项不匹配则show为false
+      for (const marker of this.markers) {
+        let show = true
+        // 关键字不为空，且没有匹配成功，不显示， 关键字匹配井编号和位置
+        if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.position.indexOf(keywords) !== -1)) {
+          show = false
+        }
+        // 部门不为空， 且没有匹配成功，多部门匹配
+        if (deptids.length > 0 && deptids.indexOf(marker.deptid) === -1) {
+          show = false
+        }
+        // 井类型不为空，且没有匹配成功
+        if (wellTypes && wellTypes.length > 0 && wellTypes.indexOf(marker.wellType) === -1) {
+          show = false
+        }
+        // 如果show为false，放入需要隐藏的井id列表
+        if (show === false) {
+          hideWellIds.push(marker.wellId)
+        } else {
+          center = marker.lnglat
+        }
+        marker.visible = show
+      }
+      this.resetMassMarker()
+    },
+    // 重置海量点，根据marker的visible属性，重置海量点图层数据
+    resetMassMarker() {
+      const { map } = this
+      const markers = this.markers.filter(item => item.visible) // 过滤全部visible为true的显示
+      if (markers.length === 0) {
+        this.massMarks.clear()
+      } else {
+        this.massMarks.setData(markers)
+      }
+      // 将海量点添加至地图实例
+      this.massMarks.setMap(map)
+    },
+    // 加载聚合点
+    mountClusters() {
+      const self = this
+      // 聚合点数据应该是一组包含经纬度信息的数组。lnglat 为经纬度信息字段，weight 字段为可选数据，表示权重值，以权重高的点为中心进行聚合。
+      var points = this.markers
+      const markers = []
+      var icon = new window.AMap.Icon({
+        size: toSize(20, 20), // 图标尺寸
+        image: 'static/images/well/pin.svg', // Icon的图像
+        imageSize: toSize(20, 20) // 根据所设置的大小拉伸或压缩图片
+      })
+      for (var i = 0; i < points.length; i += 1) {
+        markers.push(new window.AMap.Marker({
+          position: points[i]['lnglat'],
+          icon: icon, // 添加 Icon 实例
+          draggable: true,
+          offset: toPixel(-10, 0)
+        }))
+      }
+      // 添加聚合组件
+      const map = aMapManager.getMap()
+      const cluster = new window.AMap.MarkerClusterer(map, markers, {
+        gridSize: 80,
+        renderCluserMarker: self._renderCluserMarker,
+        maxZoom: 16 })
+    },
+    _renderCluserMarker(context) {
+      console.log(context)
+      const count = this.markers.length
+      const factor = Math.pow(context.count / count, 1 / 18)
+      const div = document.createElement('div')
+      const Hue = 180 - factor * 180
+      const bgColor = 'hsla(' + Hue + ',100%,50%,0.9)'
+      const fontColor = '#ffffff'
+      const borderColor = 'hsla(' + Hue + ',100%,40%,1)'
+      const shadowColor = 'hsla(' + Hue + ',100%,50%,1)'
+      div.style.backgroundColor = bgColor
+      const size = Math.round(30 + Math.pow(context.count / count, 1 / 5) * 20)
+      div.style.width = div.style.height = size + 'px'
+      div.style.border = 'solid 1px ' + borderColor
+      div.style.borderRadius = size / 2 + 'px'
+      div.style.boxShadow = '0 0 1px ' + shadowColor
+      div.innerHTML = context.count
+      div.style.lineHeight = size + 'px'
+      div.style.color = fontColor
+      div.style.fontSize = '14px'
+      div.style.textAlign = 'center'
+      context.marker.setOffset(new AMap.Pixel(-size / 2, -size / 2))
+      context.marker.setContent(div)
+    },
+    // 初始化海量点，并不复制
+    initMassMarker() {
+      const { map, massMarkerUrl, massMarkerSize, massMarkerOffset } = this
+      this.firstAmount = false
+      // 海量点样式
+      const style = { url: massMarkerUrl, anchor: toPixel(massMarkerOffset), size: toSize(massMarkerSize) }
+      // 海量点初始化
+      this.massMarks = new window.AMap.MassMarks([], {
+        zIndex: 5, // 海量点图层叠加的顺序
+        zooms: [3, 18], // 在指定地图缩放级别范围内展示海量点图层
+        style: style // 设置样式对象
+      })
+      // this.massMarks.setData(this.markers)
+      this.massMarks.setMap(map)
+      // 点击弹窗
+      this.massMarks.on('click', e => {
+        this.openInfoWindow(e.data.id, e.data.lnglat, -massMarkerOffset[1])
+      })
+      console.log('初始化海量点完毕')
+    },
+    // 获取全部井列表
+    fetchWellList() {
+      this.loading = true
+      getWellList().then(response => {
+        this.loading = false
+        if (response.code === 200) {
+          const wells = response.data
+          if (wells.length > 0) {
+            this.markers = []
+            for (const well of wells) {
+              const marker = {
+                ...well,
+                lnglat: [parseFloat(well.lngGaode), parseFloat(well.latGaode)],
+                icon: this.commonIcon,
+                visible: true,
+                wellStatus: 'normal',
+                draggable: true
+              }
+              this.markers.push(marker)
+              this.searchMarkers = this.markers
+            }
+            if (this.type === 'massMarkers') {
+              this.initMassMarker() // 加载海量点
+            } else if (this.type === 'cluster' && this.checkedLayer.indexOf('well') > -1) {
+              this.mountClusters() // 加载聚合点
+            }
+          }
+        }
+      })
+    },
+    // 关闭所有弹窗
+    clearInfoWindow() {
+      const { map } = this
+      map.clearInfoWindow()
+    },
+    /**
+     * 打开井详情弹窗
+     * @param wellId 井id
+     * @param coordinates 弹窗位置： [经度，纬度]
+     * @param offsetY 弹窗Y轴偏移，为负值
+     */
+    moveInfoShow(wellId, coordinates, offsetY) {
+      console.log(wellId, coordinates, offsetY)
+      this.clearInfoWindow()
+      // 首先获取井详情
+      getWellInfo(wellId).then(response => {
+        if (response.code === 200) {
+          const wellInfo = { ...response.data }
+          // 加载弹窗组件
+          const WellInfo = Vue.extend({
+            render: h => h(movePostion, { props: { wellInfo: wellInfo }})
+          })
+          const wellWindow = new WellInfo().$mount()
+          const infoWindow = new window.AMap.InfoWindow({
+            content: wellWindow.$el, // 显示内容
+            offset: [0, offsetY], // 偏移
+            autoMove: true // 是否自动调整窗体到视野内
+          })
+          infoWindow.open(this.map, new toLngLat(coordinates))
+        }
+      })
+    },
+    openInfoWindow(wellId, coordinates, offsetY) {
+      this.clearInfoWindow()
+      // 首先获取井详情
+      getWellInfo(wellId).then(response => {
+        if (response.code === 200) {
+          const wellInfo = { ...response.data }
+          // 加载弹窗组件
+          const WellInfo = Vue.extend({
+            render: h => h(WellInfoWindow, { props: { wellInfo: wellInfo }})
+          })
+          const wellWindow = new WellInfo().$mount()
+          const infoWindow = new window.AMap.InfoWindow({
+            content: wellWindow.$el, // 显示内容
+            offset: [0, offsetY], // 偏移
+            autoMove: true // 是否自动调整窗体到视野内
+          })
+          infoWindow.open(this.map, new toLngLat(coordinates))
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss">
+// 查询框
+.map-search-div{
+  position: absolute;
+  z-index: 100;
+  padding: 5px 20px;
+  background-color: rgba(244, 244, 244, 0.9);
+  /*left: 90px;*/
+  .el-form-item{
+    margin-bottom: 0px;
+  }
+}
+// 刷新框
+.function-div{
+  position: absolute;
+  right: 10px;
+  top: 7px;
+  z-index: 1100;
+  padding: 10px;
+  color: #ce8b74;
+  font-size: 14px;
+  /*background-color: rgba(244, 233, 230, 1.0);*/
+  .font-red{
+    color: red;
+    font-weight: bold;
+  }
+  .el-icon-refresh:hover{
+    color: red;
+    font-weight: bold;
+    cursor: pointer;
+  }
+}
+// 刷新框
+.refresh-div{
+  position: absolute;
+  right: 10px;
+  top: 7px;
+  z-index: 100;
+  padding: 10px;
+  color: #ce8b74;
+  font-size: 14px;
+  background-color: rgba(244, 233, 230, 1.0);
+  .font-red{
+    color: red;
+    font-weight: bold;
+  }
+  .el-icon-refresh:hover{
+    color: red;
+    font-weight: bold;
+    cursor: pointer;
+  }
+}
+// 地图
+.overview-map-container{
+  width: 100%;
+  .map-demo{
+    width: 100%;
+    .svg-icon{
+      width: 20px;
+      height: 20px;
+    }
+    .alarm-icon{
+      width: 29px;
+      height: 30px;
+    }
+    .nomal-info-window{
+      background-color: pink;
+    }
+
+  }
+}
+
+.search-marker{
+  position: relative;
+  .search-marker-image{
+    width: 100%;
+    height: 100%;
+  }
+  .search-marker-label{
+    position:absolute;
+    font-size: 14px;
+    font-weight: 600;
+    color:#FFF;
+    z-index:50;
+    top: 4px;
+    left: 50%;
+    transform: translateX(-50%)
+  }
+}
+</style>