diff --git a/config/dev.env.js b/config/dev.env.js
index b62643c..cba3931 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -13,7 +13,9 @@
   // BASE_API: '"https://yjaqjk.bda.gov.cn/smartwell"'
   // BASE_API: '"http://192.168.1.113:11302/smartwell"'
   // BASE_API: '"https://smartlog.work/smartwell"'
-  BASE_API: '"http://111.198.10.15:11302/smartwell"'
+  // BASE_API: '"http://111.198.10.15:11302/smartwell"' //在用
+  BASE_API: '"http://192.168.43.120:11302"'
+
   // BASE_API: '"http://192.168.0.225:8083"'
   // BASE_API: '"http://127.0.0.1:14537"'
 })

diff --git a/config/dev.env.js b/config/dev.env.js
index b62643c..cba3931 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -13,7 +13,9 @@
   // BASE_API: '"https://yjaqjk.bda.gov.cn/smartwell"'
   // BASE_API: '"http://192.168.1.113:11302/smartwell"'
   // BASE_API: '"https://smartlog.work/smartwell"'
-  BASE_API: '"http://111.198.10.15:11302/smartwell"'
+  // BASE_API: '"http://111.198.10.15:11302/smartwell"' //在用
+  BASE_API: '"http://192.168.43.120:11302"'
+
   // BASE_API: '"http://192.168.0.225:8083"'
   // BASE_API: '"http://127.0.0.1:14537"'
 })
diff --git a/src/api/overview.js b/src/api/overview.js
index 8b15aeb..ffbb07c 100644
--- a/src/api/overview.js
+++ b/src/api/overview.js
@@ -3,13 +3,22 @@
  */
 import request from '@/utils/request'
 // 窨井查询
+// export function getWellList(params) {
+//   return request({
+//     url: 'overview/wellList',
+//     method: 'get',
+//     params
+//   })
+// }
+// 窨井查询
 export function getWellList(params) {
   return request({
-    url: 'overview/wellList',
+    url: 'overview/wellListDisplay',
     method: 'get',
     params
   })
 }
+
 // 获取窨井详情
 export function getWellInfo(id) {
   return request({

diff --git a/config/dev.env.js b/config/dev.env.js
index b62643c..cba3931 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -13,7 +13,9 @@
   // BASE_API: '"https://yjaqjk.bda.gov.cn/smartwell"'
   // BASE_API: '"http://192.168.1.113:11302/smartwell"'
   // BASE_API: '"https://smartlog.work/smartwell"'
-  BASE_API: '"http://111.198.10.15:11302/smartwell"'
+  // BASE_API: '"http://111.198.10.15:11302/smartwell"' //在用
+  BASE_API: '"http://192.168.43.120:11302"'
+
   // BASE_API: '"http://192.168.0.225:8083"'
   // BASE_API: '"http://127.0.0.1:14537"'
 })
diff --git a/src/api/overview.js b/src/api/overview.js
index 8b15aeb..ffbb07c 100644
--- a/src/api/overview.js
+++ b/src/api/overview.js
@@ -3,13 +3,22 @@
  */
 import request from '@/utils/request'
 // 窨井查询
+// export function getWellList(params) {
+//   return request({
+//     url: 'overview/wellList',
+//     method: 'get',
+//     params
+//   })
+// }
+// 窨井查询
 export function getWellList(params) {
   return request({
-    url: 'overview/wellList',
+    url: 'overview/wellListDisplay',
     method: 'get',
     params
   })
 }
+
 // 获取窨井详情
 export function getWellInfo(id) {
   return request({
diff --git a/src/components/leaftletMap/leafletMap.vue b/src/components/leaftletMap/leafletMap.vue
index 1df7067..4dee899 100644
--- a/src/components/leaftletMap/leafletMap.vue
+++ b/src/components/leaftletMap/leafletMap.vue
@@ -26,7 +26,7 @@
     }, // 图层地址列表
     zoom: { // 缩放层级
       type: Number,
-      default: 12
+      default: 21
     },
     zooms: {
       type: Array,
@@ -140,14 +140,6 @@
           this.renderMarkers()
         }
       }
-    },
-    // 是否显示报警
-    showAlarm(val) {
-      if (this.showAll) {
-        this.renderNormalMarkers() // 画正常井
-      } else {
-        this.renderMarkers()
-      }
     }
   },
   mounted() {
@@ -218,7 +210,7 @@
         const icon = L.icon({
           iconUrl: './static/images/map_images/alarm-well1.png',
           iconSize: size,
-          iconAnchor: anchor,
+          iconAnchor: [18, 15],
           popupAnchor: popupAnchor
         })
         const opts = {
@@ -230,15 +222,15 @@
         // console.log('坐标', [item.position.lat, item.position.lng])
         const marker = L.marker([item.position.lat, item.position.lng], opts)
         this.ciLayer.addLayer(marker)
-        map.setView(map.getCenter())
         this.overlays.push(marker)
       }
+      map.setView(map.getCenter())
       const that = this
       // 监听点击marker
       this.ciLayer.addOnClickListener(function(e, data) {
-        console.log('监听到点击告警信息')
-        console.log(e)
-        console.log(data[0].data.options)
+        // console.log('监听到点击告警信息')
+        // console.log(e)
+        // console.log(data[0].data.options)
         // 某井报警信息
         getWellAlarms(data[0].data.options.wellId).then(response => {
           if (response.code === 200) {
@@ -277,26 +269,20 @@
     },
     // 加载正常井markers
     renderNormalMarkers() {
-      console.log('渲染正常井图层')
+      // console.log('渲染正常井图层')
       const { map, normalMarkers, size, anchor, popupAnchor } = this
       if (!map) {
         return
       }
-      // if (this.ciLayer) {
-      //   console.log('清理图层')
-      //   map.removeLayer(this.ciLayer)
-      // }
       this.renderMarkers()
       // 正常图层
-      // this.ciLayer = L.canvasIconLayer({}).addTo(map)
-      // this.overlays = []
       // 遍历所有报警井信息
       for (const item of normalMarkers) {
         console.log('画正常井图层')
         const icon = L.icon({
-          iconUrl: './static/images/map_images/alarm-well.png',
-          iconSize: [25, 25],
-          iconAnchor: anchor,
+          iconUrl: './static/images/map_images/1.png',
+          iconSize: [12, 16],
+          iconAnchor: [6, 8],
           popupAnchor: popupAnchor
         })
         const opts = {
@@ -306,45 +292,8 @@
         }
         const marker = L.marker([item.coordinateY, item.coordinateX], opts)
         this.ciLayer.addLayer(marker)
-        // map.setView(map.getCenter())
-        // this.overlays.push(marker)
       }
-      const that = this
-      // 监听点击marker
-      this.ciLayer.addOnClickListener(function(e, data) {
-        console.log('监听到点击正常井信息')
-        console.log(e)
-        console.log(data[0].data.options)
-        getWellInfo(data[0].data.options.wellId).then(response => {
-          if (response.code === 200) {
-            const wellInfo = response.data
-            const normalInfo = {
-              wellCode: wellInfo.wellCode,
-              position: wellInfo.position,
-              wellTypeName: wellInfo.wellTypeName,
-              deptName: wellInfo.deptName,
-              bfztName: wellInfo.bfztName,
-              deep: wellInfo.deep
-            }
-            let dom = "<div class='alarm-window'>" +
-                "<div style='line-height: 20px;font-weight: bold;'>" + normalInfo.wellCode + '</div>' +
-                "<div style='line-height: 23px;font-size: 14px;'>"
-            dom += "<div class='divider'></div>" +
-                '<div>井类型： ' + normalInfo.wellTypeName + '</div>' +
-                '<div>权属单位：' + normalInfo.deptName + '</div>' +
-                '<div>详细地址：' + normalInfo.position + '</div>' +
-                '</div>' +
-                '</div>'
-            console.log('setPopupContent_inrender')
-            that.$emit('popupCenter', [e.latlng.lat, e.latlng.lng])
-            // 显示popup
-            L.popup()
-              .setLatLng([e.latlng.lat, e.latlng.lng])
-              .setContent(dom)
-              .openOn(map)
-          }
-        })
-      })
+      // map.setView(map.getCenter())
     },
     // 打开弹窗
     openAlarmInfoWindow(wellId) {
@@ -375,12 +324,14 @@
               '<div>详细地址：' + alarmInfo.position + '</div>' +
               '</div>' +
               '</div>'
-              map.setZoom(17)
+              // map.setZoom(17)
+              map.setZoom(37)
               console.log('ppp')
               console.log([overlay.getLatLng().lat, overlay.getLatLng().lng])
               this.$emit('popupCenter', [overlay.getLatLng().lat, overlay.getLatLng().lng])
               setTimeout(() => {
                 map.flyTo([overlay.getLatLng().lat, overlay.getLatLng().lng])
+                // map.panTo([overlay.getLatLng().lat, overlay.getLatLng().lng])
                 // 显示popup
                 L.popup()
                   .setLatLng([overlay.getLatLng().lat, overlay.getLatLng().lng])
@@ -391,6 +342,10 @@
           })
         }
       }
+    },
+    // 关闭弹窗
+    closePopup() {
+      this.map.closePopup()
     }
   }
 }
@@ -399,7 +354,8 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   .base-map {
     width:100%;
-    height: calc(100vh - 84px);
+    // height: calc(100vh - 84px);
+    height: calc(100vh - 115px);
   }
   .alarm-window{
     max-width: 250px;

diff --git a/config/dev.env.js b/config/dev.env.js
index b62643c..cba3931 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -13,7 +13,9 @@
   // BASE_API: '"https://yjaqjk.bda.gov.cn/smartwell"'
   // BASE_API: '"http://192.168.1.113:11302/smartwell"'
   // BASE_API: '"https://smartlog.work/smartwell"'
-  BASE_API: '"http://111.198.10.15:11302/smartwell"'
+  // BASE_API: '"http://111.198.10.15:11302/smartwell"' //在用
+  BASE_API: '"http://192.168.43.120:11302"'
+
   // BASE_API: '"http://192.168.0.225:8083"'
   // BASE_API: '"http://127.0.0.1:14537"'
 })
