diff --git a/public/favicon.ico b/public/favicon.ico
index b225e2c..060fcac 100644
--- a/public/favicon.ico
+++ b/public/favicon.ico
Binary files differ

diff --git a/public/favicon.ico b/public/favicon.ico
index b225e2c..060fcac 100644
--- a/public/favicon.ico
+++ b/public/favicon.ico
Binary files differ
diff --git a/src/api/api/index.ts b/src/api/api/index.ts
index b56e534..4a6cf27 100644
--- a/src/api/api/index.ts
+++ b/src/api/api/index.ts
@@ -9,6 +9,7 @@
   collectDelete = '/collectionConfig/delete',
   // 配电网列表
   electricity = 'carbonElectricity/listPage',
+  electricitylist = '/carbonElectricity/list', // 不分页
   electricityAdd = 'carbonElectricity/add',
   electricityUpdate = 'carbonElectricity/update',
   electricityDelete = 'carbonElectricity/delete',
@@ -80,6 +81,12 @@
     params,
   })
 }
+export function getElectricityListAll() {
+  return request({
+    url: `${api.electricitylist}`,
+    method: 'get',
+  })
+}
 // 添加 配电网
 export function addElectricityList(data: any) {
   return request({
@@ -103,6 +110,13 @@
     method: 'post',
   })
 }
+// 配电网节点查询
+export function electricityNode(id: any) {
+  return request({
+    url: `/electricityNode/list?electricityId=${id}`,
+    method: 'get',
+  })
+}
 // 光伏/楼宇/电动车管理列表
 export function getMonitorStation(params: any) {
   return request({

diff --git a/public/favicon.ico b/public/favicon.ico
index b225e2c..060fcac 100644
--- a/public/favicon.ico
+++ b/public/favicon.ico
Binary files differ
diff --git a/src/api/api/index.ts b/src/api/api/index.ts
index b56e534..4a6cf27 100644
--- a/src/api/api/index.ts
+++ b/src/api/api/index.ts
@@ -9,6 +9,7 @@
   collectDelete = '/collectionConfig/delete',
   // 配电网列表
   electricity = 'carbonElectricity/listPage',
+  electricitylist = '/carbonElectricity/list', // 不分页
   electricityAdd = 'carbonElectricity/add',
   electricityUpdate = 'carbonElectricity/update',
   electricityDelete = 'carbonElectricity/delete',
@@ -80,6 +81,12 @@
     params,
   })
 }
+export function getElectricityListAll() {
+  return request({
+    url: `${api.electricitylist}`,
+    method: 'get',
+  })
+}
 // 添加 配电网
 export function addElectricityList(data: any) {
   return request({
@@ -103,6 +110,13 @@
     method: 'post',
   })
 }
