diff --git a/src/utils/map.js b/src/utils/map.js
new file mode 100644
index 0000000..6c80e69
--- /dev/null
+++ b/src/utils/map.js
@@ -0,0 +1,14 @@
+/**
+ * 将十进制度格式的经度转换为度分秒
+ * @param {*} decimal 
+ * @param {*} isLongitude 是不是经度
+ * @returns 
+ */
+export function decimalToDms(decimal, isLongitude = true) {
+    const degrees = Math.floor(decimal);
+    const decimalMinutes = (decimal - degrees) * 60;
+    const minutes = Math.floor(decimalMinutes);
+    const seconds = parseInt((decimalMinutes - minutes) * 60);
+    const tail = isLongitude ? (decimal > 0 ? 'E' : decimal < 0 ? 'W' : '') : (decimal > 0 ? 'N' : decimal < 0 ? 'S' : '')
+    return `${Math.abs(degrees)}°${minutes}'${seconds}"${tail}`;
+}
\ No newline at end of file
diff --git a/src/views/stationOperation/components/DataListItem.vue b/src/views/stationOperation/components/DataListItem.vue
index 57ba3d9..44cc0fc 100644
--- a/src/views/stationOperation/components/DataListItem.vue
+++ b/src/views/stationOperation/components/DataListItem.vue
@@ -10,9 +10,11 @@
             <label>Station Type:</label>
             <span>{{ item.stationType }}</span>
           </div>
+        </div>
+        <div class="data-list-item-children">
           <div class="data-list-item-child" style="word-break: break-all">
             <label>Altitude:</label>
-            <span>{{ item.altitude + 'm' }}</span>
+            <span>{{ item.altitude }}</span>
           </div>
         </div>
         <div class="data-list-item-children">
diff --git a/src/views/stationOperation/components/MapMarker.vue b/src/views/stationOperation/components/MapMarker.vue
index 1749b12..311a629 100644
--- a/src/views/stationOperation/components/MapMarker.vue
+++ b/src/views/stationOperation/components/MapMarker.vue
@@ -1,19 +1,27 @@
 <template>
-  <div ref="mapPopupRef" class="popover">
-    这是弹窗
+  <div ref="mapPopupRef" class="facility-info-popover">
+    <h2>{{ popupTitle }} Info</h2>
+    <a-spin :spinning="isGettingInfo">
+      <div class="facility-info-item" v-for="(item, index) in columns" :key="index">
+        <div class="facility-info-item-label">{{ item.label }}</div>
+        <div class="facility-info-item-content">{{ currStationInfo[item.key] || '--' }}</div>
+      </div>
+    </a-spin>
   </div>
 </template>
 <script>
-import { Vector as VectorLayer } from 'ol/layer'
-import VectorSource from 'ol/source/Vector'
-import Feature from 'ol/Feature'
-import { Fill, Icon, Stroke, Style } from 'ol/style'
-import { Point } from 'ol/geom'
 import Overlay from 'ol/Overlay'
 
 import { MarkerIcon } from './markerEnum'
 import { fromLonLat } from 'ol/proj'
 