diff --git a/src/api/overview.js b/src/api/overview.js
index 8b15aeb..ffbb07c 100644
--- a/src/api/overview.js
+++ b/src/api/overview.js
@@ -3,13 +3,22 @@
  */
 import request from '@/utils/request'
 // 窨井查询
+// export function getWellList(params) {
+//   return request({
+//     url: 'overview/wellList',
+//     method: 'get',
+//     params
+//   })
+// }
+// 窨井查询
 export function getWellList(params) {
   return request({
-    url: 'overview/wellList',
+    url: 'overview/wellListDisplay',
     method: 'get',
     params
   })
 }
+
 // 获取窨井详情
 export function getWellInfo(id) {
   return request({
diff --git a/src/components/leaftletMap/leafletMap.vue b/src/components/leaftletMap/leafletMap.vue
index 1df7067..4dee899 100644
--- a/src/components/leaftletMap/leafletMap.vue
+++ b/src/components/leaftletMap/leafletMap.vue
@@ -26,7 +26,7 @@
     }, // 图层地址列表
     zoom: { // 缩放层级
       type: Number,
-      default: 12
+      default: 21
     },
     zooms: {
       type: Array,
@@ -140,14 +140,6 @@
           this.renderMarkers()
         }
       }
-    },
-    // 是否显示报警
-    showAlarm(val) {
-      if (this.showAll) {
-        this.renderNormalMarkers() // 画正常井
-      } else {
-        this.renderMarkers()
-      }
     }
   },
   mounted() {
@@ -218,7 +210,7 @@
         const icon = L.icon({
           iconUrl: './static/images/map_images/alarm-well1.png',
           iconSize: size,
-          iconAnchor: anchor,
+          iconAnchor: [18, 15],
           popupAnchor: popupAnchor
         })
         const opts = {
@@ -230,15 +222,15 @@
         // console.log('坐标', [item.position.lat, item.position.lng])
         const marker = L.marker([item.position.lat, item.position.lng], opts)
         this.ciLayer.addLayer(marker)
-        map.setView(map.getCenter())
         this.overlays.push(marker)
       }
+      map.setView(map.getCenter())
       const that = this
       // 监听点击marker
       this.ciLayer.addOnClickListener(function(e, data) {
-        console.log('监听到点击告警信息')
-        console.log(e)
-        console.log(data[0].data.options)
+        // console.log('监听到点击告警信息')
+        // console.log(e)
+        // console.log(data[0].data.options)
         // 某井报警信息
         getWellAlarms(data[0].data.options.wellId).then(response => {
           if (response.code === 200) {
@@ -277,26 +269,20 @@
     },
     // 加载正常井markers
     renderNormalMarkers() {
-      console.log('渲染正常井图层')
+      // console.log('渲染正常井图层')
       const { map, normalMarkers, size, anchor, popupAnchor } = this
       if (!map) {
         return
       }
-      // if (this.ciLayer) {
-      //   console.log('清理图层')
-      //   map.removeLayer(this.ciLayer)
-      // }
       this.renderMarkers()
       // 正常图层
-      // this.ciLayer = L.canvasIconLayer({}).addTo(map)
-      // this.overlays = []
       // 遍历所有报警井信息
       for (const item of normalMarkers) {
         console.log('画正常井图层')
         const icon = L.icon({
-          iconUrl: './static/images/map_images/alarm-well.png',
-          iconSize: [25, 25],
-          iconAnchor: anchor,
+          iconUrl: './static/images/map_images/1.png',
+          iconSize: [12, 16],
+          iconAnchor: [6, 8],
           popupAnchor: popupAnchor
         })
         const opts = {
@@ -306,45 +292,8 @@
         }
         const marker = L.marker([item.coordinateY, item.coordinateX], opts)
         this.ciLayer.addLayer(marker)
-        // map.setView(map.getCenter())
-        // this.overlays.push(marker)
       }
-      const that = this
-      // 监听点击marker
-      this.ciLayer.addOnClickListener(function(e, data) {
-        console.log('监听到点击正常井信息')
-        console.log(e)
-        console.log(data[0].data.options)
-        getWellInfo(data[0].data.options.wellId).then(response => {
-          if (response.code === 200) {
-            const wellInfo = response.data
-            const normalInfo = {
-              wellCode: wellInfo.wellCode,
-              position: wellInfo.position,
-              wellTypeName: wellInfo.wellTypeName,
-              deptName: wellInfo.deptName,
-              bfztName: wellInfo.bfztName,
-              deep: wellInfo.deep
-            }
-            let dom = "<div class='alarm-window'>" +
-                "<div style='line-height: 20px;font-weight: bold;'>" + normalInfo.wellCode + '</div>' +
-                "<div style='line-height: 23px;font-size: 14px;'>"
-            dom += "<div class='divider'></div>" +
-                '<div>井类型： ' + normalInfo.wellTypeName + '</div>' +
-                '<div>权属单位：' + normalInfo.deptName + '</div>' +
-                '<div>详细地址：' + normalInfo.position + '</div>' +
-                '</div>' +
-                '</div>'
-            console.log('setPopupContent_inrender')
-            that.$emit('popupCenter', [e.latlng.lat, e.latlng.lng])
-            // 显示popup
-            L.popup()
-              .setLatLng([e.latlng.lat, e.latlng.lng])
-              .setContent(dom)
-              .openOn(map)
-          }
-        })
-      })
+      // map.setView(map.getCenter())
     },
     // 打开弹窗
     openAlarmInfoWindow(wellId) {
@@ -375,12 +324,14 @@
               '<div>详细地址：' + alarmInfo.position + '</div>' +
               '</div>' +
               '</div>'
-              map.setZoom(17)
+              // map.setZoom(17)
+              map.setZoom(37)
               console.log('ppp')
               console.log([overlay.getLatLng().lat, overlay.getLatLng().lng])
               this.$emit('popupCenter', [overlay.getLatLng().lat, overlay.getLatLng().lng])
               setTimeout(() => {
                 map.flyTo([overlay.getLatLng().lat, overlay.getLatLng().lng])
+                // map.panTo([overlay.getLatLng().lat, overlay.getLatLng().lng])
                 // 显示popup
                 L.popup()
                   .setLatLng([overlay.getLatLng().lat, overlay.getLatLng().lng])
@@ -391,6 +342,10 @@
           })
         }
       }
+    },
+    // 关闭弹窗
+    closePopup() {
+      this.map.closePopup()
     }
   }
 }
@@ -399,7 +354,8 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   .base-map {
     width:100%;
-    height: calc(100vh - 84px);
+    // height: calc(100vh - 84px);
+    height: calc(100vh - 115px);
   }
   .alarm-window{
     max-width: 250px;
diff --git a/src/views/overview/overview_cmap.vue b/src/views/overview/overview_cmap.vue
index dadc1c0..06fc510 100644
--- a/src/views/overview/overview_cmap.vue
+++ b/src/views/overview/overview_cmap.vue
@@ -29,8 +29,8 @@
     </div>
     <!--倒计时刷新-->
     <div v-if="refreshType=='clock'" class="refresh-div">
-      <span class="font-red">{{ count }}</span>  s后刷新<i class="el-icon-refresh" @click="refreshAlarm"/>
-      <el-button :type="showAlarm?'danger':'info'" icon="el-icon-bell" circle @click="showAlarm=!showAlarm"/>
+      <span class="font-red">{{ count }}</span>  s后刷新<i class="el-icon-refresh" @click="clickRefreshIcon"/>
+      <el-button :type="showAlarm?'danger':'info'" icon="el-icon-bell" circle @click="changeAlarm"/>
     </div>
     <div v-if="refreshType=='websocket'" class="function-div">
       <el-button :type="showAlarm?'danger':'info'" icon="el-icon-bell" circle @click="showAlarm=!showAlarm"/>
@@ -93,8 +93,8 @@
 
 <script>
 import SelectTree from '@/components/SelectTree/singleSelect'
-import { getWellType, getWellList } from '@/api/well'
-// import { getWellList } from '@/api/overview'
+import { getWellType } from '@/api/well'
+import { getWellList } from '@/api/overview'
 import { getAlarmsNow } from '@/api/overview'
 import DeptSelect from '../../components/DeptSelect/index'
 import Cmap from '../../components/CMap/components/cmap'
@@ -218,6 +218,7 @@
   watch: {
     showAll(val) {
       if (val) { // 显示全部井（包含报警和不报警，为false时只显示报警）
+        this.$refs.map.closePopup() // 关闭已打开的弹窗
         this.listQuery.isAlarm = '0' // 是否报警
         // 先清空查询条件
         this.listQuery.deptid = '' // 组织机构
@@ -230,21 +231,37 @@
         } else {
           this.fetchWellList() // 获取井信息
         }
+        this.refreshAlarm()
         // }
       } else { // 仅显示报警
-        // this.listQuery.isAlarm = '1'
+        this.listQuery.isAlarm = '1'
         // 清除海量点
         // this.$refs.map.cleanPoi()
       }
     },
     showAlarm(val) {
       if (val) {
-        this.alarmWells = this.alarmWellsOri
-        this.alarmList = this.alarmListOri
+        // this.alarmWells = this.alarmWellsOri
+        // this.alarmList = this.alarmListOri
       } else {
         this.alarmWells = []
         this.alarmList = []
       }
+    },
+    alarmWells: {
+      handler: function(newV, oldV) {
+        const tempArr = []
+        newV.forEach(element => {
+          this.alarmListOri.forEach(item => {
+            if (element.wellId === item.wellId) {
+              tempArr.push(item)
+            }
+          })
+        })
+        this.alarmList = tempArr
+      },
+      deep: true,
+      immediate: true
     }
   },
   mounted() {
@@ -262,7 +279,7 @@
     readyMap() {
       console.log('readyMap')
       const that = this
-      that.fetchWellList() // 获取井信息
+      // that.fetchWellList() // 获取井信息
       that.refreshAlarm() // 刷新报警内容
       if (this.showAll) {
         this.$refs.map.renderPoi() // 加载海量点
@@ -291,6 +308,7 @@
     },
     // 点击查询-数据查询
     search(showMessage = true) {
+      this.$refs.map.closePopup() // 关闭已打开的弹窗
       const keywords = this.listQuery.keywords
       const deptid = this.listQuery.deptid
       const wellType = this.listQuery.wellType
@@ -300,16 +318,23 @@
         this.showClearBtn = true
         // this.filterIcon(showMessage)
         this.fetchWellList() // 获取井列表
-        this.refreshAlarm() // 刷新报警列表
+        this.fetchWellList('1') // 刷新报警列表
       }
     },
     // 清除查询
     clearSearch() {
+      this.$refs.map.closePopup() // 关闭已打开的弹窗
       this.listQuery.wellType = ''
       this.listQuery.deptid = ''
       this.listQuery.keywords = ''
       // this.fetchWellList() // 获取井列表
-      this.normalWells = deepCopy(this.normalAllWells) // 全部正常井信息
+      // if (this.normalAllWells.length) {
+      //   this.normalWells = deepCopy(this.normalAllWells) // 全部正常井信息
+      // } else {
+      if (this.showAll) {
+        this.fetchWellList()
+      }
+      // }
       this.refreshAlarm() // 刷新报警列表
       this.showClearBtn = false
     },
@@ -357,85 +382,79 @@
       const wellId = row.wellId
       this.$refs.map.openAlarmInfoWindow(wellId)
     },
+    // 点击刷新icon
+    clickRefreshIcon() {
+      if (this.listQuery.keywords === '' && this.listQuery.deptid === '' && this.listQuery.wellType === '') {
+        console.log('全部888')
+        this.refreshAlarm()
+      } else {
+        this.fetchWellList('1')
+      }
+      this.$refs.map.closePopup()
+    },
+    changeAlarm() {
+      this.showAlarm = !this.showAlarm
+      if (this.showAlarm) {
+        this.clickRefreshIcon()
+      }
+    },
     // 倒计时函数
     countDown() {
       if (this.clock == null) {
         this.clock = window.setInterval(() => {
           this.count--
           if (this.count < 0) { // 当倒计时小于0时清除定时器
-            this.refreshAlarm()
+            if (this.listQuery.keywords === '' && this.listQuery.deptid === '' && this.listQuery.wellType === '') {
+              this.refreshAlarm()
+            } else {
+              this.fetchWellList('1')
+            }
             this.count = this.refreshTimes
           }
         }, 1000)
       }
     },
     // 获取井列表
-    fetchWellList() {
+    fetchWellList(isAlarm = '0') {
       console.log('获取正常井的列表')
-      // this.loading = true
-      // const listQuery = {
-      //   keywords: '', // 关键字
-      //   wellType: '', // 井类型
-      //   deptid: '', // 组织机构
-      //   isAlarm: '0' // 没报警
-      // }
-      const listQuery = {
-        keywords: '',
-        wellType: '',
-        deptid: '',
-        offset: 1,
-        limit: 20
+      if (this.listQuery.keywords === '' && this.listQuery.deptid === '' && this.listQuery.wellType === '') {
+        this.loading = true
       }
-      // ------------------------------------------------------------------------------
-      // 先调窨井列表，之后没报警的井接口出来之后再调
+      const listQuery = {
+        keywords: this.listQuery.keywords, // 关键字
+        wellType: this.listQuery.wellType, // 井类型
+        deptid: this.listQuery.deptid, // 组织机构
+        isAlarm: isAlarm // 没报警
+      }
       getWellList(listQuery).then(response => {
-        this.normalWells = response.data.rows
-        const keywords = this.listQuery.keywords
-        const deptid = this.listQuery.deptid
-        const wellType = this.listQuery.wellType
-        if (keywords === '' && deptid === '' && wellType === '') {
-          this.normalAllWells = response.data.rows // 全部正常井
+        this.loading = false
+        if (response.code === 200) {
+          if (isAlarm === '0') {
+            this.normalWells = response.data
+            const keywords = this.listQuery.keywords
+            const deptid = this.listQuery.deptid
+            const wellType = this.listQuery.wellType
+            if (keywords === '' && deptid === '' && wellType === '') {
+              this.normalAllWells = response.data
+            }
+          } else {
+            this.alarmWells = response.data.map(item => {
+              return {
+                ...item,
+                wellCode: item.wellCode,
+                wellId: item.id,
+                position: { lng: parseFloat(item.coordinateX), lat: parseFloat(item.coordinateY) }
+              }
+            })
+            if (!this.alarmWells.length) {
+              this.$refs.map.closePopup()
+              this.$message.warning('无结果')
+              return
+            }
+          }
+          this.loading = false
         }
-        // this.total = parseInt(response.data.total)
-        // this.listLoading = false
       })
-      // getWellList(listQuery).then(response => {
-      //   this.loading = false
-      //   if (response.code === 200) {
-      //     const wells = response.data
-      //     if (wells.length > 0) {
-      //       // 查询没有报警的井
-      //       if (listQuery.isAlarm === '0') { // 查询状态正常的井
-      //         // this.firstAmount = false
-      //         // const centerxs = []
-      //         // const centerys = []
-      //         // for (const well of wells) {
-      //         //   this.markers.push({
-      //         //     wellId: well.id,
-      //         //     wellCode: well.wellCode,
-      //         //     id: well.id,
-      //         //     name: well.wellCode,
-      //         //     lnglat: [parseFloat(well.coordinateX), parseFloat(well.coordinateY)],
-      //         //     position: [parseFloat(well.coordinateX), parseFloat(well.coordinateY)],
-      //         //     positionInfo: well.position,
-      //         //     wellType: well.wellType,
-      //         //     deptid: well.deptid,
-      //         //     bfzt: well.bfzt,
-      //         //     icon: this.commonIcon,
-      //         //     visible: true,
-      //         //     wellStatus: 'normal'
-      //         //   })
-      //         //   centerxs.push(parseFloat(well.coordinateX))
-      //         //   centerys.push(parseFloat(well.coordinateY))
-      //         // }
-      //         // centerxs.sort()
-      //         // centerys.sort()
-      //         // const index = Math.floor(centerxs.length / 2)
-      //         // this.center = [centerxs[index], centerys[index]]
-      //       }
-      //     }
-      //   }
-      // })
     }
   }
 }

diff --git a/config/dev.env.js b/config/dev.env.js
index b62643c..cba3931 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -13,7 +13,9 @@
   // BASE_API: '"https://yjaqjk.bda.gov.cn/smartwell"'
   // BASE_API: '"http://192.168.1.113:11302/smartwell"'
   // BASE_API: '"https://smartlog.work/smartwell"'
-  BASE_API: '"http://111.198.10.15:11302/smartwell"'
+  // BASE_API: '"http://111.198.10.15:11302/smartwell"' //在用
+  BASE_API: '"http://192.168.43.120:11302"'
+
   // BASE_API: '"http://192.168.0.225:8083"'
   // BASE_API: '"http://127.0.0.1:14537"'
 })