+// 配电网节点查询
+export function electricityNode(id: any) {
+  return request({
+    url: `/electricityNode/list?electricityId=${id}`,
+    method: 'get',
+  })
+}
 // 光伏/楼宇/电动车管理列表
 export function getMonitorStation(params: any) {
   return request({
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 29bee98..a5c8ec3 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -5,10 +5,12 @@
  -->
 <script lang="ts" setup name="GuadMap">
 import AMapLoader from '@amap/amap-jsapi-loader'
+import { electricityNode, getElectricityListAll } from '@/api/api/index'
 // 设置安全密钥
 window._AMapSecurityConfig = {
   securityJsCode: '56bf9671d4b3517d294caec4751889a1', // 后期需替换
 }
+const electricityList = ref()
 // 地图实例
 const map = ref()
 //  用来画区域的
@@ -24,16 +26,10 @@
 ])
 // 区域点数组
 const markerArr = ref([
-  [111.738956, 40.83476],
-  [111.738956, 40.83676],
 ])
+const markerArrInfo = ref()
 // 折现节点坐标
-// const lineArr = ref([
-//   [116.368904, 39.913423],
-//   [116.382122, 39.901176],
-//   [116.387271, 39.912501],
-//   [116.398258, 39.904600],
-// ])
+const lineArr = ref([])
 // 初始化地图
 const initMap = () => {
   AMapLoader.load({
@@ -46,15 +42,15 @@
       map.value = new AMap.Map('map', {
         viewMode: '2D', //  是否为3D地图模式
         zoom: 17, // 初始化地图级别
-        center: [111.737906, 40.83576],
+        center: markerArr.value[0],
         resizeEnable: true,
       })
       // 用来画区域的
-      polygon.value = new AMap.Polygon({
-        map: map.value,
-        fillOpacity: 0.2,
-        path: pathArr.value, // 区域数组
-      })
+      // polygon.value = new AMap.Polygon({
+      //   map: map.value,
+      //   fillOpacity: 0.2,
+      //   path: pathArr.value, // 区域数组
+      // })
       // 画图工具
       // mouseTool.value = new AMap.MouseTool(map.value)
       // mouseTool.value.rectangle({
@@ -86,7 +82,8 @@
       for (let i = 0; i < markerArr.value.length; i++) {
         const icon = new AMap.Icon({
           size: new AMap.Size(36, 36), // 图标尺寸
-          image: 'https://img1.baidu.com/it/u=783564618,4142196075&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=500', // Icon的图像
+          // image: 'https://img1.baidu.com/it/u=783564618,4142196075&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=500', // Icon的图像
+          image: 'http://111.198.10.15:11404/imgs/1.png', // Icon的图像
           imageSize: new AMap.Size(24, 30), // 根据所设置的大小拉伸或压缩图片
           imageOffset: new AMap.Pixel(0, 0), // 图像相对展示区域的偏移量，适于雪碧图等
         })
@@ -98,32 +95,45 @@
           icon,
           offset: new AMap.Pixel(-20, -20),
         })
+        marker.setLabel({
+          offset: new AMap.Pixel(-10, -2), // 设置文本标注偏移量
+          content: `<div>${markerArrInfo.value[i].busId}</div>`, // 设置文本标注内容
+          direction: 'right', // 设置文本标注方位
+        })
         map.value.add([marker])
+        // 标记点文本
         // 自动适应显示想显示的范围区域
         // map.value.setFitView()
       }
-      // 折现
-      const path = [
-        new AMap.LngLat(111.737506, 40.83476),
-        new AMap.LngLat(111.738956, 40.83476),
-        new AMap.LngLat(111.738956, 40.83676),
-      ]
-      const polyline = new AMap.Polyline({
-        path,
-        borderWeight: 1, // 线条宽度，默认为 1
-        strokeColor: '#008d68', // 线条颜色
-        lineJoin: 'round', // 折线拐点连接处样式
-        strokeStyle: 'solid',
-      })
-      polyline.setMap(map.value)
-      map.value.add(polyline)
+      // 折现(
+      // const path = lineArr.value.map(item => (new AMap.LngLat(item[0], item[1])))
+      // const polyline = new AMap.Polyline({
+      //   path,
+      //   borderWeight: 1, // 线条宽度，默认为 1
+      //   strokeColor: '#008d68', // 线条颜色
+      //   lineJoin: 'round', // 折线拐点连接处样式
+      //   strokeStyle: 'solid',
+      // })
+      // polyline.setMap(map.value)
+      // map.value.add(polyline)
     })
     .catch((e) => {
       console.log(e)
     })
 }
 onMounted(() => {
-  initMap()
+  getElectricityListAll().then((res) => {
+    // 电网列表
+    electricityList.value = res.data
+    // 默认选中第一个查询节点
+    if (electricityList.value.length) {
+      electricityNode(electricityList.value[0].id).then((res) => {
+        markerArr.value = res.data.map(item => ([Number(item.lng), Number(item.lat)]))
+        markerArrInfo.value = res.data
+        initMap()
+      })
+    }
+  })
 })
 </script>
 
@@ -151,4 +161,9 @@
 .amap-copyright {
   display: none !important;
 }
+
+.amap-marker-label {
+  border: 0;
+  background-color: transparent;
+}
 </style>