+import PopupColumns from './markerPopupColumns'
+import { getAction } from '../../../api/manage'
+import { debounce } from 'lodash'
+import { decimalToDms } from '@/utils/map'
+
+const POPUP_OVERLAY_ID = 'map_popup'
+
 export default {
   props: {
     list: {
@@ -23,50 +31,76 @@ export default {
   },
   data() {
     return {
-      currStationInfo: {}
+      currStationInfo: {},
+      isGettingInfo: false,
+      columns: {},
+      popupTitle: ''
     }
   },
   mounted() {
     this.map = this.$parent.getMapInstance()
-    this.initLayer()
-    this.initMarkers()
-
-    this.initMapClick()
-    this.initMapPopup()
+    this.getStationInfo = debounce(stationInfo => {
+      // 查询设施详情时去抖动
+      if (this.isHover) {
+        this._getStationInfo(stationInfo)
+      }
+    }, 500)
   },
   methods: {
-    initLayer() {
-      this.markerLayer = new VectorLayer({
-        source: new VectorSource({
-          features: []
-        }),
-        properties: { name: 'eventMarker' }
-      })
-      this.map.addLayer(this.markerLayer)
-      console.log('%c [  ]-46', 'font-size:13px; background:pink; color:#bf2c9f;', this.markerLayer)
-    },
-
     // 初始化marker
     initMarkers() {
-      const markerFeatures = []
       this.list.forEach(eventItem => {
-        markerFeatures.push(this.getMarker(eventItem))
+        this.map.addOverlay(this.getMarker(eventItem))
       })
-      this.markerLayer.getSource().addFeatures(markerFeatures)
     },
 
-    // 初始化地图点击事件
-    initMapClick() {
-      this.map.on('click', evt => {
-        const feature = this.map.forEachFeatureAtPixel(evt.pixel, feature => {
-          return feature
-        })
-        const stationInfo = feature && feature.values_ && feature.values_.stationInfo
-        if (stationInfo) {
-          this.showMapPopup(stationInfo)
-        } else {
-          this.closeMapPopup()
-        }
+    // 获取marker图标
+    getMarker(stationInfo) {
+      const { lon, lat } = stationInfo
+
+      const img = document.createElement('img')
+      img.src = MarkerIcon[stationInfo.stationType]
+      img.addEventListener('click', () => {
+        this.$emit('markerClick')
+      })
+
+      img.addEventListener('mouseover', () => {
+        this.isHover = true
+        this.showMapPopup(stationInfo)
+      })
+
+      img.addEventListener('mouseout', () => {
+        this.isHover = false
+        this.closeMapPopup()
+      })
+
+      return new Overlay({
+        position: fromLonLat([lon, lat]),
+        element: img,
+        id: stationInfo.stationId,
+        positioning: 'center-center'
+      })
+    },
+
+    initRipples() {
+      this.list.forEach(eventItem => {
+        this.map.addOverlay(this.getRipple(eventItem))
+      })
+    },
+
+    getRipple({ lon, lat, stationId }) {
+      const rippleDiv = document.createElement('div')
+      rippleDiv.className = 'custom-ripple'
+
+      rippleDiv.innerHTML = ` <div class="inner-ripple-1"></div>
+                              <div class="inner-ripple-2"></div>
+                            `
+
+      return new Overlay({
+        position: fromLonLat([lon, lat]),
+        element: rippleDiv,
+        id: 'ripple_' + stationId,
+        positioning: 'center-center'
       })
     },
 
@@ -74,69 +108,153 @@ export default {
     initMapPopup() {
       this.popupOverlay = new Overlay({
         element: this.$refs.mapPopupRef,
-        autoPan: true,
-        autoPanAnimation: {
-          duration: 250
-        },
-        positioning: 'top-center'
+        positioning: 'top-center',
+        id: POPUP_OVERLAY_ID,
+        offset: [0, 27]
       })
       this.map.addOverlay(this.popupOverlay)
     },
 
     // 显示地图弹窗
-    showMapPopup(stationInfo) {
+    async showMapPopup(stationInfo) {
       this.popupOverlay.setPosition(fromLonLat([stationInfo.lon, stationInfo.lat]))
-      this.currStationInfo = stationInfo // 填充基本信息
+      this.columns = PopupColumns[stationInfo.stationType]
+      this.popupTitle = stationInfo.stationType
+      this.isGettingInfo = true
+      this.getStationInfo(stationInfo)
+    },
+
+    // 获取站点详情
+    async _getStationInfo(stationInfo) {
+      try {
+        const { success, result, message } = await getAction('/jeecg-station-operation/stationOperation/findInfo', {
+          stationId: stationInfo.stationId,
+          type: stationInfo.stationType
+        })
+        if (success) {
+          result.lon = decimalToDms(result.lon || result.longitude)
+          result.lat = decimalToDms(result.lat || result.latitude, false)
+
+          this.currStationInfo = result
+        } else {
+          this.$message.error(message)
+        }
+      } catch (error) {
+        console.error(error)
+      } finally {
+        this.isGettingInfo = false
+      }
     },
 
     //关闭地图弹窗
     closeMapPopup() {
       this.popupOverlay.setPosition(null)
-    },
-
-    // 获取marker图标
-    getMarker(stationInfo) {
-      const { lon, lat } = stationInfo
-      const markerFeature = new Feature({
-        geometry: new Point(fromLonLat([lon, lat])),
-        stationInfo
-      })
-
-      markerFeature.setStyle(this.getMarkerStyle(stationInfo.stationType))
-      return markerFeature
-    },
-
-    // 获取marker样式
-    getMarkerStyle(type) {
-      const src = MarkerIcon[type]
-      return new Style({
-        image: new Icon({
-          src,
-          scale: 0.8
-        })
-      })
-    },
-
-    // 设置marker位置
-    setMarkerPosition(markerId, position) {
-      const overlay = this.map.getOverlayById(markerId)
-      overlay.setPosition(position)
     }
   },
   watch: {
     list() {
-      this.markerLayer.getSource().clear()
-      console.log('%c [  ]-122', 'font-size:13px; background:pink; color:#bf2c9f;', this.map)
+      this.map.getOverlays().clear()
+      this.initMapPopup()
       this.initMarkers()
+      this.initRipples()
     }
   }
 }
 </script>
 <style lang="less" scoped>
-.popover {
-  width: 200px;
-  height: 300px;
-  background-color: rgba(2, 26, 29, 0.9);
-  box-shadow: 0 0 5px rgba(2, 26, 29, 0.9);
+.facility-info {
+  &-popover {
+    position: relative;
+    width: 350px;
+    background-color: rgba(2, 26, 29, 0.9);
+    border-radius: 4px;
+    box-shadow: 0 0 5px rgba(2, 26, 29, 0.9);
+    padding: 5px;
+
+    &::before {
+      position: absolute;
+      top: -6px;
+      left: 50%;
+      content: '';
+      width: 12px;
+      height: 12px;
+      border: 1px solid rgba(2, 26, 29, 0.9);
+      background: rgba(2, 26, 29, 0.9);
+      transform: translateX(-50%) rotate(45deg) skew(14deg, 14deg);
+      border-bottom: 0;
+      border-right: 0;
+    }
+
+    h2 {
+      color: #6ebad0;
+      font-size: 16px;
+      text-align: center;
+      line-height: 30px;
+      border-bottom: 1px solid #0a544e;
+      margin-bottom: 0;
+    }
+  }
+
+  @border: 1px solid #0a544e;
+  &-item {
+    display: flex;
+    border: @border;
+    border-top: 0;
+    line-height: 25px;
+
+    &-label,
+    &-content {
+      width: 50%;
+      padding: 0 3px;
+      text-align: center;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+
+    &-label {
+      border-right: @border;
+      color: #6ebad0;
+    }
+  }
+}
+</style>
+<style lang="less">
+.custom-ripple {
+  width: 85px;
+  height: 85px;
+  z-index: -1;
+
+  @duration: 1.8s;
+  @delay: 0.9s;
+  .inner-ripple-1 {
+    position: absolute;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    border-radius: 50%;
+    background-image: radial-gradient(circle, transparent 10%, rgba(15, 148, 28, 0.1) 30%, rgba(15, 148, 28, 0.5) 60%);
+    animation: rippleEffect @duration linear @delay infinite;
+  }
+  .inner-ripple-2 {
+    position: absolute;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    border-radius: 50%;
+    background-image: radial-gradient(circle, transparent 10%, rgba(15, 148, 28, 0.1) 30%, rgba(15, 148, 28, 0.5) 60%);
+    animation: rippleEffect @duration linear @delay * 2 infinite;
+  }
+}
+
+@keyframes rippleEffect {
+  0% {
+    transform: scale(0.6);
+    opacity: 1;
+  }
+  100% {
+    transform: scale(1.2);
+    opacity: 0;
+  }
 }
 </style>
diff --git a/src/views/stationOperation/components/MapPane.vue b/src/views/stationOperation/components/MapPane.vue
index 408a30d..06b4513 100644
--- a/src/views/stationOperation/components/MapPane.vue
+++ b/src/views/stationOperation/components/MapPane.vue
@@ -224,6 +224,11 @@ import { postAction } from '../../../api/manage'
 import { MarkerType } from './markerEnum'
 
 import { Vector as VectorLayer } from 'ol/layer'
+import VectorSource from 'ol/source/Vector'
+import { Circle } from 'ol/geom'
+import { fromLonLat } from 'ol/proj'
+import Feature from 'ol/Feature'
+import { Fill, Stroke, Style } from 'ol/style'
 
 // Filter中的筛选列表
 const filterList = [
@@ -389,17 +394,26 @@ export default {
   created() {
     this.initParentMapProps()
     document.addEventListener('fullscreenchange', this.onFullScreenChange)
+    this.stationList = []
   },
   destroyed() {
     document.removeEventListener('fullscreenchange', this.onFullScreenChange)
   },
   methods: {
     initParentMapProps() {
-      const { getZoom, setZoom, maxZoom, minZoom } = this.$parent
+      const { getZoom, setZoom, maxZoom, minZoom, map } = this.$parent
       this.getZoom = getZoom
       this.setZoom = setZoom
       this.maxZoom = maxZoom
       this.minZoom = minZoom
+      this.map = map
+      this.circleLayer = new VectorLayer({
+        source: new VectorSource({
+          features: []
+        }),
+        properties: { name: 'eventCircle' }
+      })
+      this.map.addLayer(this.circleLayer)
     },
 
     handleFullScreen() {
@@ -420,10 +434,13 @@ export default {
       this.active = active
       switch (active) {
         case 1: // 核设施查询面板
+          this.drawCircle()
           this.emitStationChange()
           break
         case 2: // 筛选面板
           this.emitTypeFilter()
+          const source = this.circleLayer.getSource()
+          source.clear()
           break
       }
     },
@@ -485,17 +502,19 @@ export default {
           })
           this.dataSource = data // 设置Infomation表格内容
 
-          const stationList = [] // 台站列表
-          markerList.forEach(markerItem => { // 返回的数据类型不符合要求，根据stationId判断是否是台站，增加台站类型和转换字段，以便进行marker的绘制
+          this.stationList = [] // 台站列表
+          markerList.forEach(markerItem => {
+            // 返回的数据类型不符合要求，根据stationId判断是否是台站，增加台站类型和转换字段，以便进行marker的绘制
             if (markerItem.stationId) {
               // 是台站
               markerItem.stationType = MarkerType.ImsRnStationG
-              stationList.push(markerItem)
+              this.stationList.push(markerItem)
             } else {
               // 是核设施
               markerItem.stationType = MarkerType.NuclearFacility
               markerItem.lon = markerItem.longitude
               markerItem.lat = markerItem.latitude
+              markerItem.stationId = markerItem.facilityId
             }
           })
 
@@ -508,7 +527,7 @@ export default {
           this.markerList = markerList
           this.emitStationChange()
 
-          this.drawCircle(stationList)
+          this.drawCircle()
         } else {
           this.$message.error(message)
         }
@@ -520,13 +539,53 @@ export default {
     },
 
     // 绘制圆圈
-    drawCircle(stationList) {
-      this.circleLayer = new VectorLayer({
-        source: new VectorSource({
-          features: []
-        }),
-        properties: { name: 'eventMarker' }
+    drawCircle() {
+      const source = this.circleLayer.getSource()
+      source.clear()
+      const circleFeatures = []
+      this.stationList.forEach(stationItem => {
+        circleFeatures.push(this.getCircle(stationItem))
       })
+      source.addFeatures(circleFeatures)
+    },
+
+    getCircle(stationInfo) {
+      const { lon, lat } = stationInfo
+
+      // 定义填充颜色
+      const fill = new Fill({
+        color: 'rgba(255, 0, 0, .4)' // 红色半透明填充
+      })
+
+      // 定义边框样式
+      const stroke = new Stroke({
+        color: 'rgba(255, 0, 0, .4)', // 红色半透明边框
+        width: 1 // 边框宽度
+      })
+
+      // 创建样式
+      const style = new Style({
+        fill: fill,
+        stroke: stroke
+      })
+
+      const circle = new Circle(fromLonLat([lon, lat]), this.getRadius())
+      const feature = new Feature({
+        geometry: circle,
+        style: style
+      })
+      feature.setStyle(style)
+      return feature
+    },
+
+    // 半径计算
+    getRadius() {
+      const metersPerUnit = this.map
+        .getView()
+        .getProjection()
+        .getMetersPerUnit()
+      const circleRadius = (this.radius * 1000) / metersPerUnit
+      return circleRadius
     },
 
     // 打开分析弹窗
diff --git a/src/views/stationOperation/components/markerEnum.js b/src/views/stationOperation/components/markerEnum.js
index 3f375d9..e8731c6 100644
--- a/src/views/stationOperation/components/markerEnum.js
+++ b/src/views/stationOperation/components/markerEnum.js
@@ -7,8 +7,8 @@ import Ship from '@/assets/images/station-operation/ship.png'
 export const MarkerType = {
     Car: 'Car',
     GroudMonitoringStation: 'Groud monitoring station',
-    ImsRnStationP: 'IMS STATION',
-    ImsRnStationG: 'IMS STATION',
+    ImsRnStationP: 'IMS STATION(P)',
+    ImsRnStationG: 'IMS STATION(G)',
     NuclearFacility: 'Nuclear Facility',
     Ship: 'Ship'
 
diff --git a/src/views/stationOperation/components/markerPopupColumns.js b/src/views/stationOperation/components/markerPopupColumns.js
new file mode 100644
index 0000000..d136704
--- /dev/null
+++ b/src/views/stationOperation/components/markerPopupColumns.js
@@ -0,0 +1,157 @@
+import { MarkerType } from './markerEnum'
+
+// 核设施详情弹窗中的字段配置
+export default {
+    [MarkerType.NuclearFacility]: [
+        {
+            label: 'ACTIVITY DAY',
+            key: 'activityDay'
+        },
+        {
+            label: 'ACTIVITY_YEAR',
+            key: 'activityYear'
+        },
+        {
+            label: 'BUILDDATE',
+            key: 'buildDate'
+        },
+        {
+            label: 'CAPACITYGROSS',
+            key: 'capacitygross'
+        },
+        {
+            label: 'CAPACITYNET',
+            key: 'capacitynet'
+        },
+        {
+            label: 'CAPACITYTHERMAL',
+            key: 'capacitythermal'
+        },
+        {
+            label: 'CRITICALITYDATE',
+            key: 'criticalityDate'
+        },
+        {
+            label: 'FACILITY ID',
+            key: 'facilityId'
+        },
+        {
+            label: 'FACILITY_NAME',
+            key: 'facilityName'
+        },
+        {
+            label: 'GRIDCONEETIONDATE',
+            key: 'gridconeetionDate'
+        },
+        {
+            label: 'LATITUDE',
+            key: 'lat'
+        },
+        {
+            label: 'LOCATION',
+            key: 'location'
+        },
+        {
+            label: 'LONGITUDE',
+            key: 'lon'
+        },
+        {
+            label: 'OPERARTOR',
+            key: 'operartor'
+        },
+        {
+            label: 'OWNER',
+            key: 'owner'
+        },
+        {
+            label: 'RETIREDATE',
+            key: 'retireDate'
+        },
+        {
+            label: 'STATUS',
+            key: 'status'
+        },
+        {
+            label: 'TYPE',
+            key: 'type'
+        },
+        {
+            label: 'VENDOR',
+            key: 'vendor'
+        },
+    ],
+    [MarkerType.ImsRnStationP]: [{
+        label: 'COUNTRYCODE',
+        key: 'countryCode'
+    }, {
+        label: 'DATEBEGIN',
+        key: 'dateBegin'
+    }, {
+        label: 'DATEEND',
+        key: 'dateEnd'
+    }, {
+        label: 'DESCRIPTION',
+        key: 'description'
+    }, {
+        label: 'ELEVATION',
+        key: 'elevation'
+    }, {
+        label: 'LATITUDE',
+        key: 'lat'
+    }, {
+        label: 'LONGITUDE',
+        key: 'lon'
+    }, {
+        label: 'MODDATE',
+        key: 'moddate'
+    }, {
+        label: 'STATIONCODE',
+        key: 'stationCode'
+    }, {
+        label: 'STATIONID',
+        key: 'stationId'
+    }, {
+        label: 'STATUS',
+        key: 'status'
+    }, {
+        label: 'TYPE',
+        key: 'type'
+    }],
+    [MarkerType.ImsRnStationG]: [{
+        label: 'COUNTRYCODE',
+        key: 'countryCode'
+    }, {
+        label: 'DATEBEGIN',
+        key: 'dateBegin'
+    }, {
+        label: 'DATEEND',
+        key: 'dateEnd'
+    }, {
+        label: 'DESCRIPTION',
+        key: 'description'
+    }, {
+        label: 'ELEVATION',
+        key: 'elevation'
+    }, {
+        label: 'LATITUDE',
+        key: 'lat'
+    }, {
+        label: 'LONGITUDE',
+        key: 'lon'
+    }, {
+        label: 'MODDATE',
+        key: 'moddate'
+    }, {
+        label: 'STATIONCODE',
+        key: 'stationCode'
+    }, {
+        label: 'STATIONID',
+        key: 'stationId'
+    }, {
+        label: 'STATUS',
+        key: 'status'
+    }, {
+        label: 'TYPE',
+        key: 'type'
+    }]
+} 
\ No newline at end of file
diff --git a/src/views/stationOperation/index.vue b/src/views/stationOperation/index.vue
index e814cee..79d7a8c 100644
--- a/src/views/stationOperation/index.vue
+++ b/src/views/stationOperation/index.vue
@@ -86,7 +86,7 @@
                   ref="customScrollContainerRef"
                   class="scroller"
                   :items="dataList"
-                  :item-size="108"
+                  :item-size="129"
                   key-field="stationId"
                   v-slot="{ item }"
                 >
@@ -139,8 +139,13 @@
         ref="map"
         token="AAPK2b935e8bbf564ef581ca3c6fcaa5f2a71ZH84cPqqFvyz3KplFRHP8HyAwJJkh6cnpcQ-qkWh5aiyDQsGJbsXglGx0QM2cPm"
       >
-        <MapMarker :list="markerList" />
-        <MapPane :treeData="treeData" @changeMarker="onChangeMarker" @changeMarkerByType="onChangeMarkerByType" />
+        <MapMarker :list="markerList" @markerClick="onMarkerClick" />
+        <MapPane
+          ref="mapPane"
+          :treeData="treeData"
+          @changeMarker="onChangeMarker"
+          @changeMarkerByType="onChangeMarkerByType"
+        />
       </Map>
     </div>
   </div>
@@ -332,6 +337,11 @@ export default {
       this.markerList = this.originalDataList.filter(item => typeList.includes(item.stationType))
     },
 
+    // 地图图标点击
+    onMarkerClick() {
+      this.$refs.mapPane.handleOpenAnalyzeModal()
+    },
+
     getScrollContainer() {
       return this.$refs.customScrollContainerRef.$el
     },