diff --git a/src/api/overview.js b/src/api/overview.js
index 8b15aeb..ffbb07c 100644
--- a/src/api/overview.js
+++ b/src/api/overview.js
@@ -3,13 +3,22 @@
  */
 import request from '@/utils/request'
 // 窨井查询
+// export function getWellList(params) {
+//   return request({
+//     url: 'overview/wellList',
+//     method: 'get',
+//     params
+//   })
+// }
+// 窨井查询
 export function getWellList(params) {
   return request({
-    url: 'overview/wellList',
+    url: 'overview/wellListDisplay',
     method: 'get',
     params
   })
 }
+
 // 获取窨井详情
 export function getWellInfo(id) {
   return request({
diff --git a/src/components/leaftletMap/leafletMap.vue b/src/components/leaftletMap/leafletMap.vue
index 1df7067..4dee899 100644
--- a/src/components/leaftletMap/leafletMap.vue
+++ b/src/components/leaftletMap/leafletMap.vue
@@ -26,7 +26,7 @@
     }, // 图层地址列表
     zoom: { // 缩放层级
       type: Number,
-      default: 12
+      default: 21
     },
     zooms: {
       type: Array,
@@ -140,14 +140,6 @@
           this.renderMarkers()
         }
       }
-    },
-    // 是否显示报警
-    showAlarm(val) {
-      if (this.showAll) {
-        this.renderNormalMarkers() // 画正常井
-      } else {
-        this.renderMarkers()
-      }
     }
   },
   mounted() {
@@ -218,7 +210,7 @@
         const icon = L.icon({
           iconUrl: './static/images/map_images/alarm-well1.png',
           iconSize: size,
-          iconAnchor: anchor,
+          iconAnchor: [18, 15],
           popupAnchor: popupAnchor
         })
         const opts = {
@@ -230,15 +222,15 @@
         // console.log('坐标', [item.position.lat, item.position.lng])
         const marker = L.marker([item.position.lat, item.position.lng], opts)
         this.ciLayer.addLayer(marker)
-        map.setView(map.getCenter())
         this.overlays.push(marker)
       }
+      map.setView(map.getCenter())
       const that = this
       // 监听点击marker
       this.ciLayer.addOnClickListener(function(e, data) {
-        console.log('监听到点击告警信息')
-        console.log(e)
-        console.log(data[0].data.options)
+        // console.log('监听到点击告警信息')
+        // console.log(e)
+        // console.log(data[0].data.options)
         // 某井报警信息
         getWellAlarms(data[0].data.options.wellId).then(response => {
           if (response.code === 200) {
@@ -277,26 +269,20 @@
     },
     // 加载正常井markers
     renderNormalMarkers() {
-      console.log('渲染正常井图层')
+      // console.log('渲染正常井图层')
       const { map, normalMarkers, size, anchor, popupAnchor } = this
       if (!map) {
         return
       }
-      // if (this.ciLayer) {
-      //   console.log('清理图层')
-      //   map.removeLayer(this.ciLayer)
-      // }
       this.renderMarkers()
       // 正常图层
-      // this.ciLayer = L.canvasIconLayer({}).addTo(map)
-      // this.overlays = []
       // 遍历所有报警井信息
       for (const item of normalMarkers) {
         console.log('画正常井图层')
         const icon = L.icon({
-          iconUrl: './static/images/map_images/alarm-well.png',
-          iconSize: [25, 25],
-          iconAnchor: anchor,
+          iconUrl: './static/images/map_images/1.png',
+          iconSize: [12, 16],
+          iconAnchor: [6, 8],
           popupAnchor: popupAnchor
         })
         const opts = {
@@ -306,45 +292,8 @@
         }
         const marker = L.marker([item.coordinateY, item.coordinateX], opts)
         this.ciLayer.addLayer(marker)
-        // map.setView(map.getCenter())
-        // this.overlays.push(marker)
       }
-      const that = this
-      // 监听点击marker
-      this.ciLayer.addOnClickListener(function(e, data) {
-        console.log('监听到点击正常井信息')
-        console.log(e)
-        console.log(data[0].data.options)
-        getWellInfo(data[0].data.options.wellId).then(response => {
-          if (response.code === 200) {
-            const wellInfo = response.data
-            const normalInfo = {
-              wellCode: wellInfo.wellCode,
-              position: wellInfo.position,
-              wellTypeName: wellInfo.wellTypeName,
-              deptName: wellInfo.deptName,
-              bfztName: wellInfo.bfztName,
-              deep: wellInfo.deep
-            }
-            let dom = "<div class='alarm-window'>" +
-                "<div style='line-height: 20px;font-weight: bold;'>" + normalInfo.wellCode + '</div>' +
-                "<div style='line-height: 23px;font-size: 14px;'>"
-            dom += "<div class='divider'></div>" +
-                '<div>井类型： ' + normalInfo.wellTypeName + '</div>' +
-                '<div>权属单位：' + normalInfo.deptName + '</div>' +
-                '<div>详细地址：' + normalInfo.position + '</div>' +
-                '</div>' +
-                '</div>'
-            console.log('setPopupContent_inrender')
-            that.$emit('popupCenter', [e.latlng.lat, e.latlng.lng])
-            // 显示popup
-            L.popup()
-              .setLatLng([e.latlng.lat, e.latlng.lng])
-              .setContent(dom)
-              .openOn(map)
-          }
-        })
-      })
+      // map.setView(map.getCenter())
     },
     // 打开弹窗
     openAlarmInfoWindow(wellId) {
@@ -375,12 +324,14 @@
               '<div>详细地址：' + alarmInfo.position + '</div>' +
               '</div>' +
               '</div>'
-              map.setZoom(17)
+              // map.setZoom(17)
+              map.setZoom(37)
               console.log('ppp')
               console.log([overlay.getLatLng().lat, overlay.getLatLng().lng])
               this.$emit('popupCenter', [overlay.getLatLng().lat, overlay.getLatLng().lng])
               setTimeout(() => {
                 map.flyTo([overlay.getLatLng().lat, overlay.getLatLng().lng])
+                // map.panTo([overlay.getLatLng().lat, overlay.getLatLng().lng])
                 // 显示popup
                 L.popup()
                   .setLatLng([overlay.getLatLng().lat, overlay.getLatLng().lng])
@@ -391,6 +342,10 @@
           })
         }
       }
+    },
+    // 关闭弹窗
+    closePopup() {
+      this.map.closePopup()
     }
   }
 }
@@ -399,7 +354,8 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   .base-map {
     width:100%;
-    height: calc(100vh - 84px);
+    // height: calc(100vh - 84px);
+    height: calc(100vh - 115px);
   }
   .alarm-window{
     max-width: 250px;
diff --git a/src/views/overview/overview_cmap.vue b/src/views/overview/overview_cmap.vue
index dadc1c0..06fc510 100644
--- a/src/views/overview/overview_cmap.vue
+++ b/src/views/overview/overview_cmap.vue
@@ -29,8 +29,8 @@
     </div>
     <!--倒计时刷新-->
     <div v-if="refreshType=='clock'" class="refresh-div">
-      <span class="font-red">{{ count }}</span>  s后刷新<i class="el-icon-refresh" @click="refreshAlarm"/>
-      <el-button :type="showAlarm?'danger':'info'" icon="el-icon-bell" circle @click="showAlarm=!showAlarm"/>
+      <span class="font-red">{{ count }}</span>  s后刷新<i class="el-icon-refresh" @click="clickRefreshIcon"/>
+      <el-button :type="showAlarm?'danger':'info'" icon="el-icon-bell" circle @click="changeAlarm"/>
     </div>
     <div v-if="refreshType=='websocket'" class="function-div">
       <el-button :type="showAlarm?'danger':'info'" icon="el-icon-bell" circle @click="showAlarm=!showAlarm"/>
@@ -93,8 +93,8 @@
 
 <script>
 import SelectTree from '@/components/SelectTree/singleSelect'
-import { getWellType, getWellList } from '@/api/well'
-// import { getWellList } from '@/api/overview'
+import { getWellType } from '@/api/well'
+import { getWellList } from '@/api/overview'
 import { getAlarmsNow } from '@/api/overview'
 import DeptSelect from '../../components/DeptSelect/index'
 import Cmap from '../../components/CMap/components/cmap'
@@ -218,6 +218,7 @@
   watch: {
     showAll(val) {
       if (val) { // 显示全部井（包含报警和不报警，为false时只显示报警）
+        this.$refs.map.closePopup() // 关闭已打开的弹窗
         this.listQuery.isAlarm = '0' // 是否报警
         // 先清空查询条件
         this.listQuery.deptid = '' // 组织机构
@@ -230,21 +231,37 @@
         } else {
           this.fetchWellList() // 获取井信息
         }
+        this.refreshAlarm()
         // }
       } else { // 仅显示报警
-        // this.listQuery.isAlarm = '1'
+        this.listQuery.isAlarm = '1'
         // 清除海量点
         // this.$refs.map.cleanPoi()
       }
     },
     showAlarm(val) {
       if (val) {
-        this.alarmWells = this.alarmWellsOri
-        this.alarmList = this.alarmListOri
+        // this.alarmWells = this.alarmWellsOri
+        // this.alarmList = this.alarmListOri
       } else {
         this.alarmWells = []
         this.alarmList = []
       }
+    },
+    alarmWells: {
+      handler: function(newV, oldV) {
+        const tempArr = []
+        newV.forEach(element => {
+          this.alarmListOri.forEach(item => {
+            if (element.wellId === item.wellId) {
+              tempArr.push(item)
+            }
+          })
+        })
+        this.alarmList = tempArr
+      },
+      deep: true,
+      immediate: true
     }
   },
   mounted() {
@@ -262,7 +279,7 @@
     readyMap() {
       console.log('readyMap')
       const that = this
-      that.fetchWellList() // 获取井信息
+      // that.fetchWellList() // 获取井信息
       that.refreshAlarm() // 刷新报警内容
       if (this.showAll) {
         this.$refs.map.renderPoi() // 加载海量点
@@ -291,6 +308,7 @@
     },
     // 点击查询-数据查询
     search(showMessage = true) {
+      this.$refs.map.closePopup() // 关闭已打开的弹窗
       const keywords = this.listQuery.keywords
       const deptid = this.listQuery.deptid
       const wellType = this.listQuery.wellType
@@ -300,16 +318,23 @@
         this.showClearBtn = true
         // this.filterIcon(showMessage)
         this.fetchWellList() // 获取井列表
-        this.refreshAlarm() // 刷新报警列表
+        this.fetchWellList('1') // 刷新报警列表
       }
     },
     // 清除查询
     clearSearch() {
+      this.$refs.map.closePopup() // 关闭已打开的弹窗
       this.listQuery.wellType = ''
       this.listQuery.deptid = ''
       this.listQuery.keywords = ''
       // this.fetchWellList() // 获取井列表
-      this.normalWells = deepCopy(this.normalAllWells) // 全部正常井信息
+      // if (this.normalAllWells.length) {
+      //   this.normalWells = deepCopy(this.normalAllWells) // 全部正常井信息
+      // } else {
+      if (this.showAll) {
+        this.fetchWellList()
+      }
+      // }
       this.refreshAlarm() // 刷新报警列表
       this.showClearBtn = false
     },
@@ -357,85 +382,79 @@
       const wellId = row.wellId
       this.$refs.map.openAlarmInfoWindow(wellId)
     },
+    // 点击刷新icon
+    clickRefreshIcon() {
+      if (this.listQuery.keywords === '' && this.listQuery.deptid === '' && this.listQuery.wellType === '') {
+        console.log('全部888')
+        this.refreshAlarm()
+      } else {
+        this.fetchWellList('1')
+      }
+      this.$refs.map.closePopup()
+    },
+    changeAlarm() {
+      this.showAlarm = !this.showAlarm
+      if (this.showAlarm) {
+        this.clickRefreshIcon()
+      }
+    },
     // 倒计时函数
     countDown() {
       if (this.clock == null) {
         this.clock = window.setInterval(() => {
           this.count--
           if (this.count < 0) { // 当倒计时小于0时清除定时器
-            this.refreshAlarm()
+            if (this.listQuery.keywords === '' && this.listQuery.deptid === '' && this.listQuery.wellType === '') {
+              this.refreshAlarm()
+            } else {
+              this.fetchWellList('1')
+            }
             this.count = this.refreshTimes
           }
         }, 1000)
       }
     },
     // 获取井列表
-    fetchWellList() {
+    fetchWellList(isAlarm = '0') {
       console.log('获取正常井的列表')
-      // this.loading = true
-      // const listQuery = {
-      //   keywords: '', // 关键字
-      //   wellType: '', // 井类型
-      //   deptid: '', // 组织机构
-      //   isAlarm: '0' // 没报警
-      // }
-      const listQuery = {
-        keywords: '',
-        wellType: '',
-        deptid: '',
-        offset: 1,
-        limit: 20
+      if (this.listQuery.keywords === '' && this.listQuery.deptid === '' && this.listQuery.wellType === '') {
+        this.loading = true
       }
-      // ------------------------------------------------------------------------------
-      // 先调窨井列表，之后没报警的井接口出来之后再调
+      const listQuery = {
+        keywords: this.listQuery.keywords, // 关键字
+        wellType: this.listQuery.wellType, // 井类型
+        deptid: this.listQuery.deptid, // 组织机构
+        isAlarm: isAlarm // 没报警
+      }
       getWellList(listQuery).then(response => {
-        this.normalWells = response.data.rows
-        const keywords = this.listQuery.keywords
-        const deptid = this.listQuery.deptid
-        const wellType = this.listQuery.wellType
-        if (keywords === '' && deptid === '' && wellType === '') {
-          this.normalAllWells = response.data.rows // 全部正常井
+        this.loading = false
+        if (response.code === 200) {
+          if (isAlarm === '0') {
+            this.normalWells = response.data
+            const keywords = this.listQuery.keywords
+            const deptid = this.listQuery.deptid
+            const wellType = this.listQuery.wellType
+            if (keywords === '' && deptid === '' && wellType === '') {
+              this.normalAllWells = response.data
+            }
+          } else {
+            this.alarmWells = response.data.map(item => {
+              return {
+                ...item,
+                wellCode: item.wellCode,
+                wellId: item.id,
+                position: { lng: parseFloat(item.coordinateX), lat: parseFloat(item.coordinateY) }
+              }
+            })
+            if (!this.alarmWells.length) {
+              this.$refs.map.closePopup()
+              this.$message.warning('无结果')
+              return
+            }
+          }
+          this.loading = false
         }
-        // this.total = parseInt(response.data.total)
-        // this.listLoading = false
       })
-      // getWellList(listQuery).then(response => {
-      //   this.loading = false
-      //   if (response.code === 200) {
-      //     const wells = response.data
-      //     if (wells.length > 0) {
-      //       // 查询没有报警的井
-      //       if (listQuery.isAlarm === '0') { // 查询状态正常的井
-      //         // this.firstAmount = false
-      //         // const centerxs = []
-      //         // const centerys = []
-      //         // for (const well of wells) {
-      //         //   this.markers.push({
-      //         //     wellId: well.id,
-      //         //     wellCode: well.wellCode,
-      //         //     id: well.id,
-      //         //     name: well.wellCode,
-      //         //     lnglat: [parseFloat(well.coordinateX), parseFloat(well.coordinateY)],
-      //         //     position: [parseFloat(well.coordinateX), parseFloat(well.coordinateY)],
-      //         //     positionInfo: well.position,
-      //         //     wellType: well.wellType,
-      //         //     deptid: well.deptid,
-      //         //     bfzt: well.bfzt,
-      //         //     icon: this.commonIcon,
-      //         //     visible: true,
-      //         //     wellStatus: 'normal'
-      //         //   })
-      //         //   centerxs.push(parseFloat(well.coordinateX))
-      //         //   centerys.push(parseFloat(well.coordinateY))
-      //         // }
-      //         // centerxs.sort()
-      //         // centerys.sort()
-      //         // const index = Math.floor(centerxs.length / 2)
-      //         // this.center = [centerxs[index], centerys[index]]
-      //       }
-      //     }
-      //   }
-      // })
     }
   }
 }
diff --git a/static/images/map_images/1.png b/static/images/map_images/1.png
new file mode 100644
index 0000000..b053e16
--- /dev/null
+++ b/static/images/map_images/1.png
Binary files differ

diff --git a/config/dev.env.js b/config/dev.env.js
index b62643c..cba3931 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -13,7 +13,9 @@
   // BASE_API: '"https://yjaqjk.bda.gov.cn/smartwell"'
   // BASE_API: '"http://192.168.1.113:11302/smartwell"'
   // BASE_API: '"https://smartlog.work/smartwell"'
-  BASE_API: '"http://111.198.10.15:11302/smartwell"'
+  // BASE_API: '"http://111.198.10.15:11302/smartwell"' //在用
+  BASE_API: '"http://192.168.43.120:11302"'
+
   // BASE_API: '"http://192.168.0.225:8083"'
   // BASE_API: '"http://127.0.0.1:14537"'
 })
