diff --git a/src/assets/overview/pure-position-icon.png b/src/assets/overview/pure-position-icon.png
new file mode 100644
index 0000000..cbe9434
--- /dev/null
+++ b/src/assets/overview/pure-position-icon.png
Binary files differ

diff --git a/src/assets/overview/pure-position-icon.png b/src/assets/overview/pure-position-icon.png
new file mode 100644
index 0000000..cbe9434
--- /dev/null
+++ b/src/assets/overview/pure-position-icon.png
Binary files differ
diff --git a/src/components/Amap/AMapMarker.vue b/src/components/Amap/AMapMarker.vue
index 42be2b3..474442c 100644
--- a/src/components/Amap/AMapMarker.vue
+++ b/src/components/Amap/AMapMarker.vue
@@ -98,6 +98,7 @@
     }).$mount()
   },
   destroyed() {
+    this.map.remove(this.$amapComponent)
     this.tmpVM.$destroy()
     if (this.$customContent && this.$customContent.$destroy) {
       this.$customContent.$destroy()

diff --git a/src/assets/overview/pure-position-icon.png b/src/assets/overview/pure-position-icon.png
new file mode 100644
index 0000000..cbe9434
--- /dev/null
+++ b/src/assets/overview/pure-position-icon.png
Binary files differ
diff --git a/src/components/Amap/AMapMarker.vue b/src/components/Amap/AMapMarker.vue
index 42be2b3..474442c 100644
--- a/src/components/Amap/AMapMarker.vue
+++ b/src/components/Amap/AMapMarker.vue
@@ -98,6 +98,7 @@
     }).$mount()
   },
   destroyed() {
+    this.map.remove(this.$amapComponent)
     this.tmpVM.$destroy()
     if (this.$customContent && this.$customContent.$destroy) {
       this.$customContent.$destroy()
diff --git a/src/views/overview/components/mapSearchComp.vue b/src/views/overview/components/mapSearchComp.vue
new file mode 100644
index 0000000..22ef568
--- /dev/null
+++ b/src/views/overview/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/assets/overview/pure-position-icon.png b/src/assets/overview/pure-position-icon.png
new file mode 100644
index 0000000..cbe9434
--- /dev/null
+++ b/src/assets/overview/pure-position-icon.png
Binary files differ
diff --git a/src/components/Amap/AMapMarker.vue b/src/components/Amap/AMapMarker.vue
index 42be2b3..474442c 100644
--- a/src/components/Amap/AMapMarker.vue
+++ b/src/components/Amap/AMapMarker.vue
@@ -98,6 +98,7 @@
     }).$mount()
   },
   destroyed() {
+    this.map.remove(this.$amapComponent)
     this.tmpVM.$destroy()
     if (this.$customContent && this.$customContent.$destroy) {
       this.$customContent.$destroy()
diff --git a/src/views/overview/components/mapSearchComp.vue b/src/views/overview/components/mapSearchComp.vue
new file mode 100644
index 0000000..22ef568
--- /dev/null
+++ b/src/views/overview/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/overview/components/mapSearchItem.vue b/src/views/overview/components/mapSearchItem.vue
new file mode 100644
index 0000000..5cdce0d
--- /dev/null
+++ b/src/views/overview/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/assets/overview/pure-position-icon.png b/src/assets/overview/pure-position-icon.png
new file mode 100644
index 0000000..cbe9434
--- /dev/null
+++ b/src/assets/overview/pure-position-icon.png
Binary files differ
diff --git a/src/components/Amap/AMapMarker.vue b/src/components/Amap/AMapMarker.vue
index 42be2b3..474442c 100644
--- a/src/components/Amap/AMapMarker.vue
+++ b/src/components/Amap/AMapMarker.vue
@@ -98,6 +98,7 @@
     }).$mount()
   },
   destroyed() {
+    this.map.remove(this.$amapComponent)
     this.tmpVM.$destroy()
     if (this.$customContent && this.$customContent.$destroy) {
       this.$customContent.$destroy()
diff --git a/src/views/overview/components/mapSearchComp.vue b/src/views/overview/components/mapSearchComp.vue
new file mode 100644
index 0000000..22ef568
--- /dev/null
+++ b/src/views/overview/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/overview/components/mapSearchItem.vue b/src/views/overview/components/mapSearchItem.vue
new file mode 100644
index 0000000..5cdce0d
--- /dev/null
+++ b/src/views/overview/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/overview/components/popupLocation.vue b/src/views/overview/components/popupLocation.vue
index 8a8e836..6ad655b 100644
--- a/src/views/overview/components/popupLocation.vue
+++ b/src/views/overview/components/popupLocation.vue
@@ -18,7 +18,7 @@
               <el-input v-model="query.lng" />
             </el-form-item>
             <el-form-item label="纬度">
-              <el-input v-model="query.lng" />
+              <el-input v-model="query.lat" />
             </el-form-item>
             <div class="btn-line">
               <el-button class="filter-item" type="primary" size="small" @click="picker">
@@ -39,6 +39,10 @@
 export default {
   name: 'PopupLocation',
   props: {
+    defaultPosition: {
+      type: Array,
+      default: () => []
+    },
     show: {
       type: Boolean,
       default: true
@@ -53,6 +57,12 @@
       } // 筛选条件
     }
   },
+  mounted() {
+    if (this.position && this.position.length > 1) {
+      this.query.lng = this.position[0]
+      this.query.lat = this.position[1]
+    }
+  },
   methods: {
     // 关闭窗口
     close() {

diff --git a/src/assets/overview/pure-position-icon.png b/src/assets/overview/pure-position-icon.png
new file mode 100644
index 0000000..cbe9434
--- /dev/null
+++ b/src/assets/overview/pure-position-icon.png
Binary files differ
diff --git a/src/components/Amap/AMapMarker.vue b/src/components/Amap/AMapMarker.vue
index 42be2b3..474442c 100644
--- a/src/components/Amap/AMapMarker.vue
+++ b/src/components/Amap/AMapMarker.vue
@@ -98,6 +98,7 @@
     }).$mount()
   },
   destroyed() {
+    this.map.remove(this.$amapComponent)
     this.tmpVM.$destroy()
     if (this.$customContent && this.$customContent.$destroy) {
       this.$customContent.$destroy()
diff --git a/src/views/overview/components/mapSearchComp.vue b/src/views/overview/components/mapSearchComp.vue
new file mode 100644
index 0000000..22ef568
--- /dev/null
+++ b/src/views/overview/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/overview/components/mapSearchItem.vue b/src/views/overview/components/mapSearchItem.vue
new file mode 100644
index 0000000..5cdce0d
--- /dev/null
+++ b/src/views/overview/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/overview/components/popupLocation.vue b/src/views/overview/components/popupLocation.vue
index 8a8e836..6ad655b 100644
--- a/src/views/overview/components/popupLocation.vue
+++ b/src/views/overview/components/popupLocation.vue
@@ -18,7 +18,7 @@
               <el-input v-model="query.lng" />
             </el-form-item>
             <el-form-item label="纬度">
-              <el-input v-model="query.lng" />
+              <el-input v-model="query.lat" />
             </el-form-item>
             <div class="btn-line">
               <el-button class="filter-item" type="primary" size="small" @click="picker">
@@ -39,6 +39,10 @@
 export default {
   name: 'PopupLocation',
   props: {
+    defaultPosition: {
+      type: Array,
+      default: () => []
+    },
     show: {
       type: Boolean,
       default: true
@@ -53,6 +57,12 @@
       } // 筛选条件
     }
   },
+  mounted() {
+    if (this.position && this.position.length > 1) {
+      this.query.lng = this.position[0]
+      this.query.lat = this.position[1]
+    }
+  },
   methods: {
     // 关闭窗口
     close() {
diff --git a/src/views/overview/components/searchComp.vue b/src/views/overview/components/searchComp.vue
deleted file mode 100644
index d6f138a..0000000
--- a/src/views/overview/components/searchComp.vue
+++ /dev/null
@@ -1,109 +0,0 @@
-<!--
- * @Description: 搜索组件
- * @Author: 王晓颖
- * @Date: 2022-05-18
- -->
-<template>
-  <div>
-    <!--搜索条件-->
-    <div class="map-search-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="290"
-      trigger="click"
-    >
-      <el-card slot="reference" shadow="always" class="selectAnswer">
-        共找到 {{ list.length }} 个符合条件的{{ name }}
-      </el-card>
-      <div v-show="list.length>0">
-        <search-item v-for="(data,index) in currentPageList" :key="'search-item-'+index" :data="data" :index="index" @click="clickItem" />
-      </div>
-      <div class="clear" />
-      <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>
-export default {
-  name: 'SearchComp',
-  props: {
-    name: {
-      type: String,
-      default: '井'
-    }, // 结果展示类型
-    placeholder: {
-      type: String,
-      default: '关键字'
-    },
-    list: {
-      type: Array,
-      default: () => []
-    } // 结果列表
-  },
-  data() {
-    return {
-      resultShow: false, // 是否显示查询结果
-      keywords: '', // 查询条件
-      currentPageList: [], // 当前页数据
-      pageSize: 5, // 页面容量
-      pageNum: 1 // 页码
-    }
-  },
-  watch: {
-    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;
-}
-</style>

diff --git a/src/assets/overview/pure-position-icon.png b/src/assets/overview/pure-position-icon.png
new file mode 100644
index 0000000..cbe9434
--- /dev/null
+++ b/src/assets/overview/pure-position-icon.png
Binary files differ
diff --git a/src/components/Amap/AMapMarker.vue b/src/components/Amap/AMapMarker.vue
index 42be2b3..474442c 100644
--- a/src/components/Amap/AMapMarker.vue
+++ b/src/components/Amap/AMapMarker.vue
@@ -98,6 +98,7 @@
     }).$mount()
   },
   destroyed() {
+    this.map.remove(this.$amapComponent)
     this.tmpVM.$destroy()
     if (this.$customContent && this.$customContent.$destroy) {
       this.$customContent.$destroy()
diff --git a/src/views/overview/components/mapSearchComp.vue b/src/views/overview/components/mapSearchComp.vue
new file mode 100644
index 0000000..22ef568
--- /dev/null
+++ b/src/views/overview/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/overview/components/mapSearchItem.vue b/src/views/overview/components/mapSearchItem.vue
new file mode 100644
index 0000000..5cdce0d
--- /dev/null
+++ b/src/views/overview/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/overview/components/popupLocation.vue b/src/views/overview/components/popupLocation.vue
index 8a8e836..6ad655b 100644
--- a/src/views/overview/components/popupLocation.vue
+++ b/src/views/overview/components/popupLocation.vue
@@ -18,7 +18,7 @@
               <el-input v-model="query.lng" />
             </el-form-item>
             <el-form-item label="纬度">
-              <el-input v-model="query.lng" />
+              <el-input v-model="query.lat" />
             </el-form-item>
             <div class="btn-line">
               <el-button class="filter-item" type="primary" size="small" @click="picker">
@@ -39,6 +39,10 @@
 export default {
   name: 'PopupLocation',
   props: {
+    defaultPosition: {
+      type: Array,
+      default: () => []
+    },
     show: {
       type: Boolean,
       default: true
@@ -53,6 +57,12 @@
       } // 筛选条件
     }
   },
+  mounted() {
+    if (this.position && this.position.length > 1) {
+      this.query.lng = this.position[0]
+      this.query.lat = this.position[1]
+    }
+  },
   methods: {
     // 关闭窗口
     close() {
diff --git a/src/views/overview/components/searchComp.vue b/src/views/overview/components/searchComp.vue
deleted file mode 100644
index d6f138a..0000000
--- a/src/views/overview/components/searchComp.vue
+++ /dev/null
@@ -1,109 +0,0 @@
-<!--
- * @Description: 搜索组件
- * @Author: 王晓颖
- * @Date: 2022-05-18
- -->
-<template>
-  <div>
-    <!--搜索条件-->
-    <div class="map-search-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="290"
-      trigger="click"
-    >
-      <el-card slot="reference" shadow="always" class="selectAnswer">
-        共找到 {{ list.length }} 个符合条件的{{ name }}
-      </el-card>
-      <div v-show="list.length>0">
-        <search-item v-for="(data,index) in currentPageList" :key="'search-item-'+index" :data="data" :index="index" @click="clickItem" />
-      </div>
-      <div class="clear" />
-      <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>
-export default {
-  name: 'SearchComp',
-  props: {
-    name: {
-      type: String,
-      default: '井'
-    }, // 结果展示类型
-    placeholder: {
-      type: String,
-      default: '关键字'
-    },
-    list: {
-      type: Array,
-      default: () => []
-    } // 结果列表
-  },
-  data() {
-    return {
-      resultShow: false, // 是否显示查询结果
-      keywords: '', // 查询条件
-      currentPageList: [], // 当前页数据
-      pageSize: 5, // 页面容量
-      pageNum: 1 // 页码
-    }
-  },
-  watch: {
-    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;
-}
-</style>
diff --git a/src/views/overview/components/searchItem.vue b/src/views/overview/components/searchItem.vue
deleted file mode 100644
index eb1a0ce..0000000
--- a/src/views/overview/components/searchItem.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-<!--
- * @Description: 搜索结果项组件
- * @Author: 王晓颖
- * @Date: 2022-05-18
- -->
-<template>
-  <div :key="data[props.label]" class="search-card" @click="clickItem()">
-    <div class="card-left">
-      {{ index+1 }}
-    </div>
-    <div class="card-right">
-      <div class="card-title">
-        {{ 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;
-  .card-left,.card-right{
-    float:left
-  }
-  .card-left{
-    width:10%;
-    line-height:25px;
-  }
-  .card-right{
-    width:90%;
-  }
-  .card-title{
-    font-size:16px;
-    font-weight: bold;
-    line-height: 25px;
-  }
-  .card-detail{
-    line-height:25px;
-  }
-}
-</style>

diff --git a/src/assets/overview/pure-position-icon.png b/src/assets/overview/pure-position-icon.png
new file mode 100644
index 0000000..cbe9434
--- /dev/null
+++ b/src/assets/overview/pure-position-icon.png
Binary files differ
diff --git a/src/components/Amap/AMapMarker.vue b/src/components/Amap/AMapMarker.vue
index 42be2b3..474442c 100644
--- a/src/components/Amap/AMapMarker.vue
+++ b/src/components/Amap/AMapMarker.vue
@@ -98,6 +98,7 @@
     }).$mount()
   },
   destroyed() {
+    this.map.remove(this.$amapComponent)
     this.tmpVM.$destroy()
     if (this.$customContent && this.$customContent.$destroy) {
       this.$customContent.$destroy()
diff --git a/src/views/overview/components/mapSearchComp.vue b/src/views/overview/components/mapSearchComp.vue
new file mode 100644
index 0000000..22ef568
--- /dev/null
+++ b/src/views/overview/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/overview/components/mapSearchItem.vue b/src/views/overview/components/mapSearchItem.vue
new file mode 100644
index 0000000..5cdce0d
--- /dev/null
+++ b/src/views/overview/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/overview/components/popupLocation.vue b/src/views/overview/components/popupLocation.vue
index 8a8e836..6ad655b 100644
--- a/src/views/overview/components/popupLocation.vue
+++ b/src/views/overview/components/popupLocation.vue
@@ -18,7 +18,7 @@
               <el-input v-model="query.lng" />
             </el-form-item>
             <el-form-item label="纬度">
-              <el-input v-model="query.lng" />
+              <el-input v-model="query.lat" />
             </el-form-item>
             <div class="btn-line">
               <el-button class="filter-item" type="primary" size="small" @click="picker">
@@ -39,6 +39,10 @@
 export default {
   name: 'PopupLocation',
   props: {
+    defaultPosition: {
+      type: Array,
+      default: () => []
+    },
     show: {
       type: Boolean,
       default: true
@@ -53,6 +57,12 @@
       } // 筛选条件
     }
   },
+  mounted() {
+    if (this.position && this.position.length > 1) {
+      this.query.lng = this.position[0]
+      this.query.lat = this.position[1]
+    }
+  },
   methods: {
     // 关闭窗口
     close() {
diff --git a/src/views/overview/components/searchComp.vue b/src/views/overview/components/searchComp.vue
deleted file mode 100644
index d6f138a..0000000
--- a/src/views/overview/components/searchComp.vue
+++ /dev/null
@@ -1,109 +0,0 @@
-<!--
- * @Description: 搜索组件
- * @Author: 王晓颖
- * @Date: 2022-05-18
- -->
-<template>
-  <div>
-    <!--搜索条件-->
-    <div class="map-search-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="290"
-      trigger="click"
-    >
-      <el-card slot="reference" shadow="always" class="selectAnswer">
-        共找到 {{ list.length }} 个符合条件的{{ name }}
-      </el-card>
-      <div v-show="list.length>0">
-        <search-item v-for="(data,index) in currentPageList" :key="'search-item-'+index" :data="data" :index="index" @click="clickItem" />
-      </div>
-      <div class="clear" />
-      <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>
-export default {
-  name: 'SearchComp',
-  props: {
-    name: {
-      type: String,
-      default: '井'
-    }, // 结果展示类型
-    placeholder: {
-      type: String,
-      default: '关键字'
-    },
-    list: {
-      type: Array,
-      default: () => []
-    } // 结果列表
-  },
-  data() {
-    return {
-      resultShow: false, // 是否显示查询结果
-      keywords: '', // 查询条件
-      currentPageList: [], // 当前页数据
-      pageSize: 5, // 页面容量
-      pageNum: 1 // 页码
-    }
-  },
-  watch: {
-    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;
-}
-</style>
diff --git a/src/views/overview/components/searchItem.vue b/src/views/overview/components/searchItem.vue
deleted file mode 100644
index eb1a0ce..0000000
--- a/src/views/overview/components/searchItem.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-<!--
- * @Description: 搜索结果项组件
- * @Author: 王晓颖
- * @Date: 2022-05-18
- -->
-<template>
-  <div :key="data[props.label]" class="search-card" @click="clickItem()">
-    <div class="card-left">
-      {{ index+1 }}
-    </div>
-    <div class="card-right">
-      <div class="card-title">
-        {{ 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;
-  .card-left,.card-right{
-    float:left
-  }
-  .card-left{
-    width:10%;
-    line-height:25px;
-  }
-  .card-right{
-    width:90%;
-  }
-  .card-title{
-    font-size:16px;
-    font-weight: bold;
-    line-height: 25px;
-  }
-  .card-detail{
-    line-height:25px;
-  }
-}
-</style>
diff --git a/src/views/overview/overviewAmap.vue b/src/views/overview/overviewAmap.vue
index 0ee8bfd..fa1f599 100644
--- a/src/views/overview/overviewAmap.vue
+++ b/src/views/overview/overviewAmap.vue
@@ -4,12 +4,22 @@
     <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="alarmWell of alarmWells" :visible="showAlarm && alarmWell.visible" :position="alarmWell.coordinates" :offset="alarmOffset">
           <el-image :src="alarmIcon" :style="{'width':alarmIconSize[0]+'px','height':alarmIconSize[1]+'px'}" fit="fill" @click="openAlarmWindow(alarmWell.wellId, alarmWell.coordinates)" />
         </a-map-marker>
+        <!--搜索结果点标注-->
+        <a-map-marker v-for="(marker,index) of searchMarkers" :position="marker.lnglat" :offset="alarmOffset">
+          <div class="search-marker" :style="{'width':searchResultSize[0]+'px','height':searchResultSize[1]+'px'}" @click="openInfoWindow(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>
       <!--搜索框-->
-      <search-comp :list="resultList" placeholder="井编号/名称/位置" @search="search" />
+      <map-search-comp :list="resultList" placeholder="井编号/名称/位置" @search="search" @change-page="searchPageChange" @click-item="searchItemClick" @clear="clearSearch" />
       <!--报警列表-->
       <alarm-list :show="showAlarm" :data="alarmList" @row-click="alarmRowClick" />
       <!--工具箱-->
@@ -17,7 +27,7 @@
       <!--数据筛选窗口-->
       <popup-data-filter :show="menus.dataFilterWindowShow" :well-type-list="wellTypeList" @filter="dataFilter" @close="closePopupDataFilter" />
       <!--坐标定位窗口-->
-      <popup-location :show="menus.locationWindowShow" @search="setCenter" @picker="pickerPosition" @close="closePopupLocation" />
+      <popup-location ref="popupLocation" :show="menus.locationWindowShow" @search="setCenter" @picker="pickerPosition" @close="closePopupLocation" />
     </div>
   </div>
 </template>
@@ -37,11 +47,11 @@
 import ToolBox from '@/views/overview/components/toolBox'
 import PopupDataFilter from '@/views/overview/components/popupDataFilter'
 import PopupLocation from '@/views/overview/components/popupLocation'
-import SearchComp from '@/views/overview/components/searchComp'
+import MapSearchComp from '@/views/overview/components/mapSearchComp'
 
 export default {
   name: 'Overview',
-  components: { SearchComp, PopupLocation, PopupDataFilter, ToolBox, AlarmList, AMapMarker, AMapContainer, DeptSelect },
+  components: { MapSearchComp, PopupLocation, PopupDataFilter, ToolBox, AlarmList, AMapMarker, AMapContainer, DeptSelect },
   data() {
     return {
       map: null, // 地图对象
@@ -60,7 +70,10 @@
       wellOffset: [-8, -16], // 井偏移量
       massMarkerUrl: './static/overview/icon-location-small.png',
       massMarkerSize: [15, 15],
-      massMarkerOffset: [8, 8],
+      massMarkerOffset: [0, 8],
+      searchResultSize: [24, 30],
+      searchResultOffset: [-12, -30],
+      searchResultIcon: require('@/assets/overview/pure-position-icon.png'), // 报警图标
       showAlarm: true, // 是否显示报警
       toolShow: false, // 工具栏是否显示
       menus: {
@@ -83,6 +96,7 @@
       alarmList: [], // 显示报警列表
       alarmWells: [], // 报警井列表
       resultList: [], // 搜索结果列表
+      searchMarkers: [], // 当前搜索页展示marker集合
       latestAlarmTime: '', // 列表中最新报警事件
       alarmFirstAmount: true, // 是否初次加载报警
       firstAmount: true, // 是否第一次加载井数据
@@ -91,6 +105,7 @@
       massMarks: null, // 海量点对象
       mapMarkers: [], // 查询结果列表
       clusters: [], // 聚合
+      tempMarker: null,
       showClearBtn: false // 是否显示清除查询按钮
     }
   },
@@ -103,11 +118,21 @@
   watch: {
     needRefresh(val) { // 需要刷新报警
       if (val) this.refreshAlarm()
+    },
+    'menus.locationWindowShow'(val) { // 打开弹窗设置默认中心，关闭弹窗清空屏幕
+      if (val) {
+        this.$refs.popupLocation.setQuery(this.center)
+      } else {
+        this.map.remove(this.tempMarker)
+      }
     }
   },
   created() {
     this.fetchWellType()
   },
+  mounted() {
+    this.resultList = []
+  },
   beforeDestroy() {
     if (this.clock) {
       clearInterval(this.clock)
@@ -184,22 +209,34 @@
         this.filterAlarm(listQuery, showMessage)
       }
     },
+    // 清空查询
+    clearSearch() {
+      this.searchMarkers = []
+      this.resultList = []
+    },
     // 数据查询
     search(keywords) {
       if (keywords === '') {
         this.$message.warning('搜索条件不能为空')
       } else {
-        // todo: 待完善查询逻辑
-        this.resultList = this.markers
+        this.resultList = this.markers.filter(item => {
+          if (item.wellCode.includes(keywords) || item.wellName.includes(keywords) || item.position.includes(keywords)) {
+            return true
+          } else {
+            return false
+          }
+        })
       }
     },
-    // 清除查询
-    clearSearch() {
-      // this.listQuery.wellType = ''
-      // this.listQuery.deptid = ''
-      // this.listQuery.keywords = ''
-      // this.filterIcon()
-      // this.showClearBtn = false
+    // 搜索结果页面变化，触发地图展示列表中所有
+    searchPageChange(currentMarkers) {
+      // 增加查询展示图层
+      this.searchMarkers = currentMarkers
+    },
+    // 点击搜索结果项居中，弹窗
+    searchItemClick(marker) {
+      this.center = marker.lnglat
+      this.openInfoWindow(marker.wellId, marker.lnglat, this.searchResultOffset[1])
     },
     // 过滤海量点，给markers赋visible值
     filterMassMarker(listQuery, showMessage = false) {
@@ -516,7 +553,7 @@
      * @param coordinates 弹窗位置： [经度，纬度]
      * @param offsetY 弹窗Y轴偏移，为负值
      */
-    openInfoWindow(wellId, coordinates, offsetY = 0) {
+    openInfoWindow(wellId, coordinates, offsetY) {
       this.clearInfoWindow()
       // 首先获取井详情
       getWellInfo(wellId).then(response => {
@@ -578,13 +615,43 @@
     closePopupDataFilter() {
       Object.assign(this.menus, { dataFilterWindowShow: false })
     },
-    // TODO: 坐标定位，居中，绘点
-    setCenter() {
-
+    // 坐标定位，居中，绘点
+    setCenter(position) {
+      const { searchResultOffset, searchResultIcon, searchResultSize } = this
+      this.center = position
+      const icon = new window.AMap.Icon({
+        size: toSize(searchResultSize), // 图标尺寸
+        image: searchResultIcon, // Icon的图像
+        imageSize: toSize(searchResultSize) // 根据所设置的大小拉伸或压缩图片
+      })
+      const marker = new window.AMap.Marker({
+        icon: icon,
+        position: position,
+        offset: toPixel(searchResultOffset)
+      })
+      marker.setMap(this.map)
+      this.tempMarker = marker
     },
-    // TODO: 坐标拾取， 在地图上绘点
+    // 坐标拾取， 在地图上绘点
     pickerPosition() {
-
+      const { searchResultOffset, searchResultIcon, searchResultSize, center } = this
+      const icon = new window.AMap.Icon({
+        size: toSize(searchResultSize), // 图标尺寸
+        image: searchResultIcon, // Icon的图像
+        imageSize: toSize(searchResultSize) // 根据所设置的大小拉伸或压缩图片
+      })
+      const marker = new window.AMap.Marker({
+        icon: icon,
+        position: center,
+        offset: toPixel(searchResultOffset),
+        draggable: true
+      })
+      marker.on('dragend', e => {
+        const position = [e.lnglat.lng, e.lnglat.lat]
+        this.$refs.popupLocation.setQuery(position)
+      })
+      marker.setMap(this.map)
+      this.tempMarker = marker
     },
     // TODO: 关闭坐标定位窗口， 清除地图上的标注
     closePopupLocation() {
@@ -690,4 +757,21 @@
   }
 }
 
+.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>