diff --git a/src/api/overview.js b/src/api/overview.js
index 8b15aeb..ffbb07c 100644
--- a/src/api/overview.js
+++ b/src/api/overview.js
@@ -3,13 +3,22 @@
  */
 import request from '@/utils/request'
 // 窨井查询
+// export function getWellList(params) {
+//   return request({
+//     url: 'overview/wellList',
+//     method: 'get',
+//     params
+//   })
+// }
+// 窨井查询
 export function getWellList(params) {
   return request({
-    url: 'overview/wellList',
+    url: 'overview/wellListDisplay',
     method: 'get',
     params
   })
 }
+
 // 获取窨井详情
 export function getWellInfo(id) {
   return request({
diff --git a/src/components/leaftletMap/leafletMap.vue b/src/components/leaftletMap/leafletMap.vue
index 1df7067..4dee899 100644
--- a/src/components/leaftletMap/leafletMap.vue
+++ b/src/components/leaftletMap/leafletMap.vue
@@ -26,7 +26,7 @@
     }, // 图层地址列表
     zoom: { // 缩放层级
       type: Number,
-      default: 12
+      default: 21
     },
     zooms: {
       type: Array,
@@ -140,14 +140,6 @@
           this.renderMarkers()
         }
       }
-    },
-    // 是否显示报警
-    showAlarm(val) {
-      if (this.showAll) {
-        this.renderNormalMarkers() // 画正常井
-      } else {
-        this.renderMarkers()
-      }
     }
   },
   mounted() {
@@ -218,7 +210,7 @@
         const icon = L.icon({
           iconUrl: './static/images/map_images/alarm-well1.png',
           iconSize: size,
-          iconAnchor: anchor,
+          iconAnchor: [18, 15],
           popupAnchor: popupAnchor
         })
         const opts = {
@@ -230,15 +222,15 @@
         // console.log('坐标', [item.position.lat, item.position.lng])
         const marker = L.marker([item.position.lat, item.position.lng], opts)
         this.ciLayer.addLayer(marker)
-        map.setView(map.getCenter())
         this.overlays.push(marker)
       }
+      map.setView(map.getCenter())
       const that = this
       // 监听点击marker
       this.ciLayer.addOnClickListener(function(e, data) {
-        console.log('监听到点击告警信息')
-        console.log(e)
-        console.log(data[0].data.options)
+        // console.log('监听到点击告警信息')
+        // console.log(e)
+        // console.log(data[0].data.options)
         // 某井报警信息
         getWellAlarms(data[0].data.options.wellId).then(response => {
           if (response.code === 200) {
@@ -277,26 +269,20 @@
     },
     // 加载正常井markers
     renderNormalMarkers() {
-      console.log('渲染正常井图层')
+      // console.log('渲染正常井图层')
       const { map, normalMarkers, size, anchor, popupAnchor } = this
       if (!map) {
         return
       }
-      // if (this.ciLayer) {
-      //   console.log('清理图层')
-      //   map.removeLayer(this.ciLayer)
-      // }
       this.renderMarkers()
       // 正常图层
-      // this.ciLayer = L.canvasIconLayer({}).addTo(map)
-      // this.overlays = []
       // 遍历所有报警井信息
       for (const item of normalMarkers) {
         console.log('画正常井图层')
         const icon = L.icon({
-          iconUrl: './static/images/map_images/alarm-well.png',
-          iconSize: [25, 25],
-          iconAnchor: anchor,
+          iconUrl: './static/images/map_images/1.png',
+          iconSize: [12, 16],
+          iconAnchor: [6, 8],
           popupAnchor: popupAnchor
         })
         const opts = {
@@ -306,45 +292,8 @@
         }
         const marker = L.marker([item.coordinateY, item.coordinateX], opts)
         this.ciLayer.addLayer(marker)
-        // map.setView(map.getCenter())
-        // this.overlays.push(marker)
       }
-      const that = this
-      // 监听点击marker
-      this.ciLayer.addOnClickListener(function(e, data) {
-        console.log('监听到点击正常井信息')
-        console.log(e)
-        console.log(data[0].data.options)
-        getWellInfo(data[0].data.options.wellId).then(response => {
-          if (response.code === 200) {
-            const wellInfo = response.data
-            const normalInfo = {
-              wellCode: wellInfo.wellCode,
-              position: wellInfo.position,
-              wellTypeName: wellInfo.wellTypeName,
-              deptName: wellInfo.deptName,
-              bfztName: wellInfo.bfztName,
-              deep: wellInfo.deep
-            }
-            let dom = "<div class='alarm-window'>" +
-                "<div style='line-height: 20px;font-weight: bold;'>" + normalInfo.wellCode + '</div>' +
-                "<div style='line-height: 23px;font-size: 14px;'>"
-            dom += "<div class='divider'></div>" +
-                '<div>井类型： ' + normalInfo.wellTypeName + '</div>' +
-                '<div>权属单位：' + normalInfo.deptName + '</div>' +
-                '<div>详细地址：' + normalInfo.position + '</div>' +
-                '</div>' +
-                '</div>'
-            console.log('setPopupContent_inrender')
-            that.$emit('popupCenter', [e.latlng.lat, e.latlng.lng])
-            // 显示popup
-            L.popup()
-              .setLatLng([e.latlng.lat, e.latlng.lng])
-              .setContent(dom)
-              .openOn(map)
-          }
-        })
-      })
+      // map.setView(map.getCenter())
     },
     // 打开弹窗
     openAlarmInfoWindow(wellId) {
@@ -375,12 +324,14 @@
               '<div>详细地址：' + alarmInfo.position + '</div>' +
               '</div>' +
               '</div>'
-              map.setZoom(17)
+              // map.setZoom(17)
+              map.setZoom(37)
               console.log('ppp')
               console.log([overlay.getLatLng().lat, overlay.getLatLng().lng])
               this.$emit('popupCenter', [overlay.getLatLng().lat, overlay.getLatLng().lng])
               setTimeout(() => {
                 map.flyTo([overlay.getLatLng().lat, overlay.getLatLng().lng])
+                // map.panTo([overlay.getLatLng().lat, overlay.getLatLng().lng])
                 // 显示popup
                 L.popup()
                   .setLatLng([overlay.getLatLng().lat, overlay.getLatLng().lng])
@@ -391,6 +342,10 @@
           })
         }
       }
+    },
+    // 关闭弹窗
+    closePopup() {
+      this.map.closePopup()
     }
   }
 }
@@ -399,7 +354,8 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   .base-map {
     width:100%;
-    height: calc(100vh - 84px);
+    // height: calc(100vh - 84px);
+    height: calc(100vh - 115px);
   }
   .alarm-window{
     max-width: 250px;
diff --git a/src/views/overview/overview_cmap.vue b/src/views/overview/overview_cmap.vue
index dadc1c0..06fc510 100644
--- a/src/views/overview/overview_cmap.vue
+++ b/src/views/overview/overview_cmap.vue
@@ -29,8 +29,8 @@
     </div>
     <!--倒计时刷新-->
     <div v-if="refreshType=='clock'" class="refresh-div">
-      <span class="font-red">{{ count }}</span>  s后刷新<i class="el-icon-refresh" @click="refreshAlarm"/>
-      <el-button :type="showAlarm?'danger':'info'" icon="el-icon-bell" circle @click="showAlarm=!showAlarm"/>
+      <span class="font-red">{{ count }}</span>  s后刷新<i class="el-icon-refresh" @click="clickRefreshIcon"/>
+      <el-button :type="showAlarm?'danger':'info'" icon="el-icon-bell" circle @click="changeAlarm"/>
     </div>
     <div v-if="refreshType=='websocket'" class="function-div">
       <el-button :type="showAlarm?'danger':'info'" icon="el-icon-bell" circle @click="showAlarm=!showAlarm"/>
@@ -93,8 +93,8 @@
 
 <script>
 import SelectTree from '@/components/SelectTree/singleSelect'
-import { getWellType, getWellList } from '@/api/well'
-// import { getWellList } from '@/api/overview'
+import { getWellType } from '@/api/well'
+import { getWellList } from '@/api/overview'
 import { getAlarmsNow } from '@/api/overview'
 import DeptSelect from '../../components/DeptSelect/index'
 import Cmap from '../../components/CMap/components/cmap'
@@ -218,6 +218,7 @@
   watch: {
     showAll(val) {
       if (val) { // 显示全部井（包含报警和不报警，为false时只显示报警）
+        this.$refs.map.closePopup() // 关闭已打开的弹窗
         this.listQuery.isAlarm = '0' // 是否报警
         // 先清空查询条件
         this.listQuery.deptid = '' // 组织机构
@@ -230,21 +231,37 @@
         } else {
           this.fetchWellList() // 获取井信息
         }
+        this.refreshAlarm()
         // }
       } else { // 仅显示报警
-        // this.listQuery.isAlarm = '1'
+        this.listQuery.isAlarm = '1'
         // 清除海量点
         // this.$refs.map.cleanPoi()
       }
     },
     showAlarm(val) {
       if (val) {
-        this.alarmWells = this.alarmWellsOri
-        this.alarmList = this.alarmListOri
+        // this.alarmWells = this.alarmWellsOri
+        // this.alarmList = this.alarmListOri
       } else {
         this.alarmWells = []
         this.alarmList = []
       }
+    },
+    alarmWells: {
+      handler: function(newV, oldV) {
+        const tempArr = []
+        newV.forEach(element => {
+          this.alarmListOri.forEach(item => {
+            if (element.wellId === item.wellId) {
+              tempArr.push(item)
+            }
+          })
+        })
+        this.alarmList = tempArr
+      },
+      deep: true,
+      immediate: true
     }
   },
   mounted() {
@@ -262,7 +279,7 @@
     readyMap() {
       console.log('readyMap')
       const that = this
-      that.fetchWellList() // 获取井信息
+      // that.fetchWellList() // 获取井信息
       that.refreshAlarm() // 刷新报警内容
       if (this.showAll) {
         this.$refs.map.renderPoi() // 加载海量点
@@ -291,6 +308,7 @@
     },
     // 点击查询-数据查询
     search(showMessage = true) {
+      this.$refs.map.closePopup() // 关闭已打开的弹窗
       const keywords = this.listQuery.keywords
       const deptid = this.listQuery.deptid
       const wellType = this.listQuery.wellType
@@ -300,16 +318,23 @@
         this.showClearBtn = true
         // this.filterIcon(showMessage)
         this.fetchWellList() // 获取井列表
-        this.refreshAlarm() // 刷新报警列表
+        this.fetchWellList('1') // 刷新报警列表
       }
     },
     // 清除查询
     clearSearch() {
+      this.$refs.map.closePopup() // 关闭已打开的弹窗
       this.listQuery.wellType = ''
       this.listQuery.deptid = ''
       this.listQuery.keywords = ''
       // this.fetchWellList() // 获取井列表
-      this.normalWells = deepCopy(this.normalAllWells) // 全部正常井信息
+      // if (this.normalAllWells.length) {
+      //   this.normalWells = deepCopy(this.normalAllWells) // 全部正常井信息
+      // } else {
+      if (this.showAll) {
+        this.fetchWellList()
+      }
+      // }
       this.refreshAlarm() // 刷新报警列表
       this.showClearBtn = false
     },
@@ -357,85 +382,79 @@
       const wellId = row.wellId
       this.$refs.map.openAlarmInfoWindow(wellId)
     },
+    // 点击刷新icon
+    clickRefreshIcon() {
+      if (this.listQuery.keywords === '' && this.listQuery.deptid === '' && this.listQuery.wellType === '') {
+        console.log('全部888')
+        this.refreshAlarm()
+      } else {
+        this.fetchWellList('1')
+      }
+      this.$refs.map.closePopup()
+    },
+    changeAlarm() {
+      this.showAlarm = !this.showAlarm
+      if (this.showAlarm) {
+        this.clickRefreshIcon()
+      }
+    },
     // 倒计时函数
     countDown() {
       if (this.clock == null) {
         this.clock = window.setInterval(() => {
           this.count--
           if (this.count < 0) { // 当倒计时小于0时清除定时器
-            this.refreshAlarm()
+            if (this.listQuery.keywords === '' && this.listQuery.deptid === '' && this.listQuery.wellType === '') {
+              this.refreshAlarm()
+            } else {
+              this.fetchWellList('1')
+            }
             this.count = this.refreshTimes
           }
         }, 1000)
       }
     },
     // 获取井列表
-    fetchWellList() {
+    fetchWellList(isAlarm = '0') {
       console.log('获取正常井的列表')
-      // this.loading = true
-      // const listQuery = {
-      //   keywords: '', // 关键字
-      //   wellType: '', // 井类型
-      //   deptid: '', // 组织机构
-      //   isAlarm: '0' // 没报警
-      // }
-      const listQuery = {
-        keywords: '',
-        wellType: '',
-        deptid: '',
-        offset: 1,
-        limit: 20
+      if (this.listQuery.keywords === '' && this.listQuery.deptid === '' && this.listQuery.wellType === '') {
+        this.loading = true
       }
-      // ------------------------------------------------------------------------------
-      // 先调窨井列表，之后没报警的井接口出来之后再调
+      const listQuery = {
+        keywords: this.listQuery.keywords, // 关键字
+        wellType: this.listQuery.wellType, // 井类型
+        deptid: this.listQuery.deptid, // 组织机构
+        isAlarm: isAlarm // 没报警
+      }
       getWellList(listQuery).then(response => {
-        this.normalWells = response.data.rows
-        const keywords = this.listQuery.keywords
-        const deptid = this.listQuery.deptid
-        const wellType = this.listQuery.wellType
-        if (keywords === '' && deptid === '' && wellType === '') {
-          this.normalAllWells = response.data.rows // 全部正常井
+        this.loading = false
+        if (response.code === 200) {
+          if (isAlarm === '0') {
+            this.normalWells = response.data
+            const keywords = this.listQuery.keywords
+            const deptid = this.listQuery.deptid
+            const wellType = this.listQuery.wellType
+            if (keywords === '' && deptid === '' && wellType === '') {
+              this.normalAllWells = response.data
+            }
+          } else {
+            this.alarmWells = response.data.map(item => {
+              return {
+                ...item,
+                wellCode: item.wellCode,
+                wellId: item.id,
+                position: { lng: parseFloat(item.coordinateX), lat: parseFloat(item.coordinateY) }
+              }
+            })
+            if (!this.alarmWells.length) {
+              this.$refs.map.closePopup()
+              this.$message.warning('无结果')
+              return
+            }
+          }
+          this.loading = false
         }
-        // this.total = parseInt(response.data.total)
-        // this.listLoading = false
       })
-      // getWellList(listQuery).then(response => {
-      //   this.loading = false
-      //   if (response.code === 200) {
-      //     const wells = response.data
-      //     if (wells.length > 0) {
-      //       // 查询没有报警的井
-      //       if (listQuery.isAlarm === '0') { // 查询状态正常的井
-      //         // this.firstAmount = false
-      //         // const centerxs = []
-      //         // const centerys = []
-      //         // for (const well of wells) {
-      //         //   this.markers.push({
-      //         //     wellId: well.id,
-      //         //     wellCode: well.wellCode,
-      //         //     id: well.id,
-      //         //     name: well.wellCode,
-      //         //     lnglat: [parseFloat(well.coordinateX), parseFloat(well.coordinateY)],
-      //         //     position: [parseFloat(well.coordinateX), parseFloat(well.coordinateY)],
-      //         //     positionInfo: well.position,
-      //         //     wellType: well.wellType,
-      //         //     deptid: well.deptid,
-      //         //     bfzt: well.bfzt,
-      //         //     icon: this.commonIcon,
-      //         //     visible: true,
-      //         //     wellStatus: 'normal'
-      //         //   })
-      //         //   centerxs.push(parseFloat(well.coordinateX))
-      //         //   centerys.push(parseFloat(well.coordinateY))
-      //         // }
-      //         // centerxs.sort()
-      //         // centerys.sort()
-      //         // const index = Math.floor(centerxs.length / 2)
-      //         // this.center = [centerxs[index], centerys[index]]
-      //       }
-      //     }
-      //   }
-      // })
     }
   }
 }
diff --git a/static/images/map_images/1.png b/static/images/map_images/1.png
new file mode 100644
index 0000000..b053e16
--- /dev/null
+++ b/static/images/map_images/1.png
Binary files differ
diff --git a/static/images/map_images/normal_well2.png b/static/images/map_images/normal_well2.png
new file mode 100644
index 0000000..cbc4a73
--- /dev/null
+++ b/static/images/map_images/normal_well2.png
Binary files differ