diff --git a/src/api/api/index.ts b/src/api/api/index.ts
index 4a6cf27..0af6bf9 100644
--- a/src/api/api/index.ts
+++ b/src/api/api/index.ts
@@ -110,13 +110,43 @@
     method: 'post',
   })
 }
-// 配电网节点查询
+// 配电网节点查询 / 母线参数
 export function electricityNode(id: any) {
   return request({
     url: `/electricityNode/list?electricityId=${id}`,
     method: 'get',
   })
 }
+// 母线参数新增
+export function electricityNodeAdd(data: object) {
+  return request({
+    url: '/electricityNode/add',
+    method: 'post',
+    data,
+  })
+}
+// 母线参数修改
+export function electricityNodeUpdate(data: object) {
+  return request({
+    url: '/electricityNode/update',
+    method: 'post',
+    data,
+  })
+}
+// 母线参数删除
+export function electricityNodeDelete(id: string) {
+  return request({
+    url: `/electricityNode/delete?id=${id}`,
+    method: 'post',
+  })
+}
+// 配电网支路查询
+export function electricityBranch(id: any) {
+  return request({
+    url: `/branchNodeInfo/branchList?electricityId=${id}`,
+    method: 'get',
+  })
+}
 // 光伏/楼宇/电动车管理列表
 export function getMonitorStation(params: any) {
   return request({
@@ -125,6 +155,13 @@
     params,
   })
 }
+// 光伏列表 - 不分页
+export function getMonitorStationList() {
+  return request({
+    url: '/monitorStation/list',
+    method: 'get',
+  })
+}
 // 添加 光伏/楼宇/电动车管
 export function addMonitorStation(data: any) {
   return request({

diff --git a/src/api/api/index.ts b/src/api/api/index.ts
index 4a6cf27..0af6bf9 100644
--- a/src/api/api/index.ts
+++ b/src/api/api/index.ts
@@ -110,13 +110,43 @@
     method: 'post',
   })
 }
-// 配电网节点查询
+// 配电网节点查询 / 母线参数
 export function electricityNode(id: any) {
   return request({
     url: `/electricityNode/list?electricityId=${id}`,
     method: 'get',
   })
 }
+// 母线参数新增
+export function electricityNodeAdd(data: object) {
+  return request({
+    url: '/electricityNode/add',
+    method: 'post',
+    data,
+  })
+}
+// 母线参数修改
+export function electricityNodeUpdate(data: object) {
+  return request({
+    url: '/electricityNode/update',
+    method: 'post',
+    data,
+  })
+}
+// 母线参数删除
+export function electricityNodeDelete(id: string) {
+  return request({
+    url: `/electricityNode/delete?id=${id}`,
+    method: 'post',
+  })
+}
+// 配电网支路查询
+export function electricityBranch(id: any) {
+  return request({
+    url: `/branchNodeInfo/branchList?electricityId=${id}`,
+    method: 'get',
+  })
+}
 // 光伏/楼宇/电动车管理列表
 export function getMonitorStation(params: any) {
   return request({
@@ -125,6 +155,13 @@
     params,
   })
 }
+// 光伏列表 - 不分页
+export function getMonitorStationList() {
+  return request({
+    url: '/monitorStation/list',
+    method: 'get',
+  })
+}
 // 添加 光伏/楼宇/电动车管
 export function addMonitorStation(data: any) {
   return request({
diff --git a/src/components.d.ts b/src/components.d.ts
index 1bd3d1b..5c3eb2a 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -40,6 +40,8 @@
     ImagePreview: typeof import('./components/ImagePreview/index.vue')['default']
     ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default']
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
+    InfoWindow: typeof import('./components/map/infoWindow.vue')['default']
+    InfoWindow2: typeof import('./components/map/infoWindow2.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     Map: typeof import('./components/map/index.vue')['default']
     MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']

diff --git a/src/api/api/index.ts b/src/api/api/index.ts
index 4a6cf27..0af6bf9 100644
--- a/src/api/api/index.ts
+++ b/src/api/api/index.ts
@@ -110,13 +110,43 @@
     method: 'post',
   })
 }
-// 配电网节点查询
+// 配电网节点查询 / 母线参数
 export function electricityNode(id: any) {
   return request({
     url: `/electricityNode/list?electricityId=${id}`,
     method: 'get',
   })
 }
+// 母线参数新增
+export function electricityNodeAdd(data: object) {
+  return request({
+    url: '/electricityNode/add',
+    method: 'post',
+    data,
+  })
+}
+// 母线参数修改
+export function electricityNodeUpdate(data: object) {
+  return request({
+    url: '/electricityNode/update',
+    method: 'post',
+    data,
+  })
+}
+// 母线参数删除
+export function electricityNodeDelete(id: string) {
+  return request({
+    url: `/electricityNode/delete?id=${id}`,
+    method: 'post',
+  })
+}
+// 配电网支路查询
+export function electricityBranch(id: any) {
+  return request({
+    url: `/branchNodeInfo/branchList?electricityId=${id}`,
+    method: 'get',
+  })
+}
 // 光伏/楼宇/电动车管理列表
 export function getMonitorStation(params: any) {
   return request({
@@ -125,6 +155,13 @@
     params,
   })
 }
+// 光伏列表 - 不分页
+export function getMonitorStationList() {
+  return request({
+    url: '/monitorStation/list',
+    method: 'get',
+  })
+}
 // 添加 光伏/楼宇/电动车管
 export function addMonitorStation(data: any) {
   return request({
diff --git a/src/components.d.ts b/src/components.d.ts
index 1bd3d1b..5c3eb2a 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -40,6 +40,8 @@
     ImagePreview: typeof import('./components/ImagePreview/index.vue')['default']
     ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default']
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
+    InfoWindow: typeof import('./components/map/infoWindow.vue')['default']
+    InfoWindow2: typeof import('./components/map/infoWindow2.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     Map: typeof import('./components/map/index.vue')['default']
     MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index a5c8ec3..00994da 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -5,7 +5,9 @@
  -->
 <script lang="ts" setup name="GuadMap">
 import AMapLoader from '@amap/amap-jsapi-loader'
-import { electricityNode, getElectricityListAll } from '@/api/api/index'
+import infoDetail from './infoWindow.vue'
+import infoDetail2 from './infoWindow2.vue'
+import { electricityBranch, electricityNode, getElectricityListAll, getMonitorStationList } from '@/api/api/index'
 // 设置安全密钥
 window._AMapSecurityConfig = {
   securityJsCode: '56bf9671d4b3517d294caec4751889a1', // 后期需替换
@@ -24,10 +26,19 @@
   [111.739906, 40.83686],
   [111.739906, 40.83386],
 ])
-// 区域点数组
+// 电网节点数组
 const markerArr = ref([
 ])
+// 光伏数组
+const markerArr1 = ref([
+])
+// 信息窗体
+const infoWindow = ref()
+const infoWindow2 = ref()
+const windowInfoRef = ref()
+const windowInfoRef2 = ref()
 const markerArrInfo = ref()
+const markerArrInfo1 = ref()
 // 折现节点坐标
 const lineArr = ref([])
 // 初始化地图
@@ -35,14 +46,15 @@
   AMapLoader.load({
     key: '40849e82b4e33f5255b17372520c954d', // 后期需替换
     version: '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
-    plugins: ['AMap.Scale', 'AMap.MouseTool'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
+    plugins: ['AMap.Scale', 'AMap.MouseTool', 'AMap.ToolBar'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
   })
     .then((AMap) => {
       // 初始化地图
       map.value = new AMap.Map('map', {
-        viewMode: '2D', //  是否为3D地图模式
+        viewMode: '3D', //  是否为3D地图模式
         zoom: 17, // 初始化地图级别
-        center: markerArr.value[0],
+        // center: markerArr.value[0],
+        center: [116.26755900, 39.91547100],
         resizeEnable: true,
       })
       // 用来画区域的
@@ -78,7 +90,7 @@
       //   }
       //   console.log(arr)// 121.540994,29.870174;121.55138,29.858116;121.55756,29.874193;
       // })
-      // 标记点绘制
+      // 电网支路标记点绘制
       for (let i = 0; i < markerArr.value.length; i++) {
         const icon = new AMap.Icon({
           size: new AMap.Size(36, 36), // 图标尺寸
@@ -87,58 +99,213 @@
           imageSize: new AMap.Size(24, 30), // 根据所设置的大小拉伸或压缩图片
           imageOffset: new AMap.Pixel(0, 0), // 图像相对展示区域的偏移量，适于雪碧图等
         })
-        // const content = '<div>111</div>'
         const marker = new AMap.Marker({
           position: markerArr.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
           map: map.value,
           title: '测试坐标',
           icon,
-          offset: new AMap.Pixel(-20, -20),
+          offset: new AMap.Pixel(3, -30),
+        })
+        // 支路点详细信息// 信息窗体
+        infoWindow.value = new AMap.InfoWindow({
+          isCustom: true, // 自定义信息窗体
+          content: windowInfoRef.value.$el, // 窗体内容(vue组件)
+          offset: new AMap.Pixel(9, -5), // 偏移
+        })
+        marker.on('click', (e) => {
+          // 打开信息窗口
+          // infoWindow.value.setContent(e.target.content)
+          infoWindow.value.open(map.value, e.lnglat)
+          // 初始化信息窗口
+          windowInfoRef.value.initialize({
+            overlay: e.target,
+            infoWindow: infoWindow.value,
+            info: markerArrInfo.value[i],
+          })
         })
         marker.setLabel({
           offset: new AMap.Pixel(-10, -2), // 设置文本标注偏移量
-          content: `<div>${markerArrInfo.value[i].busId}</div>`, // 设置文本标注内容
+          content: `<div>${markerArrInfo.value[i].nodeName}</div>`, // 设置文本标注内容
           direction: 'right', // 设置文本标注方位
         })
         map.value.add([marker])
-        // 标记点文本
-        // 自动适应显示想显示的范围区域
-        // map.value.setFitView()
       }
-      // 折现(
-      // 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)
+      // 光伏标记点及光伏绘制
+      for (let i = 0; i < markerArr1.value.length; i++) {
+        const icon = new AMap.Icon({
+          size: new AMap.Size(36, 36), // 图标尺寸
+          image: 'http://111.198.10.15:11404/imgs/2.png', // Icon的图像
+          imageSize: new AMap.Size(24, 30), // 根据所设置的大小拉伸或压缩图片
+          imageOffset: new AMap.Pixel(0, 0), // 图像相对展示区域的偏移量，适于雪碧图等
+        })
+        // const content = '<div>111</div>'
+        const marker = new AMap.Marker({
+          position: markerArr1.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+          map: map.value,
+          title: '测试坐标',
+          icon,
+          offset: new AMap.Pixel(-20, -20),
+        })
+        // 信息窗体
+        infoWindow2.value = new AMap.InfoWindow({
+          isCustom: true, // 自定义信息窗体
+          content: windowInfoRef2.value.$el, // 窗体内容(vue组件)
+          offset: new AMap.Pixel(9, -5), // 偏移
+        })
+        marker.on('click', (e) => {
+          // 打开信息窗口
+          infoWindow2.value.open(map.value, e.lnglat)
+          // infoWindow2.value.setContent(e.target)
+          // 初始化信息窗口
+          windowInfoRef2.value.initialize({
+            overlay: e.target,
+            infoWindow: infoWindow2.value,
+            info: markerArrInfo1.value[i],
+          })
+        })
+        marker.setLabel({
+          offset: new AMap.Pixel(-10, -2), // 设置文本标注偏移量
+          content: `<div>${markerArrInfo1.value[i].stationName}</div>`, // 设置文本标注内容
+          direction: 'right', // 设置文本标注方位
+        })
+        map.value.add([marker])
+        // 绘制电网和节点连线
+        const path = markerArrInfo1.value.map((item) => {
+          return [[Number(item.lng), Number(item.lat)], [Number(item.nodeLng), Number(item.nodeLat)]]
+        })
+        const polyline = new AMap.Polyline({
+          path,
+          strokeColor: '#03A382',
+          strokeStyle: 'dashed',
+          strokeDasharray: [10, 3],
+          lineJoin: 'round',
+          lineCap: 'round',
+          zIndex: 50,
+          zooms: [16, 20],
+        })
+        polyline.setMap(map.value)
+        map.value.add(polyline)
+      }
+      // 电网支路折线绘制
+      for (let i = 0; i < lineArr.value.length; i++) {
+        // console.log(lineArr.value[i])
+        const path = lineArr.value.map(item => item.branchNodeInfos)
+        const line = path.map(item => (
+          item.map((child) => {
+            return ([[child.flng, child.flat], [child.tlng, child.tlat], child.status2])
+          })
+        ))
+        line.forEach((item) => {
+          item.forEach((child) => {
+            const path = [child[0], child[1]]
+            const polyline = new AMap.Polyline({
+              path,
+              // isOutline: true,
+              strokeColor: child[2] === 1 ? '#008d68' : '#000',
+              // strokeOpacity: 1,
+              strokeWeight: 3,
+              // 折线样式还支持 'dashed'
+              strokeStyle: child[2] !== 1 ? 'dashed' : 'dashed ',
+              // strokeStyle是dashed时有效
+              strokeDasharray: [10, 3],
+              lineJoin: 'round',
+              showDir: child[2] === 1,
+              // lineCap: 'square',
+              lineCap: 'round',
+              zIndex: 50,
+              zooms: [16, 20],
+
+            })
+            polyline.setMap(map.value)
+            map.value.add(polyline)
+          })
+        })
+        // 添加支路折线文本
+        // 创建纯文本标记
+        const textArr = path.map(item => (
+          item.map((child) => {
+            return ([[(Number(child.flng) + Number(child.tlng)) / 2, (Number(child.flat) + Number(child.tlat)) / 2], child.flowRate])
+          })
+        ))
+        textArr.forEach((item) => {
+          // console.log(item, 'item')
+          item.forEach((child) => {
+            const icon = new AMap.Icon({
+              size: new AMap.Size(36, 36), // 图标尺寸
+              // image: '', // Icon的图像
+              imageSize: new AMap.Size(24, 30), // 根据所设置的大小拉伸或压缩图片
+              imageOffset: new AMap.Pixel(0, 0), // 图像相对展示区域的偏移量，适于雪碧图等
+            })
+            // const content = '<div>111</div>'
+            const marker = new AMap.Marker({
+              position: child[0], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+              map: map.value,
+              content: '<span></span>',
+              offset: new AMap.Pixel(-20, -20),
+            })
+            marker.setLabel({
+              offset: new AMap.Pixel(-10, -2), // 设置文本标注偏移量
+              content: `<div>${`${child[1]}kgCO2/h`}</div>`, // 设置文本标注内容
+              direction: 'right', // 设置文本标注方位
+            })
+            map.value.add([marker])
+          })
+        })
+      }
     })
     .catch((e) => {
       console.log(e)
     })
 }
-onMounted(() => {
-  getElectricityListAll().then((res) => {
+onMounted(async () => {
+  // 获取电网列表
+  try {
+    const list = await getElectricityListAll()
     // 电网列表
-    electricityList.value = res.data
-    // 默认选中第一个查询节点
+    electricityList.value = list.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()
-      })
+      const res = await electricityNode(electricityList.value[0].id)
+      markerArr.value = res.data.map(item => ([Number(item.lng), Number(item.lat)]))
+      markerArrInfo.value = res.data
+      // 获取支路信息(折线)
+      const res1 = await electricityBranch(electricityList.value[0].id)
+      lineArr.value = res1.data
     }
-  })
+    // 获取光伏列表
+    const list1 = await getMonitorStationList()
+    markerArr1.value = list1.data.map(item => ([Number(item.lng), Number(item.lat)]))
+    markerArrInfo1.value = list1.data
+    // 初始化地图
+    initMap()
+  }
+  catch (error) {
+    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
+  //       // 获取支路
+  //       electricityBranch(electricityList.value[0].id).then(res => {
+  //         lineArr.value = res.data
+  //         // console.log(res.data)
+  //         initMap()
+  //       })
+  //     })
+  //   }
+  // })
 })
 </script>
 
 <template>
   <div id="map" />
+  <info-detail ref="windowInfoRef" />
+  <info-detail2 ref="windowInfoRef2" />
 </template>
 
 <style scoped>

diff --git a/src/api/api/index.ts b/src/api/api/index.ts
index 4a6cf27..0af6bf9 100644
--- a/src/api/api/index.ts
+++ b/src/api/api/index.ts
@@ -110,13 +110,43 @@
     method: 'post',
   })
 }
-// 配电网节点查询
+// 配电网节点查询 / 母线参数
 export function electricityNode(id: any) {
   return request({
     url: `/electricityNode/list?electricityId=${id}`,
     method: 'get',
   })
 }
+// 母线参数新增
+export function electricityNodeAdd(data: object) {
+  return request({
+    url: '/electricityNode/add',
+    method: 'post',
+    data,
+  })
+}
+// 母线参数修改
+export function electricityNodeUpdate(data: object) {
+  return request({
+    url: '/electricityNode/update',
+    method: 'post',
+    data,
+  })
+}
+// 母线参数删除
+export function electricityNodeDelete(id: string) {
+  return request({
+    url: `/electricityNode/delete?id=${id}`,
+    method: 'post',
+  })
+}
+// 配电网支路查询
+export function electricityBranch(id: any) {
+  return request({
+    url: `/branchNodeInfo/branchList?electricityId=${id}`,
+    method: 'get',
+  })
+}
 // 光伏/楼宇/电动车管理列表
 export function getMonitorStation(params: any) {
   return request({
@@ -125,6 +155,13 @@
     params,
   })
 }
+// 光伏列表 - 不分页
+export function getMonitorStationList() {
+  return request({
+    url: '/monitorStation/list',
+    method: 'get',
+  })
+}
 // 添加 光伏/楼宇/电动车管
 export function addMonitorStation(data: any) {
   return request({
diff --git a/src/components.d.ts b/src/components.d.ts
index 1bd3d1b..5c3eb2a 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -40,6 +40,8 @@
     ImagePreview: typeof import('./components/ImagePreview/index.vue')['default']
     ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default']
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
+    InfoWindow: typeof import('./components/map/infoWindow.vue')['default']
+    InfoWindow2: typeof import('./components/map/infoWindow2.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     Map: typeof import('./components/map/index.vue')['default']
     MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index a5c8ec3..00994da 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -5,7 +5,9 @@
  -->
 <script lang="ts" setup name="GuadMap">
 import AMapLoader from '@amap/amap-jsapi-loader'
-import { electricityNode, getElectricityListAll } from '@/api/api/index'
+import infoDetail from './infoWindow.vue'
+import infoDetail2 from './infoWindow2.vue'
+import { electricityBranch, electricityNode, getElectricityListAll, getMonitorStationList } from '@/api/api/index'
 // 设置安全密钥
 window._AMapSecurityConfig = {
   securityJsCode: '56bf9671d4b3517d294caec4751889a1', // 后期需替换
@@ -24,10 +26,19 @@
   [111.739906, 40.83686],
   [111.739906, 40.83386],
 ])
-// 区域点数组
+// 电网节点数组
 const markerArr = ref([
 ])
+// 光伏数组
+const markerArr1 = ref([
+])
+// 信息窗体
+const infoWindow = ref()
+const infoWindow2 = ref()
+const windowInfoRef = ref()
+const windowInfoRef2 = ref()
 const markerArrInfo = ref()
+const markerArrInfo1 = ref()
 // 折现节点坐标
 const lineArr = ref([])
 // 初始化地图
@@ -35,14 +46,15 @@
   AMapLoader.load({
     key: '40849e82b4e33f5255b17372520c954d', // 后期需替换
     version: '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
-    plugins: ['AMap.Scale', 'AMap.MouseTool'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
+    plugins: ['AMap.Scale', 'AMap.MouseTool', 'AMap.ToolBar'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
   })
     .then((AMap) => {
       // 初始化地图
       map.value = new AMap.Map('map', {
-        viewMode: '2D', //  是否为3D地图模式
+        viewMode: '3D', //  是否为3D地图模式
         zoom: 17, // 初始化地图级别
-        center: markerArr.value[0],
+        // center: markerArr.value[0],
+        center: [116.26755900, 39.91547100],
         resizeEnable: true,
       })
       // 用来画区域的
@@ -78,7 +90,7 @@
       //   }
       //   console.log(arr)// 121.540994,29.870174;121.55138,29.858116;121.55756,29.874193;
       // })
-      // 标记点绘制
+      // 电网支路标记点绘制
       for (let i = 0; i < markerArr.value.length; i++) {
         const icon = new AMap.Icon({
           size: new AMap.Size(36, 36), // 图标尺寸
@@ -87,58 +99,213 @@
           imageSize: new AMap.Size(24, 30), // 根据所设置的大小拉伸或压缩图片
           imageOffset: new AMap.Pixel(0, 0), // 图像相对展示区域的偏移量，适于雪碧图等
         })
-        // const content = '<div>111</div>'
         const marker = new AMap.Marker({
           position: markerArr.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
           map: map.value,
           title: '测试坐标',
           icon,
-          offset: new AMap.Pixel(-20, -20),
+          offset: new AMap.Pixel(3, -30),
+        })
+        // 支路点详细信息// 信息窗体
+        infoWindow.value = new AMap.InfoWindow({
+          isCustom: true, // 自定义信息窗体
+          content: windowInfoRef.value.$el, // 窗体内容(vue组件)
+          offset: new AMap.Pixel(9, -5), // 偏移
+        })
+        marker.on('click', (e) => {
+          // 打开信息窗口
+          // infoWindow.value.setContent(e.target.content)
+          infoWindow.value.open(map.value, e.lnglat)
+          // 初始化信息窗口
+          windowInfoRef.value.initialize({
+            overlay: e.target,
+            infoWindow: infoWindow.value,
+            info: markerArrInfo.value[i],
+          })
         })
         marker.setLabel({
           offset: new AMap.Pixel(-10, -2), // 设置文本标注偏移量
-          content: `<div>${markerArrInfo.value[i].busId}</div>`, // 设置文本标注内容
+          content: `<div>${markerArrInfo.value[i].nodeName}</div>`, // 设置文本标注内容
           direction: 'right', // 设置文本标注方位
         })
         map.value.add([marker])
-        // 标记点文本
-        // 自动适应显示想显示的范围区域
-        // map.value.setFitView()
       }
-      // 折现(
-      // 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)
+      // 光伏标记点及光伏绘制
+      for (let i = 0; i < markerArr1.value.length; i++) {
+        const icon = new AMap.Icon({
+          size: new AMap.Size(36, 36), // 图标尺寸
+          image: 'http://111.198.10.15:11404/imgs/2.png', // Icon的图像
+          imageSize: new AMap.Size(24, 30), // 根据所设置的大小拉伸或压缩图片
+          imageOffset: new AMap.Pixel(0, 0), // 图像相对展示区域的偏移量，适于雪碧图等
+        })
+        // const content = '<div>111</div>'
+        const marker = new AMap.Marker({
+          position: markerArr1.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+          map: map.value,
+          title: '测试坐标',
+          icon,
+          offset: new AMap.Pixel(-20, -20),
+        })
+        // 信息窗体
+        infoWindow2.value = new AMap.InfoWindow({
+          isCustom: true, // 自定义信息窗体
+          content: windowInfoRef2.value.$el, // 窗体内容(vue组件)
+          offset: new AMap.Pixel(9, -5), // 偏移
+        })
+        marker.on('click', (e) => {
+          // 打开信息窗口
+          infoWindow2.value.open(map.value, e.lnglat)
+          // infoWindow2.value.setContent(e.target)
+          // 初始化信息窗口
+          windowInfoRef2.value.initialize({
+            overlay: e.target,
+            infoWindow: infoWindow2.value,
+            info: markerArrInfo1.value[i],
+          })
+        })
+        marker.setLabel({
+          offset: new AMap.Pixel(-10, -2), // 设置文本标注偏移量
+          content: `<div>${markerArrInfo1.value[i].stationName}</div>`, // 设置文本标注内容
+          direction: 'right', // 设置文本标注方位
+        })
+        map.value.add([marker])
+        // 绘制电网和节点连线
+        const path = markerArrInfo1.value.map((item) => {
+          return [[Number(item.lng), Number(item.lat)], [Number(item.nodeLng), Number(item.nodeLat)]]
+        })
+        const polyline = new AMap.Polyline({
+          path,
+          strokeColor: '#03A382',
+          strokeStyle: 'dashed',
+          strokeDasharray: [10, 3],
+          lineJoin: 'round',
+          lineCap: 'round',
+          zIndex: 50,
+          zooms: [16, 20],
+        })
+        polyline.setMap(map.value)
+        map.value.add(polyline)
+      }
+      // 电网支路折线绘制
+      for (let i = 0; i < lineArr.value.length; i++) {
+        // console.log(lineArr.value[i])
+        const path = lineArr.value.map(item => item.branchNodeInfos)
+        const line = path.map(item => (
+          item.map((child) => {
+            return ([[child.flng, child.flat], [child.tlng, child.tlat], child.status2])
+          })
+        ))
+        line.forEach((item) => {
+          item.forEach((child) => {
+            const path = [child[0], child[1]]
+            const polyline = new AMap.Polyline({
+              path,
+              // isOutline: true,
+              strokeColor: child[2] === 1 ? '#008d68' : '#000',
+              // strokeOpacity: 1,
+              strokeWeight: 3,
+              // 折线样式还支持 'dashed'
+              strokeStyle: child[2] !== 1 ? 'dashed' : 'dashed ',
+              // strokeStyle是dashed时有效
+              strokeDasharray: [10, 3],
+              lineJoin: 'round',
+              showDir: child[2] === 1,
+              // lineCap: 'square',
+              lineCap: 'round',
+              zIndex: 50,
+              zooms: [16, 20],
+
+            })
+            polyline.setMap(map.value)
+            map.value.add(polyline)
+          })
+        })
+        // 添加支路折线文本
+        // 创建纯文本标记
+        const textArr = path.map(item => (
+          item.map((child) => {
+            return ([[(Number(child.flng) + Number(child.tlng)) / 2, (Number(child.flat) + Number(child.tlat)) / 2], child.flowRate])
+          })
+        ))
+        textArr.forEach((item) => {
+          // console.log(item, 'item')
+          item.forEach((child) => {
+            const icon = new AMap.Icon({
+              size: new AMap.Size(36, 36), // 图标尺寸
+              // image: '', // Icon的图像
+              imageSize: new AMap.Size(24, 30), // 根据所设置的大小拉伸或压缩图片
+              imageOffset: new AMap.Pixel(0, 0), // 图像相对展示区域的偏移量，适于雪碧图等
+            })
+            // const content = '<div>111</div>'
+            const marker = new AMap.Marker({
+              position: child[0], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+              map: map.value,
+              content: '<span></span>',
+              offset: new AMap.Pixel(-20, -20),
+            })
+            marker.setLabel({
+              offset: new AMap.Pixel(-10, -2), // 设置文本标注偏移量
+              content: `<div>${`${child[1]}kgCO2/h`}</div>`, // 设置文本标注内容
+              direction: 'right', // 设置文本标注方位
+            })
+            map.value.add([marker])
+          })
+        })
+      }
     })
     .catch((e) => {
       console.log(e)
     })
 }
-onMounted(() => {
-  getElectricityListAll().then((res) => {
+onMounted(async () => {
+  // 获取电网列表
+  try {
+    const list = await getElectricityListAll()
     // 电网列表
-    electricityList.value = res.data
-    // 默认选中第一个查询节点
+    electricityList.value = list.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()
-      })
+      const res = await electricityNode(electricityList.value[0].id)
+      markerArr.value = res.data.map(item => ([Number(item.lng), Number(item.lat)]))
+      markerArrInfo.value = res.data
+      // 获取支路信息(折线)
+      const res1 = await electricityBranch(electricityList.value[0].id)
+      lineArr.value = res1.data
     }
-  })
+    // 获取光伏列表
+    const list1 = await getMonitorStationList()
+    markerArr1.value = list1.data.map(item => ([Number(item.lng), Number(item.lat)]))
+    markerArrInfo1.value = list1.data
+    // 初始化地图
+    initMap()
+  }
+  catch (error) {
+    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
+  //       // 获取支路
+  //       electricityBranch(electricityList.value[0].id).then(res => {
+  //         lineArr.value = res.data
+  //         // console.log(res.data)
+  //         initMap()
+  //       })
+  //     })
+  //   }
+  // })
 })
 </script>
 
 <template>
   <div id="map" />
+  <info-detail ref="windowInfoRef" />
+  <info-detail2 ref="windowInfoRef2" />
 </template>
 
 <style scoped>
diff --git a/src/components/map/infoWindow.vue b/src/components/map/infoWindow.vue
new file mode 100644
index 0000000..1df9061
--- /dev/null
+++ b/src/components/map/infoWindow.vue
@@ -0,0 +1,83 @@
+<!--
+  Description: 高德地图信息窗体 - 支路节点
+  Author: 李亚光
+  Date: 2023-05-10
+ -->
+<script lang="ts" setup name="infoWindow">
+const overlay = ref()
+const infoWindow = ref()
+const info = ref()
+// 初始化
+const initialize = (e) => {
+  overlay.value = e.overlay
+  infoWindow.value = e.infoWindow
+  info.value = e.info
+}
+defineExpose({ initialize })
+// 关闭
+const close = () => {
+  infoWindow.value.close()
+}
+</script>
+
+<template>
+  <div class="container">
+    <div class="title">
+      <div class="text">
+        {{ info?.nodeName }}
+      </div>
+      <div class="close" @click="close">
+        x
+      </div>
+    </div>
+    <div class="item">
+      节点编号 : {{ info?.busId }}
+    </div>
+    <div class="item">
+      <span>负荷有功功率 : {{ info?.pd }}</span>  <span>负荷无功功率 : {{ info?.qd }}</span>
+    </div>
+    <div class="item">
+      <span>节点碳势 : {{ info?.en }}</span>  <span>节点负荷碳流率 : {{ info?.flowRate }}</span>
+    </div>
+    <!-- // <div class="item">设备信息 : {{ device.produceCode }}</div>
+    // <div class="item">设备ID : {{ device.deviceId }}</div>
+    // <div class="item">IP地址 : {{ device.deviceIp }}</div>
+    // <div class="item">地址 : {{ device.deviceAddress }}</div> -->
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  width: 340px;
+  height: 140px;
+  padding: 10px;
+  background-color: #fff;
+  border: 1px solid #6d9ece;
+
+  .title {
+    font-size: 16px;
+    font-weight: 700;
+    padding: 0 10px;
+    display: flex;
+    justify-content: space-between;
+
+    .close {
+      color: #ccc;
+
+      &:hover {
+        cursor: pointer;
+      }
+    }
+  }
+
+  .item {
+    padding: 0 5px;
+    color: #111213;
+    font-size: 14px;
+    margin: 10px;
+    border-bottom: 1px solid #ccc;
+    display: flex;
+    justify-content: space-between;
+  }
+}
+</style>

diff --git a/src/api/api/index.ts b/src/api/api/index.ts
index 4a6cf27..0af6bf9 100644
--- a/src/api/api/index.ts
+++ b/src/api/api/index.ts
@@ -110,13 +110,43 @@
     method: 'post',
   })
 }
-// 配电网节点查询
+// 配电网节点查询 / 母线参数
 export function electricityNode(id: any) {
   return request({
     url: `/electricityNode/list?electricityId=${id}`,
     method: 'get',
   })
 }
+// 母线参数新增
+export function electricityNodeAdd(data: object) {
+  return request({
+    url: '/electricityNode/add',
+    method: 'post',
+    data,
+  })
+}
+// 母线参数修改
+export function electricityNodeUpdate(data: object) {
+  return request({
+    url: '/electricityNode/update',
+    method: 'post',
+    data,
+  })
+}
+// 母线参数删除
+export function electricityNodeDelete(id: string) {
+  return request({
+    url: `/electricityNode/delete?id=${id}`,
+    method: 'post',
+  })
+}
+// 配电网支路查询
+export function electricityBranch(id: any) {
+  return request({
+    url: `/branchNodeInfo/branchList?electricityId=${id}`,
+    method: 'get',
+  })
+}
 // 光伏/楼宇/电动车管理列表
 export function getMonitorStation(params: any) {
   return request({
@@ -125,6 +155,13 @@
     params,
   })
 }
+// 光伏列表 - 不分页
+export function getMonitorStationList() {
+  return request({
+    url: '/monitorStation/list',
+    method: 'get',
+  })
+}
 // 添加 光伏/楼宇/电动车管
 export function addMonitorStation(data: any) {
   return request({
diff --git a/src/components.d.ts b/src/components.d.ts
index 1bd3d1b..5c3eb2a 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -40,6 +40,8 @@
     ImagePreview: typeof import('./components/ImagePreview/index.vue')['default']
     ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default']
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
+    InfoWindow: typeof import('./components/map/infoWindow.vue')['default']
+    InfoWindow2: typeof import('./components/map/infoWindow2.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     Map: typeof import('./components/map/index.vue')['default']
     MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index a5c8ec3..00994da 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -5,7 +5,9 @@
  -->
 <script lang="ts" setup name="GuadMap">
 import AMapLoader from '@amap/amap-jsapi-loader'
-import { electricityNode, getElectricityListAll } from '@/api/api/index'
+import infoDetail from './infoWindow.vue'
+import infoDetail2 from './infoWindow2.vue'
+import { electricityBranch, electricityNode, getElectricityListAll, getMonitorStationList } from '@/api/api/index'
 // 设置安全密钥
 window._AMapSecurityConfig = {
   securityJsCode: '56bf9671d4b3517d294caec4751889a1', // 后期需替换
@@ -24,10 +26,19 @@
   [111.739906, 40.83686],
   [111.739906, 40.83386],
 ])
-// 区域点数组
+// 电网节点数组
 const markerArr = ref([
 ])
+// 光伏数组
+const markerArr1 = ref([
+])
+// 信息窗体
+const infoWindow = ref()
+const infoWindow2 = ref()
+const windowInfoRef = ref()
+const windowInfoRef2 = ref()
 const markerArrInfo = ref()
+const markerArrInfo1 = ref()
 // 折现节点坐标
 const lineArr = ref([])
 // 初始化地图
@@ -35,14 +46,15 @@
   AMapLoader.load({
     key: '40849e82b4e33f5255b17372520c954d', // 后期需替换
     version: '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
-    plugins: ['AMap.Scale', 'AMap.MouseTool'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
+    plugins: ['AMap.Scale', 'AMap.MouseTool', 'AMap.ToolBar'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
   })
     .then((AMap) => {
       // 初始化地图
       map.value = new AMap.Map('map', {
-        viewMode: '2D', //  是否为3D地图模式
+        viewMode: '3D', //  是否为3D地图模式
         zoom: 17, // 初始化地图级别
-        center: markerArr.value[0],
+        // center: markerArr.value[0],
+        center: [116.26755900, 39.91547100],
         resizeEnable: true,
       })
       // 用来画区域的
@@ -78,7 +90,7 @@
       //   }
       //   console.log(arr)// 121.540994,29.870174;121.55138,29.858116;121.55756,29.874193;
       // })
-      // 标记点绘制
+      // 电网支路标记点绘制
       for (let i = 0; i < markerArr.value.length; i++) {
         const icon = new AMap.Icon({
           size: new AMap.Size(36, 36), // 图标尺寸
@@ -87,58 +99,213 @@
           imageSize: new AMap.Size(24, 30), // 根据所设置的大小拉伸或压缩图片
           imageOffset: new AMap.Pixel(0, 0), // 图像相对展示区域的偏移量，适于雪碧图等
         })
-        // const content = '<div>111</div>'
         const marker = new AMap.Marker({
           position: markerArr.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
           map: map.value,
           title: '测试坐标',
           icon,
-          offset: new AMap.Pixel(-20, -20),
+          offset: new AMap.Pixel(3, -30),
+        })
+        // 支路点详细信息// 信息窗体
+        infoWindow.value = new AMap.InfoWindow({
+          isCustom: true, // 自定义信息窗体
+          content: windowInfoRef.value.$el, // 窗体内容(vue组件)
+          offset: new AMap.Pixel(9, -5), // 偏移
+        })
+        marker.on('click', (e) => {
+          // 打开信息窗口
+          // infoWindow.value.setContent(e.target.content)
+          infoWindow.value.open(map.value, e.lnglat)
+          // 初始化信息窗口
+          windowInfoRef.value.initialize({
+            overlay: e.target,
+            infoWindow: infoWindow.value,
+            info: markerArrInfo.value[i],
+          })
         })
         marker.setLabel({
           offset: new AMap.Pixel(-10, -2), // 设置文本标注偏移量
-          content: `<div>${markerArrInfo.value[i].busId}</div>`, // 设置文本标注内容
+          content: `<div>${markerArrInfo.value[i].nodeName}</div>`, // 设置文本标注内容
           direction: 'right', // 设置文本标注方位
         })
         map.value.add([marker])
-        // 标记点文本
-        // 自动适应显示想显示的范围区域
-        // map.value.setFitView()
       }
-      // 折现(
-      // 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)
+      // 光伏标记点及光伏绘制
+      for (let i = 0; i < markerArr1.value.length; i++) {
+        const icon = new AMap.Icon({
+          size: new AMap.Size(36, 36), // 图标尺寸
+          image: 'http://111.198.10.15:11404/imgs/2.png', // Icon的图像
+          imageSize: new AMap.Size(24, 30), // 根据所设置的大小拉伸或压缩图片
+          imageOffset: new AMap.Pixel(0, 0), // 图像相对展示区域的偏移量，适于雪碧图等
+        })
+        // const content = '<div>111</div>'
+        const marker = new AMap.Marker({
+          position: markerArr1.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+          map: map.value,
+          title: '测试坐标',
+          icon,
+          offset: new AMap.Pixel(-20, -20),
+        })
+        // 信息窗体
+        infoWindow2.value = new AMap.InfoWindow({
+          isCustom: true, // 自定义信息窗体
+          content: windowInfoRef2.value.$el, // 窗体内容(vue组件)
+          offset: new AMap.Pixel(9, -5), // 偏移
+        })
+        marker.on('click', (e) => {
+          // 打开信息窗口
+          infoWindow2.value.open(map.value, e.lnglat)
+          // infoWindow2.value.setContent(e.target)
+          // 初始化信息窗口
+          windowInfoRef2.value.initialize({
+            overlay: e.target,
+            infoWindow: infoWindow2.value,
+            info: markerArrInfo1.value[i],
+          })
+        })
+        marker.setLabel({
+          offset: new AMap.Pixel(-10, -2), // 设置文本标注偏移量
+          content: `<div>${markerArrInfo1.value[i].stationName}</div>`, // 设置文本标注内容
+          direction: 'right', // 设置文本标注方位
+        })
+        map.value.add([marker])
+        // 绘制电网和节点连线
+        const path = markerArrInfo1.value.map((item) => {
+          return [[Number(item.lng), Number(item.lat)], [Number(item.nodeLng), Number(item.nodeLat)]]
+        })
+        const polyline = new AMap.Polyline({
+          path,
+          strokeColor: '#03A382',
+          strokeStyle: 'dashed',
+          strokeDasharray: [10, 3],
+          lineJoin: 'round',
+          lineCap: 'round',
+          zIndex: 50,
+          zooms: [16, 20],
+        })
+        polyline.setMap(map.value)
+        map.value.add(polyline)
+      }
+      // 电网支路折线绘制
+      for (let i = 0; i < lineArr.value.length; i++) {
+        // console.log(lineArr.value[i])
+        const path = lineArr.value.map(item => item.branchNodeInfos)
+        const line = path.map(item => (
+          item.map((child) => {
+            return ([[child.flng, child.flat], [child.tlng, child.tlat], child.status2])
+          })
+        ))
+        line.forEach((item) => {
+          item.forEach((child) => {
+            const path = [child[0], child[1]]
+            const polyline = new AMap.Polyline({
+              path,
+              // isOutline: true,
+              strokeColor: child[2] === 1 ? '#008d68' : '#000',
+              // strokeOpacity: 1,
+              strokeWeight: 3,
+              // 折线样式还支持 'dashed'
+              strokeStyle: child[2] !== 1 ? 'dashed' : 'dashed ',
+              // strokeStyle是dashed时有效
+              strokeDasharray: [10, 3],
+              lineJoin: 'round',
+              showDir: child[2] === 1,
+              // lineCap: 'square',
+              lineCap: 'round',
+              zIndex: 50,
+              zooms: [16, 20],
+
+            })
+            polyline.setMap(map.value)
+            map.value.add(polyline)
+          })
+        })
+        // 添加支路折线文本
+        // 创建纯文本标记
+        const textArr = path.map(item => (
+          item.map((child) => {
+            return ([[(Number(child.flng) + Number(child.tlng)) / 2, (Number(child.flat) + Number(child.tlat)) / 2], child.flowRate])
+          })
+        ))
+        textArr.forEach((item) => {
+          // console.log(item, 'item')
+          item.forEach((child) => {
+            const icon = new AMap.Icon({
+              size: new AMap.Size(36, 36), // 图标尺寸
+              // image: '', // Icon的图像
+              imageSize: new AMap.Size(24, 30), // 根据所设置的大小拉伸或压缩图片
+              imageOffset: new AMap.Pixel(0, 0), // 图像相对展示区域的偏移量，适于雪碧图等
+            })
+            // const content = '<div>111</div>'
+            const marker = new AMap.Marker({
+              position: child[0], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+              map: map.value,
+              content: '<span></span>',
+              offset: new AMap.Pixel(-20, -20),
+            })
+            marker.setLabel({
+              offset: new AMap.Pixel(-10, -2), // 设置文本标注偏移量
+              content: `<div>${`${child[1]}kgCO2/h`}</div>`, // 设置文本标注内容
+              direction: 'right', // 设置文本标注方位
+            })
+            map.value.add([marker])
+          })
+        })
+      }
     })
     .catch((e) => {
       console.log(e)
     })
 }
-onMounted(() => {
-  getElectricityListAll().then((res) => {
+onMounted(async () => {
+  // 获取电网列表
+  try {
+    const list = await getElectricityListAll()
     // 电网列表
-    electricityList.value = res.data
-    // 默认选中第一个查询节点
+    electricityList.value = list.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()
-      })
+      const res = await electricityNode(electricityList.value[0].id)
+      markerArr.value = res.data.map(item => ([Number(item.lng), Number(item.lat)]))
+      markerArrInfo.value = res.data
+      // 获取支路信息(折线)
+      const res1 = await electricityBranch(electricityList.value[0].id)
+      lineArr.value = res1.data
     }
-  })
+    // 获取光伏列表
+    const list1 = await getMonitorStationList()
+    markerArr1.value = list1.data.map(item => ([Number(item.lng), Number(item.lat)]))
+    markerArrInfo1.value = list1.data
+    // 初始化地图
+    initMap()
+  }
+  catch (error) {
+    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
+  //       // 获取支路
+  //       electricityBranch(electricityList.value[0].id).then(res => {
+  //         lineArr.value = res.data
+  //         // console.log(res.data)
+  //         initMap()
+  //       })
+  //     })
+  //   }
+  // })
 })
 </script>
 
 <template>
   <div id="map" />
+  <info-detail ref="windowInfoRef" />
+  <info-detail2 ref="windowInfoRef2" />
 </template>
 
 <style scoped>
diff --git a/src/components/map/infoWindow.vue b/src/components/map/infoWindow.vue
new file mode 100644
index 0000000..1df9061
--- /dev/null
+++ b/src/components/map/infoWindow.vue
@@ -0,0 +1,83 @@
+<!--
+  Description: 高德地图信息窗体 - 支路节点
+  Author: 李亚光
+  Date: 2023-05-10
+ -->
+<script lang="ts" setup name="infoWindow">
+const overlay = ref()
+const infoWindow = ref()
+const info = ref()
+// 初始化
+const initialize = (e) => {
+  overlay.value = e.overlay
+  infoWindow.value = e.infoWindow
+  info.value = e.info
+}
+defineExpose({ initialize })
+// 关闭
+const close = () => {
+  infoWindow.value.close()
+}
+</script>
+
+<template>
+  <div class="container">
+    <div class="title">
+      <div class="text">
+        {{ info?.nodeName }}
+      </div>
+      <div class="close" @click="close">
+        x
+      </div>
+    </div>
+    <div class="item">
+      节点编号 : {{ info?.busId }}
+    </div>
+    <div class="item">
+      <span>负荷有功功率 : {{ info?.pd }}</span>  <span>负荷无功功率 : {{ info?.qd }}</span>
+    </div>
+    <div class="item">
+      <span>节点碳势 : {{ info?.en }}</span>  <span>节点负荷碳流率 : {{ info?.flowRate }}</span>
+    </div>
+    <!-- // <div class="item">设备信息 : {{ device.produceCode }}</div>
+    // <div class="item">设备ID : {{ device.deviceId }}</div>
+    // <div class="item">IP地址 : {{ device.deviceIp }}</div>
+    // <div class="item">地址 : {{ device.deviceAddress }}</div> -->
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  width: 340px;
+  height: 140px;
+  padding: 10px;
+  background-color: #fff;
+  border: 1px solid #6d9ece;
+
+  .title {
+    font-size: 16px;
+    font-weight: 700;
+    padding: 0 10px;
+    display: flex;
+    justify-content: space-between;
+
+    .close {
+      color: #ccc;
+
+      &:hover {
+        cursor: pointer;
+      }
+    }
+  }
+
+  .item {
+    padding: 0 5px;
+    color: #111213;
+    font-size: 14px;
+    margin: 10px;
+    border-bottom: 1px solid #ccc;
+    display: flex;
+    justify-content: space-between;
+  }
+}
+</style>
diff --git a/src/components/map/infoWindow2.vue b/src/components/map/infoWindow2.vue
new file mode 100644
index 0000000..407e288
--- /dev/null
+++ b/src/components/map/infoWindow2.vue
@@ -0,0 +1,80 @@
+<!--
+  Description: 高德地图信息窗体 - 光伏节点
+  Author: 李亚光
+  Date: 2023-05-10
+ -->
+<script lang="ts" setup name="infoWindow">
+const overlay = ref()
+const infoWindow = ref()
+const info = ref()
+// 初始化
+const initialize = (e) => {
+  overlay.value = e.overlay
+  infoWindow.value = e.infoWindow
+  info.value = e.info
+  console.log(e, '123')
+}
+defineExpose({ initialize })
+// 关闭
+const close = () => {
+  infoWindow.value.close()
+}
+</script>
+
+<template>
+  <div class="container">
+    <div class="title">
+      <div class="text">
+        {{ info?.stationName }}
+      </div>
+      <div class="close" @click="close">
+        x
+      </div>
+    </div>
+    <div class="item">
+      光伏挂载节点 : {{ info?.nodeId }}
+    </div>
+    <div class="item">
+      <span>发电机组有功 : {{ info?.pg }}</span>  <span>发电机组无功 : {{ info?.qg }}</span>
+    </div>
+    <div class="item">
+      碳排强度 : {{ info?.strength }}
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  width: 340px;
+  height: 140px;
+  padding: 10px;
+  background-color: #fff;
+  border: 1px solid #6d9ece;
+
+  .title {
+    font-size: 16px;
+    font-weight: 700;
+    padding: 0 10px;
+    display: flex;
+    justify-content: space-between;
+
+    .close {
+      color: #ccc;
+
+      &:hover {
+        cursor: pointer;
+      }
+    }
+  }
+
+  .item {
+    padding: 0 5px;
+    color: #111213;
+    font-size: 14px;
+    margin: 10px;
+    border-bottom: 1px solid #ccc;
+    display: flex;
+    justify-content: space-between;
+  }
+}
+</style>

diff --git a/src/api/api/index.ts b/src/api/api/index.ts
index 4a6cf27..0af6bf9 100644
--- a/src/api/api/index.ts
+++ b/src/api/api/index.ts
@@ -110,13 +110,43 @@
     method: 'post',
   })
 }
-// 配电网节点查询
+// 配电网节点查询 / 母线参数
 export function electricityNode(id: any) {
   return request({
     url: `/electricityNode/list?electricityId=${id}`,
     method: 'get',
   })
 }
+// 母线参数新增
+export function electricityNodeAdd(data: object) {
+  return request({
+    url: '/electricityNode/add',
+    method: 'post',
+    data,
+  })
+}
+// 母线参数修改
+export function electricityNodeUpdate(data: object) {
+  return request({
+    url: '/electricityNode/update',
+    method: 'post',
+    data,
+  })
+}
+// 母线参数删除
+export function electricityNodeDelete(id: string) {
+  return request({
+    url: `/electricityNode/delete?id=${id}`,
+    method: 'post',
+  })
+}
+// 配电网支路查询
+export function electricityBranch(id: any) {
+  return request({
+    url: `/branchNodeInfo/branchList?electricityId=${id}`,
+    method: 'get',
+  })
+}
 // 光伏/楼宇/电动车管理列表
 export function getMonitorStation(params: any) {
   return request({
@@ -125,6 +155,13 @@
     params,
   })
 }
+// 光伏列表 - 不分页
+export function getMonitorStationList() {
+  return request({
+    url: '/monitorStation/list',
+    method: 'get',
+  })
+}
 // 添加 光伏/楼宇/电动车管
 export function addMonitorStation(data: any) {
   return request({
diff --git a/src/components.d.ts b/src/components.d.ts
index 1bd3d1b..5c3eb2a 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -40,6 +40,8 @@
     ImagePreview: typeof import('./components/ImagePreview/index.vue')['default']
     ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default']
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
+    InfoWindow: typeof import('./components/map/infoWindow.vue')['default']
+    InfoWindow2: typeof import('./components/map/infoWindow2.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     Map: typeof import('./components/map/index.vue')['default']
     MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index a5c8ec3..00994da 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -5,7 +5,9 @@
  -->
 <script lang="ts" setup name="GuadMap">
 import AMapLoader from '@amap/amap-jsapi-loader'
-import { electricityNode, getElectricityListAll } from '@/api/api/index'
+import infoDetail from './infoWindow.vue'
+import infoDetail2 from './infoWindow2.vue'
+import { electricityBranch, electricityNode, getElectricityListAll, getMonitorStationList } from '@/api/api/index'
 // 设置安全密钥
 window._AMapSecurityConfig = {
   securityJsCode: '56bf9671d4b3517d294caec4751889a1', // 后期需替换
@@ -24,10 +26,19 @@
   [111.739906, 40.83686],
   [111.739906, 40.83386],
 ])
-// 区域点数组
+// 电网节点数组
 const markerArr = ref([
 ])
+// 光伏数组
+const markerArr1 = ref([
+])
+// 信息窗体
+const infoWindow = ref()
+const infoWindow2 = ref()
+const windowInfoRef = ref()
+const windowInfoRef2 = ref()
 const markerArrInfo = ref()
+const markerArrInfo1 = ref()
 // 折现节点坐标
 const lineArr = ref([])
 // 初始化地图
@@ -35,14 +46,15 @@
   AMapLoader.load({
     key: '40849e82b4e33f5255b17372520c954d', // 后期需替换
     version: '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
-    plugins: ['AMap.Scale', 'AMap.MouseTool'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
+    plugins: ['AMap.Scale', 'AMap.MouseTool', 'AMap.ToolBar'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
   })
     .then((AMap) => {
       // 初始化地图
       map.value = new AMap.Map('map', {
-        viewMode: '2D', //  是否为3D地图模式
+        viewMode: '3D', //  是否为3D地图模式
         zoom: 17, // 初始化地图级别
-        center: markerArr.value[0],
+        // center: markerArr.value[0],
+        center: [116.26755900, 39.91547100],
         resizeEnable: true,
       })
       // 用来画区域的
@@ -78,7 +90,7 @@
       //   }
       //   console.log(arr)// 121.540994,29.870174;121.55138,29.858116;121.55756,29.874193;
       // })
-      // 标记点绘制
+      // 电网支路标记点绘制
       for (let i = 0; i < markerArr.value.length; i++) {
         const icon = new AMap.Icon({
           size: new AMap.Size(36, 36), // 图标尺寸
@@ -87,58 +99,213 @@
           imageSize: new AMap.Size(24, 30), // 根据所设置的大小拉伸或压缩图片
           imageOffset: new AMap.Pixel(0, 0), // 图像相对展示区域的偏移量，适于雪碧图等
         })
-        // const content = '<div>111</div>'
         const marker = new AMap.Marker({
           position: markerArr.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
           map: map.value,
           title: '测试坐标',
           icon,
-          offset: new AMap.Pixel(-20, -20),
+          offset: new AMap.Pixel(3, -30),
+        })
+        // 支路点详细信息// 信息窗体
+        infoWindow.value = new AMap.InfoWindow({
+          isCustom: true, // 自定义信息窗体
+          content: windowInfoRef.value.$el, // 窗体内容(vue组件)
+          offset: new AMap.Pixel(9, -5), // 偏移
+        })
+        marker.on('click', (e) => {
+          // 打开信息窗口
+          // infoWindow.value.setContent(e.target.content)
+          infoWindow.value.open(map.value, e.lnglat)
+          // 初始化信息窗口
+          windowInfoRef.value.initialize({
+            overlay: e.target,
+            infoWindow: infoWindow.value,
+            info: markerArrInfo.value[i],
+          })
         })
         marker.setLabel({
           offset: new AMap.Pixel(-10, -2), // 设置文本标注偏移量
-          content: `<div>${markerArrInfo.value[i].busId}</div>`, // 设置文本标注内容
+          content: `<div>${markerArrInfo.value[i].nodeName}</div>`, // 设置文本标注内容
           direction: 'right', // 设置文本标注方位
         })
         map.value.add([marker])
-        // 标记点文本
-        // 自动适应显示想显示的范围区域
-        // map.value.setFitView()
       }
-      // 折现(
-      // 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)
+      // 光伏标记点及光伏绘制
+      for (let i = 0; i < markerArr1.value.length; i++) {
+        const icon = new AMap.Icon({
+          size: new AMap.Size(36, 36), // 图标尺寸
+          image: 'http://111.198.10.15:11404/imgs/2.png', // Icon的图像
+          imageSize: new AMap.Size(24, 30), // 根据所设置的大小拉伸或压缩图片
+          imageOffset: new AMap.Pixel(0, 0), // 图像相对展示区域的偏移量，适于雪碧图等
+        })
+        // const content = '<div>111</div>'
+        const marker = new AMap.Marker({
+          position: markerArr1.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+          map: map.value,
+          title: '测试坐标',
+          icon,
+          offset: new AMap.Pixel(-20, -20),
+        })
+        // 信息窗体
+        infoWindow2.value = new AMap.InfoWindow({
+          isCustom: true, // 自定义信息窗体
+          content: windowInfoRef2.value.$el, // 窗体内容(vue组件)
+          offset: new AMap.Pixel(9, -5), // 偏移
+        })
+        marker.on('click', (e) => {
+          // 打开信息窗口
+          infoWindow2.value.open(map.value, e.lnglat)
+          // infoWindow2.value.setContent(e.target)
+          // 初始化信息窗口
+          windowInfoRef2.value.initialize({
+            overlay: e.target,
+            infoWindow: infoWindow2.value,
+            info: markerArrInfo1.value[i],
+          })
+        })
+        marker.setLabel({
+          offset: new AMap.Pixel(-10, -2), // 设置文本标注偏移量
+          content: `<div>${markerArrInfo1.value[i].stationName}</div>`, // 设置文本标注内容
+          direction: 'right', // 设置文本标注方位
+        })
+        map.value.add([marker])
+        // 绘制电网和节点连线
+        const path = markerArrInfo1.value.map((item) => {
+          return [[Number(item.lng), Number(item.lat)], [Number(item.nodeLng), Number(item.nodeLat)]]
+        })
+        const polyline = new AMap.Polyline({
+          path,
+          strokeColor: '#03A382',
+          strokeStyle: 'dashed',
+          strokeDasharray: [10, 3],
+          lineJoin: 'round',
+          lineCap: 'round',
+          zIndex: 50,
+          zooms: [16, 20],
+        })
+        polyline.setMap(map.value)
+        map.value.add(polyline)
+      }
+      // 电网支路折线绘制
+      for (let i = 0; i < lineArr.value.length; i++) {
+        // console.log(lineArr.value[i])
+        const path = lineArr.value.map(item => item.branchNodeInfos)
+        const line = path.map(item => (
+          item.map((child) => {
+            return ([[child.flng, child.flat], [child.tlng, child.tlat], child.status2])
+          })
+        ))
+        line.forEach((item) => {
+          item.forEach((child) => {
+            const path = [child[0], child[1]]
+            const polyline = new AMap.Polyline({
+              path,
+              // isOutline: true,
+              strokeColor: child[2] === 1 ? '#008d68' : '#000',
+              // strokeOpacity: 1,
+              strokeWeight: 3,
+              // 折线样式还支持 'dashed'
+              strokeStyle: child[2] !== 1 ? 'dashed' : 'dashed ',
+              // strokeStyle是dashed时有效
+              strokeDasharray: [10, 3],
+              lineJoin: 'round',
+              showDir: child[2] === 1,
+              // lineCap: 'square',
+              lineCap: 'round',
+              zIndex: 50,
+              zooms: [16, 20],
+
+            })
+            polyline.setMap(map.value)
+            map.value.add(polyline)
+          })
+        })
+        // 添加支路折线文本
+        // 创建纯文本标记
+        const textArr = path.map(item => (
+          item.map((child) => {
+            return ([[(Number(child.flng) + Number(child.tlng)) / 2, (Number(child.flat) + Number(child.tlat)) / 2], child.flowRate])
+          })
+        ))
+        textArr.forEach((item) => {
+          // console.log(item, 'item')
+          item.forEach((child) => {
+            const icon = new AMap.Icon({
+              size: new AMap.Size(36, 36), // 图标尺寸
+              // image: '', // Icon的图像
+              imageSize: new AMap.Size(24, 30), // 根据所设置的大小拉伸或压缩图片
+              imageOffset: new AMap.Pixel(0, 0), // 图像相对展示区域的偏移量，适于雪碧图等
+            })
+            // const content = '<div>111</div>'
+            const marker = new AMap.Marker({
+              position: child[0], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+              map: map.value,
+              content: '<span></span>',
+              offset: new AMap.Pixel(-20, -20),
+            })
+            marker.setLabel({
+              offset: new AMap.Pixel(-10, -2), // 设置文本标注偏移量
+              content: `<div>${`${child[1]}kgCO2/h`}</div>`, // 设置文本标注内容
+              direction: 'right', // 设置文本标注方位
+            })
+            map.value.add([marker])
+          })
+        })
+      }
     })
     .catch((e) => {
       console.log(e)
     })
 }
-onMounted(() => {
-  getElectricityListAll().then((res) => {
+onMounted(async () => {
+  // 获取电网列表
+  try {
+    const list = await getElectricityListAll()
     // 电网列表
-    electricityList.value = res.data
-    // 默认选中第一个查询节点
+    electricityList.value = list.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()
-      })
+      const res = await electricityNode(electricityList.value[0].id)
+      markerArr.value = res.data.map(item => ([Number(item.lng), Number(item.lat)]))
+      markerArrInfo.value = res.data
+      // 获取支路信息(折线)
+      const res1 = await electricityBranch(electricityList.value[0].id)
+      lineArr.value = res1.data
     }
-  })
+    // 获取光伏列表
+    const list1 = await getMonitorStationList()
+    markerArr1.value = list1.data.map(item => ([Number(item.lng), Number(item.lat)]))
+    markerArrInfo1.value = list1.data
+    // 初始化地图
+    initMap()
+  }
+  catch (error) {
+    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
+  //       // 获取支路
+  //       electricityBranch(electricityList.value[0].id).then(res => {
+  //         lineArr.value = res.data
+  //         // console.log(res.data)
+  //         initMap()
+  //       })
+  //     })
+  //   }
+  // })
 })
 </script>
 
 <template>
   <div id="map" />
+  <info-detail ref="windowInfoRef" />
+  <info-detail2 ref="windowInfoRef2" />
 </template>
 
 <style scoped>
diff --git a/src/components/map/infoWindow.vue b/src/components/map/infoWindow.vue
new file mode 100644
index 0000000..1df9061
--- /dev/null
+++ b/src/components/map/infoWindow.vue
@@ -0,0 +1,83 @@
+<!--
+  Description: 高德地图信息窗体 - 支路节点
+  Author: 李亚光
+  Date: 2023-05-10
+ -->
+<script lang="ts" setup name="infoWindow">
+const overlay = ref()
+const infoWindow = ref()
+const info = ref()
+// 初始化
+const initialize = (e) => {
+  overlay.value = e.overlay
+  infoWindow.value = e.infoWindow
+  info.value = e.info
+}
+defineExpose({ initialize })
+// 关闭
+const close = () => {
+  infoWindow.value.close()
+}
+</script>
+
+<template>
+  <div class="container">
+    <div class="title">
+      <div class="text">
+        {{ info?.nodeName }}
+      </div>
+      <div class="close" @click="close">
+        x
+      </div>
+    </div>
+    <div class="item">
+      节点编号 : {{ info?.busId }}
+    </div>
+    <div class="item">
+      <span>负荷有功功率 : {{ info?.pd }}</span>  <span>负荷无功功率 : {{ info?.qd }}</span>
+    </div>
+    <div class="item">
+      <span>节点碳势 : {{ info?.en }}</span>  <span>节点负荷碳流率 : {{ info?.flowRate }}</span>
+    </div>
+    <!-- // <div class="item">设备信息 : {{ device.produceCode }}</div>
+    // <div class="item">设备ID : {{ device.deviceId }}</div>
+    // <div class="item">IP地址 : {{ device.deviceIp }}</div>
+    // <div class="item">地址 : {{ device.deviceAddress }}</div> -->
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  width: 340px;
+  height: 140px;
+  padding: 10px;
+  background-color: #fff;
+  border: 1px solid #6d9ece;
+
+  .title {
+    font-size: 16px;
+    font-weight: 700;
+    padding: 0 10px;
+    display: flex;
+    justify-content: space-between;
+
+    .close {
+      color: #ccc;
+
+      &:hover {
+        cursor: pointer;
+      }
+    }
+  }
+
+  .item {
+    padding: 0 5px;
+    color: #111213;
+    font-size: 14px;
+    margin: 10px;
+    border-bottom: 1px solid #ccc;
+    display: flex;
+    justify-content: space-between;
+  }
+}
+</style>
diff --git a/src/components/map/infoWindow2.vue b/src/components/map/infoWindow2.vue
new file mode 100644
index 0000000..407e288
--- /dev/null
+++ b/src/components/map/infoWindow2.vue
@@ -0,0 +1,80 @@
+<!--
+  Description: 高德地图信息窗体 - 光伏节点
+  Author: 李亚光
+  Date: 2023-05-10
+ -->
+<script lang="ts" setup name="infoWindow">
+const overlay = ref()
+const infoWindow = ref()
+const info = ref()
+// 初始化
+const initialize = (e) => {
+  overlay.value = e.overlay
+  infoWindow.value = e.infoWindow
+  info.value = e.info
+  console.log(e, '123')
+}
+defineExpose({ initialize })
+// 关闭
+const close = () => {
+  infoWindow.value.close()
+}
+</script>
+
+<template>
+  <div class="container">
+    <div class="title">
+      <div class="text">
+        {{ info?.stationName }}
+      </div>
+      <div class="close" @click="close">
+        x
+      </div>
+    </div>
+    <div class="item">
+      光伏挂载节点 : {{ info?.nodeId }}
+    </div>
+    <div class="item">
+      <span>发电机组有功 : {{ info?.pg }}</span>  <span>发电机组无功 : {{ info?.qg }}</span>
+    </div>
+    <div class="item">
+      碳排强度 : {{ info?.strength }}
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  width: 340px;
+  height: 140px;
+  padding: 10px;
+  background-color: #fff;
+  border: 1px solid #6d9ece;
+
+  .title {
+    font-size: 16px;
+    font-weight: 700;
+    padding: 0 10px;
+    display: flex;
+    justify-content: space-between;
+
+    .close {
+      color: #ccc;
+
+      &:hover {
+        cursor: pointer;
+      }
+    }
+  }
+
+  .item {
+    padding: 0 5px;
+    color: #111213;
+    font-size: 14px;
+    margin: 10px;
+    border-bottom: 1px solid #ccc;
+    display: flex;
+    justify-content: space-between;
+  }
+}
+</style>
diff --git a/src/static/1.png b/src/static/1.png
new file mode 100644
index 0000000..9dca264
--- /dev/null
+++ b/src/static/1.png
Binary files differ

diff --git a/src/api/api/index.ts b/src/api/api/index.ts
index 4a6cf27..0af6bf9 100644
--- a/src/api/api/index.ts
+++ b/src/api/api/index.ts
@@ -110,13 +110,43 @@
     method: 'post',
   })
 }
-// 配电网节点查询
+// 配电网节点查询 / 母线参数
 export function electricityNode(id: any) {
   return request({
     url: `/electricityNode/list?electricityId=${id}`,
     method: 'get',
   })
 }
+// 母线参数新增
+export function electricityNodeAdd(data: object) {
+  return request({
+    url: '/electricityNode/add',
+    method: 'post',
+    data,
+  })
+}
+// 母线参数修改
+export function electricityNodeUpdate(data: object) {
+  return request({
+    url: '/electricityNode/update',
+    method: 'post',
+    data,
+  })
+}
+// 母线参数删除
+export function electricityNodeDelete(id: string) {
+  return request({
+    url: `/electricityNode/delete?id=${id}`,
+    method: 'post',
+  })
+}
+// 配电网支路查询
+export function electricityBranch(id: any) {
+  return request({
+    url: `/branchNodeInfo/branchList?electricityId=${id}`,
+    method: 'get',
+  })
+}
 // 光伏/楼宇/电动车管理列表
 export function getMonitorStation(params: any) {
   return request({
@@ -125,6 +155,13 @@
     params,
   })
 }
+// 光伏列表 - 不分页
+export function getMonitorStationList() {
+  return request({
+    url: '/monitorStation/list',
+    method: 'get',
+  })
+}
 // 添加 光伏/楼宇/电动车管
 export function addMonitorStation(data: any) {
   return request({
diff --git a/src/components.d.ts b/src/components.d.ts
index 1bd3d1b..5c3eb2a 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -40,6 +40,8 @@
     ImagePreview: typeof import('./components/ImagePreview/index.vue')['default']
     ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default']
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
+    InfoWindow: typeof import('./components/map/infoWindow.vue')['default']
+    InfoWindow2: typeof import('./components/map/infoWindow2.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     Map: typeof import('./components/map/index.vue')['default']
     MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index a5c8ec3..00994da 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -5,7 +5,9 @@
  -->
 <script lang="ts" setup name="GuadMap">
 import AMapLoader from '@amap/amap-jsapi-loader'
-import { electricityNode, getElectricityListAll } from '@/api/api/index'
+import infoDetail from './infoWindow.vue'
+import infoDetail2 from './infoWindow2.vue'
+import { electricityBranch, electricityNode, getElectricityListAll, getMonitorStationList } from '@/api/api/index'
 // 设置安全密钥
 window._AMapSecurityConfig = {
   securityJsCode: '56bf9671d4b3517d294caec4751889a1', // 后期需替换
@@ -24,10 +26,19 @@
   [111.739906, 40.83686],
   [111.739906, 40.83386],
 ])
-// 区域点数组
+// 电网节点数组
 const markerArr = ref([
 ])
+// 光伏数组
+const markerArr1 = ref([
+])
+// 信息窗体
+const infoWindow = ref()
+const infoWindow2 = ref()
+const windowInfoRef = ref()
+const windowInfoRef2 = ref()
 const markerArrInfo = ref()
+const markerArrInfo1 = ref()
 // 折现节点坐标
 const lineArr = ref([])
 // 初始化地图
@@ -35,14 +46,15 @@
   AMapLoader.load({
     key: '40849e82b4e33f5255b17372520c954d', // 后期需替换
     version: '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
-    plugins: ['AMap.Scale', 'AMap.MouseTool'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
+    plugins: ['AMap.Scale', 'AMap.MouseTool', 'AMap.ToolBar'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
   })
     .then((AMap) => {
       // 初始化地图
       map.value = new AMap.Map('map', {
-        viewMode: '2D', //  是否为3D地图模式
+        viewMode: '3D', //  是否为3D地图模式
         zoom: 17, // 初始化地图级别
-        center: markerArr.value[0],
+        // center: markerArr.value[0],
+        center: [116.26755900, 39.91547100],
         resizeEnable: true,
       })
       // 用来画区域的
@@ -78,7 +90,7 @@
       //   }
       //   console.log(arr)// 121.540994,29.870174;121.55138,29.858116;121.55756,29.874193;
       // })
-      // 标记点绘制
+      // 电网支路标记点绘制
       for (let i = 0; i < markerArr.value.length; i++) {
         const icon = new AMap.Icon({
           size: new AMap.Size(36, 36), // 图标尺寸
@@ -87,58 +99,213 @@
           imageSize: new AMap.Size(24, 30), // 根据所设置的大小拉伸或压缩图片
           imageOffset: new AMap.Pixel(0, 0), // 图像相对展示区域的偏移量，适于雪碧图等
         })
-        // const content = '<div>111</div>'
         const marker = new AMap.Marker({
           position: markerArr.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
           map: map.value,
           title: '测试坐标',
           icon,
-          offset: new AMap.Pixel(-20, -20),
+          offset: new AMap.Pixel(3, -30),
+        })
+        // 支路点详细信息// 信息窗体
+        infoWindow.value = new AMap.InfoWindow({
+          isCustom: true, // 自定义信息窗体
+          content: windowInfoRef.value.$el, // 窗体内容(vue组件)
+          offset: new AMap.Pixel(9, -5), // 偏移
+        })
+        marker.on('click', (e) => {
+          // 打开信息窗口
+          // infoWindow.value.setContent(e.target.content)
+          infoWindow.value.open(map.value, e.lnglat)
+          // 初始化信息窗口
+          windowInfoRef.value.initialize({
+            overlay: e.target,
+            infoWindow: infoWindow.value,
+            info: markerArrInfo.value[i],
+          })
         })
         marker.setLabel({
           offset: new AMap.Pixel(-10, -2), // 设置文本标注偏移量
-          content: `<div>${markerArrInfo.value[i].busId}</div>`, // 设置文本标注内容
+          content: `<div>${markerArrInfo.value[i].nodeName}</div>`, // 设置文本标注内容
           direction: 'right', // 设置文本标注方位
         })
         map.value.add([marker])
-        // 标记点文本
-        // 自动适应显示想显示的范围区域
-        // map.value.setFitView()
       }
-      // 折现(
-      // 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)
+      // 光伏标记点及光伏绘制
+      for (let i = 0; i < markerArr1.value.length; i++) {
+        const icon = new AMap.Icon({
+          size: new AMap.Size(36, 36), // 图标尺寸
+          image: 'http://111.198.10.15:11404/imgs/2.png', // Icon的图像
+          imageSize: new AMap.Size(24, 30), // 根据所设置的大小拉伸或压缩图片
+          imageOffset: new AMap.Pixel(0, 0), // 图像相对展示区域的偏移量，适于雪碧图等
+        })
+        // const content = '<div>111</div>'
+        const marker = new AMap.Marker({
+          position: markerArr1.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+          map: map.value,
+          title: '测试坐标',
+          icon,
+          offset: new AMap.Pixel(-20, -20),
+        })
+        // 信息窗体
+        infoWindow2.value = new AMap.InfoWindow({
+          isCustom: true, // 自定义信息窗体
+          content: windowInfoRef2.value.$el, // 窗体内容(vue组件)
+          offset: new AMap.Pixel(9, -5), // 偏移
+        })
+        marker.on('click', (e) => {
+          // 打开信息窗口
+          infoWindow2.value.open(map.value, e.lnglat)
+          // infoWindow2.value.setContent(e.target)
+          // 初始化信息窗口
+          windowInfoRef2.value.initialize({
+            overlay: e.target,
+            infoWindow: infoWindow2.value,
+            info: markerArrInfo1.value[i],
+          })
+        })
+        marker.setLabel({
+          offset: new AMap.Pixel(-10, -2), // 设置文本标注偏移量
+          content: `<div>${markerArrInfo1.value[i].stationName}</div>`, // 设置文本标注内容
+          direction: 'right', // 设置文本标注方位
+        })
+        map.value.add([marker])
+        // 绘制电网和节点连线
+        const path = markerArrInfo1.value.map((item) => {
+          return [[Number(item.lng), Number(item.lat)], [Number(item.nodeLng), Number(item.nodeLat)]]
+        })
+        const polyline = new AMap.Polyline({
+          path,
+          strokeColor: '#03A382',
+          strokeStyle: 'dashed',
+          strokeDasharray: [10, 3],
+          lineJoin: 'round',
+          lineCap: 'round',
+          zIndex: 50,
+          zooms: [16, 20],
+        })
+        polyline.setMap(map.value)
+        map.value.add(polyline)
+      }
+      // 电网支路折线绘制
+      for (let i = 0; i < lineArr.value.length; i++) {
+        // console.log(lineArr.value[i])
+        const path = lineArr.value.map(item => item.branchNodeInfos)
+        const line = path.map(item => (
+          item.map((child) => {
+            return ([[child.flng, child.flat], [child.tlng, child.tlat], child.status2])
+          })
+        ))
+        line.forEach((item) => {
+          item.forEach((child) => {
+            const path = [child[0], child[1]]
+            const polyline = new AMap.Polyline({
+              path,
+              // isOutline: true,
+              strokeColor: child[2] === 1 ? '#008d68' : '#000',
+              // strokeOpacity: 1,
+              strokeWeight: 3,
+              // 折线样式还支持 'dashed'
+              strokeStyle: child[2] !== 1 ? 'dashed' : 'dashed ',
+              // strokeStyle是dashed时有效
+              strokeDasharray: [10, 3],
+              lineJoin: 'round',
+              showDir: child[2] === 1,
+              // lineCap: 'square',
+              lineCap: 'round',
+              zIndex: 50,
+              zooms: [16, 20],
+
+            })
+            polyline.setMap(map.value)
+            map.value.add(polyline)
+          })
+        })
+        // 添加支路折线文本
+        // 创建纯文本标记
+        const textArr = path.map(item => (
+          item.map((child) => {
+            return ([[(Number(child.flng) + Number(child.tlng)) / 2, (Number(child.flat) + Number(child.tlat)) / 2], child.flowRate])
+          })
+        ))
+        textArr.forEach((item) => {
+          // console.log(item, 'item')
+          item.forEach((child) => {
+            const icon = new AMap.Icon({
+              size: new AMap.Size(36, 36), // 图标尺寸
+              // image: '', // Icon的图像
+              imageSize: new AMap.Size(24, 30), // 根据所设置的大小拉伸或压缩图片
+              imageOffset: new AMap.Pixel(0, 0), // 图像相对展示区域的偏移量，适于雪碧图等
+            })
+            // const content = '<div>111</div>'
+            const marker = new AMap.Marker({
+              position: child[0], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+              map: map.value,
+              content: '<span></span>',
+              offset: new AMap.Pixel(-20, -20),
+            })
+            marker.setLabel({
+              offset: new AMap.Pixel(-10, -2), // 设置文本标注偏移量
+              content: `<div>${`${child[1]}kgCO2/h`}</div>`, // 设置文本标注内容
+              direction: 'right', // 设置文本标注方位
+            })
+            map.value.add([marker])
+          })
+        })
+      }
     })
     .catch((e) => {
       console.log(e)
     })
 }
-onMounted(() => {
-  getElectricityListAll().then((res) => {
+onMounted(async () => {
+  // 获取电网列表
+  try {
+    const list = await getElectricityListAll()
     // 电网列表
-    electricityList.value = res.data
-    // 默认选中第一个查询节点
+    electricityList.value = list.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()
-      })
+      const res = await electricityNode(electricityList.value[0].id)
+      markerArr.value = res.data.map(item => ([Number(item.lng), Number(item.lat)]))
+      markerArrInfo.value = res.data
+      // 获取支路信息(折线)
+      const res1 = await electricityBranch(electricityList.value[0].id)
+      lineArr.value = res1.data
     }
-  })
+    // 获取光伏列表
+    const list1 = await getMonitorStationList()
+    markerArr1.value = list1.data.map(item => ([Number(item.lng), Number(item.lat)]))
+    markerArrInfo1.value = list1.data
+    // 初始化地图
+    initMap()
+  }
+  catch (error) {
+    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
+  //       // 获取支路
+  //       electricityBranch(electricityList.value[0].id).then(res => {
+  //         lineArr.value = res.data
+  //         // console.log(res.data)
+  //         initMap()
+  //       })
+  //     })
+  //   }
+  // })
 })
 </script>
 
 <template>
   <div id="map" />
+  <info-detail ref="windowInfoRef" />
+  <info-detail2 ref="windowInfoRef2" />
 </template>
 
 <style scoped>
diff --git a/src/components/map/infoWindow.vue b/src/components/map/infoWindow.vue
new file mode 100644
index 0000000..1df9061
--- /dev/null
+++ b/src/components/map/infoWindow.vue
@@ -0,0 +1,83 @@
+<!--
+  Description: 高德地图信息窗体 - 支路节点
+  Author: 李亚光
+  Date: 2023-05-10
+ -->
+<script lang="ts" setup name="infoWindow">
+const overlay = ref()
+const infoWindow = ref()
+const info = ref()
+// 初始化
+const initialize = (e) => {
+  overlay.value = e.overlay
+  infoWindow.value = e.infoWindow
+  info.value = e.info
+}
+defineExpose({ initialize })
+// 关闭
+const close = () => {
+  infoWindow.value.close()
+}
+</script>
+
+<template>
+  <div class="container">
+    <div class="title">
+      <div class="text">
+        {{ info?.nodeName }}
+      </div>
+      <div class="close" @click="close">
+        x
+      </div>
+    </div>
+    <div class="item">
+      节点编号 : {{ info?.busId }}
+    </div>
+    <div class="item">
+      <span>负荷有功功率 : {{ info?.pd }}</span>  <span>负荷无功功率 : {{ info?.qd }}</span>
+    </div>
+    <div class="item">
+      <span>节点碳势 : {{ info?.en }}</span>  <span>节点负荷碳流率 : {{ info?.flowRate }}</span>
+    </div>
+    <!-- // <div class="item">设备信息 : {{ device.produceCode }}</div>
+    // <div class="item">设备ID : {{ device.deviceId }}</div>
+    // <div class="item">IP地址 : {{ device.deviceIp }}</div>
+    // <div class="item">地址 : {{ device.deviceAddress }}</div> -->
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  width: 340px;
+  height: 140px;
+  padding: 10px;
+  background-color: #fff;
+  border: 1px solid #6d9ece;
+
+  .title {
+    font-size: 16px;
+    font-weight: 700;
+    padding: 0 10px;
+    display: flex;
+    justify-content: space-between;
+
+    .close {
+      color: #ccc;
+
+      &:hover {
+        cursor: pointer;
+      }
+    }
+  }
+
+  .item {
+    padding: 0 5px;
+    color: #111213;
+    font-size: 14px;
+    margin: 10px;
+    border-bottom: 1px solid #ccc;
+    display: flex;
+    justify-content: space-between;
+  }
+}
+</style>
diff --git a/src/components/map/infoWindow2.vue b/src/components/map/infoWindow2.vue
new file mode 100644
index 0000000..407e288
--- /dev/null
+++ b/src/components/map/infoWindow2.vue
@@ -0,0 +1,80 @@
+<!--
+  Description: 高德地图信息窗体 - 光伏节点
+  Author: 李亚光
+  Date: 2023-05-10
+ -->
+<script lang="ts" setup name="infoWindow">
+const overlay = ref()
+const infoWindow = ref()
+const info = ref()
+// 初始化
+const initialize = (e) => {
+  overlay.value = e.overlay
+  infoWindow.value = e.infoWindow
+  info.value = e.info
+  console.log(e, '123')
+}
+defineExpose({ initialize })
+// 关闭
+const close = () => {
+  infoWindow.value.close()
+}
+</script>
+
+<template>
+  <div class="container">
+    <div class="title">
+      <div class="text">
+        {{ info?.stationName }}
+      </div>
+      <div class="close" @click="close">
+        x
+      </div>
+    </div>
+    <div class="item">
+      光伏挂载节点 : {{ info?.nodeId }}
+    </div>
+    <div class="item">
+      <span>发电机组有功 : {{ info?.pg }}</span>  <span>发电机组无功 : {{ info?.qg }}</span>
+    </div>
+    <div class="item">
+      碳排强度 : {{ info?.strength }}
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  width: 340px;
+  height: 140px;
+  padding: 10px;
+  background-color: #fff;
+  border: 1px solid #6d9ece;
+
+  .title {
+    font-size: 16px;
+    font-weight: 700;
+    padding: 0 10px;
+    display: flex;
+    justify-content: space-between;
+
+    .close {
+      color: #ccc;
+
+      &:hover {
+        cursor: pointer;
+      }
+    }
+  }
+
+  .item {
+    padding: 0 5px;
+    color: #111213;
+    font-size: 14px;
+    margin: 10px;
+    border-bottom: 1px solid #ccc;
+    display: flex;
+    justify-content: space-between;
+  }
+}
+</style>
diff --git a/src/static/1.png b/src/static/1.png
new file mode 100644
index 0000000..9dca264
--- /dev/null
+++ b/src/static/1.png
Binary files differ
diff --git a/src/static/2.png b/src/static/2.png
new file mode 100644
index 0000000..0eb5760
--- /dev/null
+++ b/src/static/2.png
Binary files differ

diff --git a/src/api/api/index.ts b/src/api/api/index.ts
index 4a6cf27..0af6bf9 100644
--- a/src/api/api/index.ts
+++ b/src/api/api/index.ts
@@ -110,13 +110,43 @@
     method: 'post',
   })
 }
-// 配电网节点查询
+// 配电网节点查询 / 母线参数
 export function electricityNode(id: any) {
   return request({
     url: `/electricityNode/list?electricityId=${id}`,
     method: 'get',
   })
 }
+// 母线参数新增
+export function electricityNodeAdd(data: object) {
+  return request({
+    url: '/electricityNode/add',
+    method: 'post',
+    data,
+  })
+}
+// 母线参数修改
+export function electricityNodeUpdate(data: object) {
+  return request({
+    url: '/electricityNode/update',
+    method: 'post',
+    data,
+  })
+}
+// 母线参数删除
+export function electricityNodeDelete(id: string) {
+  return request({
+    url: `/electricityNode/delete?id=${id}`,
+    method: 'post',
+  })
+}
+// 配电网支路查询
+export function electricityBranch(id: any) {
+  return request({
+    url: `/branchNodeInfo/branchList?electricityId=${id}`,
+    method: 'get',
+  })
+}
 // 光伏/楼宇/电动车管理列表
 export function getMonitorStation(params: any) {
   return request({
@@ -125,6 +155,13 @@
     params,
   })
 }
+// 光伏列表 - 不分页
+export function getMonitorStationList() {
+  return request({
+    url: '/monitorStation/list',
+    method: 'get',
+  })
+}
 // 添加 光伏/楼宇/电动车管
 export function addMonitorStation(data: any) {
   return request({
diff --git a/src/components.d.ts b/src/components.d.ts
index 1bd3d1b..5c3eb2a 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -40,6 +40,8 @@
     ImagePreview: typeof import('./components/ImagePreview/index.vue')['default']
     ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default']
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
+    InfoWindow: typeof import('./components/map/infoWindow.vue')['default']
+    InfoWindow2: typeof import('./components/map/infoWindow2.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     Map: typeof import('./components/map/index.vue')['default']
     MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index a5c8ec3..00994da 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -5,7 +5,9 @@
  -->
 <script lang="ts" setup name="GuadMap">
 import AMapLoader from '@amap/amap-jsapi-loader'
-import { electricityNode, getElectricityListAll } from '@/api/api/index'
+import infoDetail from './infoWindow.vue'
+import infoDetail2 from './infoWindow2.vue'
+import { electricityBranch, electricityNode, getElectricityListAll, getMonitorStationList } from '@/api/api/index'
 // 设置安全密钥
 window._AMapSecurityConfig = {
   securityJsCode: '56bf9671d4b3517d294caec4751889a1', // 后期需替换
@@ -24,10 +26,19 @@
   [111.739906, 40.83686],
   [111.739906, 40.83386],
 ])
-// 区域点数组
+// 电网节点数组
 const markerArr = ref([
 ])
+// 光伏数组
+const markerArr1 = ref([
+])
+// 信息窗体
+const infoWindow = ref()
+const infoWindow2 = ref()
+const windowInfoRef = ref()
+const windowInfoRef2 = ref()
 const markerArrInfo = ref()
+const markerArrInfo1 = ref()
 // 折现节点坐标
 const lineArr = ref([])
 // 初始化地图
@@ -35,14 +46,15 @@
   AMapLoader.load({
     key: '40849e82b4e33f5255b17372520c954d', // 后期需替换
     version: '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
-    plugins: ['AMap.Scale', 'AMap.MouseTool'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
+    plugins: ['AMap.Scale', 'AMap.MouseTool', 'AMap.ToolBar'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
   })
     .then((AMap) => {
       // 初始化地图
       map.value = new AMap.Map('map', {
-        viewMode: '2D', //  是否为3D地图模式
+        viewMode: '3D', //  是否为3D地图模式
         zoom: 17, // 初始化地图级别
-        center: markerArr.value[0],
+        // center: markerArr.value[0],
+        center: [116.26755900, 39.91547100],
         resizeEnable: true,
       })
       // 用来画区域的
@@ -78,7 +90,7 @@
       //   }
       //   console.log(arr)// 121.540994,29.870174;121.55138,29.858116;121.55756,29.874193;
       // })
-      // 标记点绘制
+      // 电网支路标记点绘制
       for (let i = 0; i < markerArr.value.length; i++) {
         const icon = new AMap.Icon({
           size: new AMap.Size(36, 36), // 图标尺寸
@@ -87,58 +99,213 @@
           imageSize: new AMap.Size(24, 30), // 根据所设置的大小拉伸或压缩图片
           imageOffset: new AMap.Pixel(0, 0), // 图像相对展示区域的偏移量，适于雪碧图等
         })
-        // const content = '<div>111</div>'
         const marker = new AMap.Marker({
           position: markerArr.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
           map: map.value,
           title: '测试坐标',
           icon,
-          offset: new AMap.Pixel(-20, -20),
+          offset: new AMap.Pixel(3, -30),
+        })
+        // 支路点详细信息// 信息窗体
+        infoWindow.value = new AMap.InfoWindow({
+          isCustom: true, // 自定义信息窗体
+          content: windowInfoRef.value.$el, // 窗体内容(vue组件)
+          offset: new AMap.Pixel(9, -5), // 偏移
+        })
+        marker.on('click', (e) => {
+          // 打开信息窗口
+          // infoWindow.value.setContent(e.target.content)
+          infoWindow.value.open(map.value, e.lnglat)
+          // 初始化信息窗口
+          windowInfoRef.value.initialize({
+            overlay: e.target,
+            infoWindow: infoWindow.value,
+            info: markerArrInfo.value[i],
+          })
         })
         marker.setLabel({
           offset: new AMap.Pixel(-10, -2), // 设置文本标注偏移量
-          content: `<div>${markerArrInfo.value[i].busId}</div>`, // 设置文本标注内容
+          content: `<div>${markerArrInfo.value[i].nodeName}</div>`, // 设置文本标注内容
           direction: 'right', // 设置文本标注方位
         })
         map.value.add([marker])
-        // 标记点文本
-        // 自动适应显示想显示的范围区域
-        // map.value.setFitView()
       }
-      // 折现(
-      // 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)
+      // 光伏标记点及光伏绘制
+      for (let i = 0; i < markerArr1.value.length; i++) {
+        const icon = new AMap.Icon({
+          size: new AMap.Size(36, 36), // 图标尺寸
+          image: 'http://111.198.10.15:11404/imgs/2.png', // Icon的图像
+          imageSize: new AMap.Size(24, 30), // 根据所设置的大小拉伸或压缩图片
+          imageOffset: new AMap.Pixel(0, 0), // 图像相对展示区域的偏移量，适于雪碧图等
+        })
+        // const content = '<div>111</div>'
+        const marker = new AMap.Marker({
+          position: markerArr1.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+          map: map.value,
+          title: '测试坐标',
+          icon,
+          offset: new AMap.Pixel(-20, -20),
+        })
+        // 信息窗体
+        infoWindow2.value = new AMap.InfoWindow({
+          isCustom: true, // 自定义信息窗体
+          content: windowInfoRef2.value.$el, // 窗体内容(vue组件)
+          offset: new AMap.Pixel(9, -5), // 偏移
+        })
+        marker.on('click', (e) => {
+          // 打开信息窗口
+          infoWindow2.value.open(map.value, e.lnglat)
+          // infoWindow2.value.setContent(e.target)
+          // 初始化信息窗口
+          windowInfoRef2.value.initialize({
+            overlay: e.target,
+            infoWindow: infoWindow2.value,
+            info: markerArrInfo1.value[i],
+          })
+        })
+        marker.setLabel({
+          offset: new AMap.Pixel(-10, -2), // 设置文本标注偏移量
+          content: `<div>${markerArrInfo1.value[i].stationName}</div>`, // 设置文本标注内容
+          direction: 'right', // 设置文本标注方位
+        })
+        map.value.add([marker])
+        // 绘制电网和节点连线
+        const path = markerArrInfo1.value.map((item) => {
+          return [[Number(item.lng), Number(item.lat)], [Number(item.nodeLng), Number(item.nodeLat)]]
+        })
+        const polyline = new AMap.Polyline({
+          path,
+          strokeColor: '#03A382',
+          strokeStyle: 'dashed',
+          strokeDasharray: [10, 3],
+          lineJoin: 'round',
+          lineCap: 'round',
+          zIndex: 50,
+          zooms: [16, 20],
+        })
+        polyline.setMap(map.value)
+        map.value.add(polyline)
+      }
+      // 电网支路折线绘制
+      for (let i = 0; i < lineArr.value.length; i++) {
+        // console.log(lineArr.value[i])
+        const path = lineArr.value.map(item => item.branchNodeInfos)
+        const line = path.map(item => (
+          item.map((child) => {
+            return ([[child.flng, child.flat], [child.tlng, child.tlat], child.status2])
+          })
+        ))
+        line.forEach((item) => {
+          item.forEach((child) => {
+            const path = [child[0], child[1]]
+            const polyline = new AMap.Polyline({
+              path,
+              // isOutline: true,
+              strokeColor: child[2] === 1 ? '#008d68' : '#000',
+              // strokeOpacity: 1,
+              strokeWeight: 3,
+              // 折线样式还支持 'dashed'
+              strokeStyle: child[2] !== 1 ? 'dashed' : 'dashed ',
+              // strokeStyle是dashed时有效
+              strokeDasharray: [10, 3],
+              lineJoin: 'round',
+              showDir: child[2] === 1,
+              // lineCap: 'square',
+              lineCap: 'round',
+              zIndex: 50,
+              zooms: [16, 20],
+
+            })
+            polyline.setMap(map.value)
+            map.value.add(polyline)
+          })
+        })
+        // 添加支路折线文本
+        // 创建纯文本标记
+        const textArr = path.map(item => (
+          item.map((child) => {
+            return ([[(Number(child.flng) + Number(child.tlng)) / 2, (Number(child.flat) + Number(child.tlat)) / 2], child.flowRate])
+          })
+        ))
+        textArr.forEach((item) => {
+          // console.log(item, 'item')
+          item.forEach((child) => {
+            const icon = new AMap.Icon({
+              size: new AMap.Size(36, 36), // 图标尺寸
+              // image: '', // Icon的图像
+              imageSize: new AMap.Size(24, 30), // 根据所设置的大小拉伸或压缩图片
+              imageOffset: new AMap.Pixel(0, 0), // 图像相对展示区域的偏移量，适于雪碧图等
+            })
+            // const content = '<div>111</div>'
+            const marker = new AMap.Marker({
+              position: child[0], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+              map: map.value,
+              content: '<span></span>',
+              offset: new AMap.Pixel(-20, -20),
+            })
+            marker.setLabel({
+              offset: new AMap.Pixel(-10, -2), // 设置文本标注偏移量
+              content: `<div>${`${child[1]}kgCO2/h`}</div>`, // 设置文本标注内容
+              direction: 'right', // 设置文本标注方位
+            })
+            map.value.add([marker])
+          })
+        })
+      }
     })
     .catch((e) => {
       console.log(e)
     })
 }
-onMounted(() => {
-  getElectricityListAll().then((res) => {
+onMounted(async () => {
+  // 获取电网列表
+  try {
+    const list = await getElectricityListAll()
     // 电网列表
-    electricityList.value = res.data
-    // 默认选中第一个查询节点
+    electricityList.value = list.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()
-      })
+      const res = await electricityNode(electricityList.value[0].id)
+      markerArr.value = res.data.map(item => ([Number(item.lng), Number(item.lat)]))
+      markerArrInfo.value = res.data
+      // 获取支路信息(折线)
+      const res1 = await electricityBranch(electricityList.value[0].id)
+      lineArr.value = res1.data
     }
-  })
+    // 获取光伏列表
+    const list1 = await getMonitorStationList()
+    markerArr1.value = list1.data.map(item => ([Number(item.lng), Number(item.lat)]))
+    markerArrInfo1.value = list1.data
+    // 初始化地图
+    initMap()
+  }
+  catch (error) {
+    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
+  //       // 获取支路
+  //       electricityBranch(electricityList.value[0].id).then(res => {
+  //         lineArr.value = res.data
+  //         // console.log(res.data)
+  //         initMap()
+  //       })
+  //     })
+  //   }
+  // })
 })
 </script>
 
 <template>
   <div id="map" />
+  <info-detail ref="windowInfoRef" />
+  <info-detail2 ref="windowInfoRef2" />
 </template>
 
 <style scoped>
diff --git a/src/components/map/infoWindow.vue b/src/components/map/infoWindow.vue
new file mode 100644
index 0000000..1df9061
--- /dev/null
+++ b/src/components/map/infoWindow.vue
@@ -0,0 +1,83 @@
+<!--
+  Description: 高德地图信息窗体 - 支路节点
+  Author: 李亚光
+  Date: 2023-05-10
+ -->
+<script lang="ts" setup name="infoWindow">
+const overlay = ref()
+const infoWindow = ref()
+const info = ref()
+// 初始化
+const initialize = (e) => {
+  overlay.value = e.overlay
+  infoWindow.value = e.infoWindow
+  info.value = e.info
+}
+defineExpose({ initialize })
+// 关闭
+const close = () => {
+  infoWindow.value.close()
+}
+</script>
+
+<template>
+  <div class="container">
+    <div class="title">
+      <div class="text">
+        {{ info?.nodeName }}
+      </div>
+      <div class="close" @click="close">
+        x
+      </div>
+    </div>
+    <div class="item">
+      节点编号 : {{ info?.busId }}
+    </div>
+    <div class="item">
+      <span>负荷有功功率 : {{ info?.pd }}</span>  <span>负荷无功功率 : {{ info?.qd }}</span>
+    </div>
+    <div class="item">
+      <span>节点碳势 : {{ info?.en }}</span>  <span>节点负荷碳流率 : {{ info?.flowRate }}</span>
+    </div>
+    <!-- // <div class="item">设备信息 : {{ device.produceCode }}</div>
+    // <div class="item">设备ID : {{ device.deviceId }}</div>
+    // <div class="item">IP地址 : {{ device.deviceIp }}</div>
+    // <div class="item">地址 : {{ device.deviceAddress }}</div> -->
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  width: 340px;
+  height: 140px;
+  padding: 10px;
+  background-color: #fff;
+  border: 1px solid #6d9ece;
+
+  .title {
+    font-size: 16px;
+    font-weight: 700;
+    padding: 0 10px;
+    display: flex;
+    justify-content: space-between;
+
+    .close {
+      color: #ccc;
+
+      &:hover {
+        cursor: pointer;
+      }
+    }
+  }
+
+  .item {
+    padding: 0 5px;
+    color: #111213;
+    font-size: 14px;
+    margin: 10px;
+    border-bottom: 1px solid #ccc;
+    display: flex;
+    justify-content: space-between;
+  }
+}
+</style>
diff --git a/src/components/map/infoWindow2.vue b/src/components/map/infoWindow2.vue
new file mode 100644
index 0000000..407e288
--- /dev/null
+++ b/src/components/map/infoWindow2.vue
@@ -0,0 +1,80 @@
+<!--
+  Description: 高德地图信息窗体 - 光伏节点
+  Author: 李亚光
+  Date: 2023-05-10
+ -->
+<script lang="ts" setup name="infoWindow">
+const overlay = ref()
+const infoWindow = ref()
+const info = ref()
+// 初始化
+const initialize = (e) => {
+  overlay.value = e.overlay
+  infoWindow.value = e.infoWindow
+  info.value = e.info
+  console.log(e, '123')
+}
+defineExpose({ initialize })
+// 关闭
+const close = () => {
+  infoWindow.value.close()
+}
+</script>
+
+<template>
+  <div class="container">
+    <div class="title">
+      <div class="text">
+        {{ info?.stationName }}
+      </div>
+      <div class="close" @click="close">
+        x
+      </div>
+    </div>
+    <div class="item">
+      光伏挂载节点 : {{ info?.nodeId }}
+    </div>
+    <div class="item">
+      <span>发电机组有功 : {{ info?.pg }}</span>  <span>发电机组无功 : {{ info?.qg }}</span>
+    </div>
+    <div class="item">
+      碳排强度 : {{ info?.strength }}
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  width: 340px;
+  height: 140px;
+  padding: 10px;
+  background-color: #fff;
+  border: 1px solid #6d9ece;
+
+  .title {
+    font-size: 16px;
+    font-weight: 700;
+    padding: 0 10px;
+    display: flex;
+    justify-content: space-between;
+
+    .close {
+      color: #ccc;
+
+      &:hover {
+        cursor: pointer;
+      }
+    }
+  }
+
+  .item {
+    padding: 0 5px;
+    color: #111213;
+    font-size: 14px;
+    margin: 10px;
+    border-bottom: 1px solid #ccc;
+    display: flex;
+    justify-content: space-between;
+  }
+}
+</style>
diff --git a/src/static/1.png b/src/static/1.png
new file mode 100644
index 0000000..9dca264
--- /dev/null
+++ b/src/static/1.png
Binary files differ
diff --git a/src/static/2.png b/src/static/2.png
new file mode 100644
index 0000000..0eb5760
--- /dev/null
+++ b/src/static/2.png
Binary files differ
diff --git a/src/views/data/electricity/components/busbarAdd.vue b/src/views/data/electricity/components/busbarAdd.vue
index 7f81ed6..fa5ccb8 100644
--- a/src/views/data/electricity/components/busbarAdd.vue
+++ b/src/views/data/electricity/components/busbarAdd.vue
@@ -7,8 +7,7 @@
 import type { FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
-import showPhoto from './showPhoto.vue'
-import { addElectricityList, updateElectricityList, uploadApi } from '@/api/api/index'
+import { electricityNodeAdd, electricityNodeUpdate } from '@/api/api/index'
 import { getUserList } from '@/api/system/user'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
@@ -16,12 +15,19 @@
 const dialogStatus = ref('') // 对话框类型：create,update
 const isEditMode = ref(true)
 const areaForm = ref({
-  electricityName: '', // 配电网名称
-  electricityArea: '', // 配电网区域
-  uploaderName: '', // 上传人
-  uploader: '',
-  uploadTime: '', // 上传时间
-  electricityDetail: '', // 详情图片
+  type: '', // 节点类型
+  gs: '', // 节点并联电导
+  bs: '', // 节点并联电纳
+  area: '', // 母线断面号
+  vm: '', // 节点电压初始幅值
+  va: '', // 节点电压初始相位角
+  zone: '', // 母线省损耗区域
+  vmax: '', // 节点最大电压
+  vmin: '', // 节点最小电压
+  pd: '', // 负荷有功功率
+  qd: '', // 负荷无功功率
+  // qd: '', // 负荷无功功率
+  // qd: '', // 负荷无功功率
 }) // 表单
 const textMap: { [key: string]: string } = {
   update: '编辑',
@@ -29,11 +35,17 @@
 } // 表头显示标题
 const btnLoading = ref(false) // 保存按钮的加载中状态
 const rules: FormRules = {
-  electricityName: [{ required: true, message: '请输入配电网名称', trigger: ['blur', 'change'] }],
-  electricityArea: [{ required: true, message: '请输入配电网区域', trigger: ['blur', 'change'] }],
-  uploader: [{ required: true, message: '请选择上传人', trigger: ['blur', 'change'] }],
-  uploadTime: [{ required: true, message: '请选择上传时间', trigger: ['blur', 'change'] }],
-  electricityDetail: [{ required: true, message: '请上传附件', trigger: ['blur', 'change'] }],
+  type: [{ required: true, message: '请选择节点类型', trigger: ['blur', 'change'] }],
+  gs: [{ required: true, message: '节点并联电导', trigger: ['blur', 'change'] }],
+  bs: [{ required: true, message: '节点并联电纳', trigger: ['blur', 'change'] }],
+  area: [{ required: true, message: '母线断面号', trigger: ['blur', 'change'] }],
+  vm: [{ required: true, message: '节点电压初始幅值', trigger: ['blur', 'change'] }],
+  va: [{ required: true, message: '节点电压初始相位角', trigger: ['blur', 'change'] }],
+  zone: [{ required: true, message: '母线省损耗区域', trigger: ['blur', 'change'] }],
+  vmax: [{ required: true, message: '节点最大电压', trigger: ['blur', 'change'] }],
+  vmin: [{ required: true, message: '节点最小电压', trigger: ['blur', 'change'] }],
+  pd: [{ required: true, message: '负荷有功功率', trigger: ['blur', 'change'] }],
+  qd: [{ required: true, message: '负荷无功功率', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 // 获取用户列表
 const userList = ref<any[]>([])
@@ -46,12 +58,17 @@
 // 重置表单
 const resetForm = () => {
   areaForm.value = {
-    electricityName: '', // 配电网名称
-    electricityArea: '', // 配电网区域
-    uploaderName: '', // 上传人+
-    uploader: '',
-    uploadTime: '', // 上传时间
-    electricityDetail: '',
+    type: '', // 节点类型
+    gs: '', // 节点并联电导
+    bs: '', // 节点并联电纳
+    area: '', // 母线断面号
+    vm: '', // 节点电压初始幅值
+    va: '', // 节点电压初始相位角
+    zone: '', // 母线省损耗区域
+    vmax: '', // 节点最大电压
+    vmin: '', // 节点最小电压
+    pd: '', // 负荷有功功率
+    qd: '', // 负荷无功功率
   }
 }
 const deviceTypeList = ref([])
@@ -80,9 +97,8 @@
 const createData = () => {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
-      areaForm.value.uploadTime = dayjs().format('YYYY-MM-DD')
       btnLoading.value = true
-      addElectricityList(areaForm.value).then((response) => {
+      electricityNodeAdd(areaForm.value).then((response) => {
         if (response.code === 200) {
           btnLoading.value = false
           // 通知父组件刷新状态
@@ -106,9 +122,8 @@
 const updateData = () => {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
-      areaForm.value.uploadTime = dayjs().format('YYYY-MM-DD')
       btnLoading.value = true
-      updateElectricityList(areaForm.value).then((response) => {
+      electricityNodeUpdate(areaForm.value).then((response) => {
         if (response.code === 200) {
           ElMessage({
             message: '修改成功',
@@ -168,91 +183,89 @@
   <el-dialog v-model="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
     <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="160px">
       <el-col :span="20">
-        <el-form-item label="节点类型" prop="deviceId">
-          <el-select v-model="areaForm.electricityName" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择节点类型' : ''" style="width: 100%;">
-            <el-option
-              v-for="item in []"
-              :key="item.id"
-              :label="item.deviceName"
-              :value="item.id"
-            />
+        <el-form-item label="节点类型">
+          <el-select
+            v-model="areaForm.type" class="m-2"
+            :placeholder="dialogStatus === 'create' ? '请选择节点类型' : ''" style="width: 100%;"
+          >
+            <el-option v-for="item in []" :key="item.id" :label="item.deviceName" :value="item.id" />
           </el-select>
         </el-form-item>
       </el-col>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点并联电导:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入节点并联电导' : ''" />
+          <el-form-item label="节点并联电导:" prop="gs">
+            <el-input v-model="areaForm.gs" :placeholder="dialogStatus === 'create' ? '请输入节点并联电导' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点并联电纳:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入节点并联电纳' : ''" />
+          <el-form-item label="节点并联电纳:" prop="bs">
+            <el-input v-model="areaForm.bs" :placeholder="dialogStatus === 'create' ? '请输入节点并联电纳' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="母线断面号:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入母线断面号' : ''" />
+          <el-form-item label="母线断面号:" prop="area">
+            <el-input v-model="areaForm.area" :placeholder="dialogStatus === 'create' ? '请输入母线断面号' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点电压初始幅值:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入节点电压初始幅值' : ''" />
+          <el-form-item label="节点电压初始幅值:" prop="vm">
+            <el-input v-model="areaForm.vm" :placeholder="dialogStatus === 'create' ? '请输入节点电压初始幅值' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点电压初始相位角:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入节点电压初始相位角' : ''" />
+          <el-form-item label="节点电压初始相位角:" prop="va">
+            <el-input v-model="areaForm.va" :placeholder="dialogStatus === 'create' ? '请输入节点电压初始相位角' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="母线省损耗区域:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入母线省损耗区域' : ''" />
+          <el-form-item label="母线省损耗区域:" prop="zone">
+            <el-input v-model="areaForm.zone" :placeholder="dialogStatus === 'create' ? '请输入母线省损耗区域' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点最大电压:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入节点最大电压' : ''" />
+          <el-form-item label="节点最大电压:" prop="vmax">
+            <el-input v-model="areaForm.vmax" :placeholder="dialogStatus === 'create' ? '请输入节点最大电压' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点最小电压:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入节点最小电压' : ''" />
+          <el-form-item label="节点最小电压:" prop="vmin">
+            <el-input v-model="areaForm.vmin" :placeholder="dialogStatus === 'create' ? '请输入节点最小电压' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="负荷有功功率:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入负荷有功功率' : ''" />
+          <el-form-item label="负荷有功功率:" prop="pd">
+            <el-input v-model="areaForm.pd" :placeholder="dialogStatus === 'create' ? '请输入负荷有功功率' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="负荷无功功率:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入负荷无功功率' : ''" />
+          <el-form-item label="负荷无功功率:" prop="qd">
+            <el-input v-model="areaForm.qd" :placeholder="dialogStatus === 'create' ? '请输入负荷无功功率' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
+      <!-- <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点碳势:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入节点碳势' : ''" />
+          <el-form-item label="节点碳势:" prop="qd">
+            <el-input v-model="areaForm.qd" :placeholder="dialogStatus === 'create' ? '请输入节点碳势' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -262,7 +275,7 @@
             <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入负荷碳流率' : ''" />
           </el-form-item>
         </el-col>
-      </el-row>
+      </el-row> -->
     </el-form>
     <template #footer>
       <div class="dialog-footer">

diff --git a/src/api/api/index.ts b/src/api/api/index.ts
index 4a6cf27..0af6bf9 100644
--- a/src/api/api/index.ts
+++ b/src/api/api/index.ts
@@ -110,13 +110,43 @@
     method: 'post',
   })
 }
-// 配电网节点查询
+// 配电网节点查询 / 母线参数
 export function electricityNode(id: any) {
   return request({
     url: `/electricityNode/list?electricityId=${id}`,
     method: 'get',
   })
 }
+// 母线参数新增
+export function electricityNodeAdd(data: object) {
+  return request({
+    url: '/electricityNode/add',
+    method: 'post',
+    data,
+  })
+}
+// 母线参数修改
+export function electricityNodeUpdate(data: object) {
+  return request({
+    url: '/electricityNode/update',
+    method: 'post',
+    data,
+  })
+}
+// 母线参数删除
+export function electricityNodeDelete(id: string) {
+  return request({
+    url: `/electricityNode/delete?id=${id}`,
+    method: 'post',
+  })
+}
+// 配电网支路查询
+export function electricityBranch(id: any) {
+  return request({
+    url: `/branchNodeInfo/branchList?electricityId=${id}`,
+    method: 'get',
+  })
+}
 // 光伏/楼宇/电动车管理列表
 export function getMonitorStation(params: any) {
   return request({
@@ -125,6 +155,13 @@
     params,
   })
 }
+// 光伏列表 - 不分页
+export function getMonitorStationList() {
+  return request({
+    url: '/monitorStation/list',
+    method: 'get',
+  })
+}
 // 添加 光伏/楼宇/电动车管
 export function addMonitorStation(data: any) {
   return request({
diff --git a/src/components.d.ts b/src/components.d.ts
index 1bd3d1b..5c3eb2a 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -40,6 +40,8 @@
     ImagePreview: typeof import('./components/ImagePreview/index.vue')['default']
     ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default']
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
+    InfoWindow: typeof import('./components/map/infoWindow.vue')['default']
+    InfoWindow2: typeof import('./components/map/infoWindow2.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     Map: typeof import('./components/map/index.vue')['default']
     MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index a5c8ec3..00994da 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -5,7 +5,9 @@
  -->
 <script lang="ts" setup name="GuadMap">
 import AMapLoader from '@amap/amap-jsapi-loader'
-import { electricityNode, getElectricityListAll } from '@/api/api/index'
+import infoDetail from './infoWindow.vue'
+import infoDetail2 from './infoWindow2.vue'
+import { electricityBranch, electricityNode, getElectricityListAll, getMonitorStationList } from '@/api/api/index'
 // 设置安全密钥
 window._AMapSecurityConfig = {
   securityJsCode: '56bf9671d4b3517d294caec4751889a1', // 后期需替换
@@ -24,10 +26,19 @@
   [111.739906, 40.83686],
   [111.739906, 40.83386],
 ])
-// 区域点数组
+// 电网节点数组
 const markerArr = ref([
 ])
+// 光伏数组
+const markerArr1 = ref([
+])
+// 信息窗体
+const infoWindow = ref()
+const infoWindow2 = ref()
+const windowInfoRef = ref()
+const windowInfoRef2 = ref()
 const markerArrInfo = ref()
+const markerArrInfo1 = ref()
 // 折现节点坐标
 const lineArr = ref([])
 // 初始化地图
@@ -35,14 +46,15 @@
   AMapLoader.load({
     key: '40849e82b4e33f5255b17372520c954d', // 后期需替换
     version: '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
-    plugins: ['AMap.Scale', 'AMap.MouseTool'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
+    plugins: ['AMap.Scale', 'AMap.MouseTool', 'AMap.ToolBar'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
   })
     .then((AMap) => {
       // 初始化地图
       map.value = new AMap.Map('map', {
-        viewMode: '2D', //  是否为3D地图模式
+        viewMode: '3D', //  是否为3D地图模式
         zoom: 17, // 初始化地图级别
-        center: markerArr.value[0],
+        // center: markerArr.value[0],
+        center: [116.26755900, 39.91547100],
         resizeEnable: true,
       })
       // 用来画区域的
@@ -78,7 +90,7 @@
       //   }
       //   console.log(arr)// 121.540994,29.870174;121.55138,29.858116;121.55756,29.874193;
       // })
-      // 标记点绘制
+      // 电网支路标记点绘制
       for (let i = 0; i < markerArr.value.length; i++) {
         const icon = new AMap.Icon({
           size: new AMap.Size(36, 36), // 图标尺寸
@@ -87,58 +99,213 @@
           imageSize: new AMap.Size(24, 30), // 根据所设置的大小拉伸或压缩图片
           imageOffset: new AMap.Pixel(0, 0), // 图像相对展示区域的偏移量，适于雪碧图等
         })
-        // const content = '<div>111</div>'
         const marker = new AMap.Marker({
           position: markerArr.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
           map: map.value,
           title: '测试坐标',
           icon,
-          offset: new AMap.Pixel(-20, -20),
+          offset: new AMap.Pixel(3, -30),
+        })
+        // 支路点详细信息// 信息窗体
+        infoWindow.value = new AMap.InfoWindow({
+          isCustom: true, // 自定义信息窗体
+          content: windowInfoRef.value.$el, // 窗体内容(vue组件)
+          offset: new AMap.Pixel(9, -5), // 偏移
+        })
+        marker.on('click', (e) => {
+          // 打开信息窗口
+          // infoWindow.value.setContent(e.target.content)
+          infoWindow.value.open(map.value, e.lnglat)
+          // 初始化信息窗口
+          windowInfoRef.value.initialize({
+            overlay: e.target,
+            infoWindow: infoWindow.value,
+            info: markerArrInfo.value[i],
+          })
         })
         marker.setLabel({
           offset: new AMap.Pixel(-10, -2), // 设置文本标注偏移量
-          content: `<div>${markerArrInfo.value[i].busId}</div>`, // 设置文本标注内容
+          content: `<div>${markerArrInfo.value[i].nodeName}</div>`, // 设置文本标注内容
           direction: 'right', // 设置文本标注方位
         })
         map.value.add([marker])
-        // 标记点文本
-        // 自动适应显示想显示的范围区域
-        // map.value.setFitView()
       }
-      // 折现(
-      // 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)
+      // 光伏标记点及光伏绘制
+      for (let i = 0; i < markerArr1.value.length; i++) {
+        const icon = new AMap.Icon({
+          size: new AMap.Size(36, 36), // 图标尺寸
+          image: 'http://111.198.10.15:11404/imgs/2.png', // Icon的图像
+          imageSize: new AMap.Size(24, 30), // 根据所设置的大小拉伸或压缩图片
+          imageOffset: new AMap.Pixel(0, 0), // 图像相对展示区域的偏移量，适于雪碧图等
+        })
+        // const content = '<div>111</div>'
+        const marker = new AMap.Marker({
+          position: markerArr1.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+          map: map.value,
+          title: '测试坐标',
+          icon,
+          offset: new AMap.Pixel(-20, -20),
+        })
+        // 信息窗体
+        infoWindow2.value = new AMap.InfoWindow({
+          isCustom: true, // 自定义信息窗体
+          content: windowInfoRef2.value.$el, // 窗体内容(vue组件)
+          offset: new AMap.Pixel(9, -5), // 偏移
+        })
+        marker.on('click', (e) => {
+          // 打开信息窗口
+          infoWindow2.value.open(map.value, e.lnglat)
+          // infoWindow2.value.setContent(e.target)
+          // 初始化信息窗口
+          windowInfoRef2.value.initialize({
+            overlay: e.target,
+            infoWindow: infoWindow2.value,
+            info: markerArrInfo1.value[i],
+          })
+        })
+        marker.setLabel({
+          offset: new AMap.Pixel(-10, -2), // 设置文本标注偏移量
+          content: `<div>${markerArrInfo1.value[i].stationName}</div>`, // 设置文本标注内容
+          direction: 'right', // 设置文本标注方位
+        })
+        map.value.add([marker])
+        // 绘制电网和节点连线
+        const path = markerArrInfo1.value.map((item) => {
+          return [[Number(item.lng), Number(item.lat)], [Number(item.nodeLng), Number(item.nodeLat)]]
+        })
+        const polyline = new AMap.Polyline({
+          path,
+          strokeColor: '#03A382',
+          strokeStyle: 'dashed',
+          strokeDasharray: [10, 3],
+          lineJoin: 'round',
+          lineCap: 'round',
+          zIndex: 50,
+          zooms: [16, 20],
+        })
+        polyline.setMap(map.value)
+        map.value.add(polyline)
+      }
+      // 电网支路折线绘制
+      for (let i = 0; i < lineArr.value.length; i++) {
+        // console.log(lineArr.value[i])
+        const path = lineArr.value.map(item => item.branchNodeInfos)
+        const line = path.map(item => (
+          item.map((child) => {
+            return ([[child.flng, child.flat], [child.tlng, child.tlat], child.status2])
+          })
+        ))
+        line.forEach((item) => {
+          item.forEach((child) => {
+            const path = [child[0], child[1]]
+            const polyline = new AMap.Polyline({
+              path,
+              // isOutline: true,
+              strokeColor: child[2] === 1 ? '#008d68' : '#000',
+              // strokeOpacity: 1,
+              strokeWeight: 3,
+              // 折线样式还支持 'dashed'
+              strokeStyle: child[2] !== 1 ? 'dashed' : 'dashed ',
+              // strokeStyle是dashed时有效
+              strokeDasharray: [10, 3],
+              lineJoin: 'round',
+              showDir: child[2] === 1,
+              // lineCap: 'square',
+              lineCap: 'round',
+              zIndex: 50,
+              zooms: [16, 20],
+
+            })
+            polyline.setMap(map.value)
+            map.value.add(polyline)
+          })
+        })
+        // 添加支路折线文本
+        // 创建纯文本标记
+        const textArr = path.map(item => (
+          item.map((child) => {
+            return ([[(Number(child.flng) + Number(child.tlng)) / 2, (Number(child.flat) + Number(child.tlat)) / 2], child.flowRate])
+          })
+        ))
+        textArr.forEach((item) => {
+          // console.log(item, 'item')
+          item.forEach((child) => {
+            const icon = new AMap.Icon({
+              size: new AMap.Size(36, 36), // 图标尺寸
+              // image: '', // Icon的图像
+              imageSize: new AMap.Size(24, 30), // 根据所设置的大小拉伸或压缩图片
+              imageOffset: new AMap.Pixel(0, 0), // 图像相对展示区域的偏移量，适于雪碧图等
+            })
+            // const content = '<div>111</div>'
+            const marker = new AMap.Marker({
+              position: child[0], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+              map: map.value,
+              content: '<span></span>',
+              offset: new AMap.Pixel(-20, -20),
+            })
+            marker.setLabel({
+              offset: new AMap.Pixel(-10, -2), // 设置文本标注偏移量
+              content: `<div>${`${child[1]}kgCO2/h`}</div>`, // 设置文本标注内容
+              direction: 'right', // 设置文本标注方位
+            })
+            map.value.add([marker])
+          })
+        })
+      }
     })
     .catch((e) => {
       console.log(e)
     })
 }
-onMounted(() => {
-  getElectricityListAll().then((res) => {
+onMounted(async () => {
+  // 获取电网列表
+  try {
+    const list = await getElectricityListAll()
     // 电网列表
-    electricityList.value = res.data
-    // 默认选中第一个查询节点
+    electricityList.value = list.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()
-      })
+      const res = await electricityNode(electricityList.value[0].id)
+      markerArr.value = res.data.map(item => ([Number(item.lng), Number(item.lat)]))
+      markerArrInfo.value = res.data
+      // 获取支路信息(折线)
+      const res1 = await electricityBranch(electricityList.value[0].id)
+      lineArr.value = res1.data
     }
-  })
+    // 获取光伏列表
+    const list1 = await getMonitorStationList()
+    markerArr1.value = list1.data.map(item => ([Number(item.lng), Number(item.lat)]))
+    markerArrInfo1.value = list1.data
+    // 初始化地图
+    initMap()
+  }
+  catch (error) {
+    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
+  //       // 获取支路
+  //       electricityBranch(electricityList.value[0].id).then(res => {
+  //         lineArr.value = res.data
+  //         // console.log(res.data)
+  //         initMap()
+  //       })
+  //     })
+  //   }
+  // })
 })
 </script>
 
 <template>
   <div id="map" />
+  <info-detail ref="windowInfoRef" />
+  <info-detail2 ref="windowInfoRef2" />
 </template>
 
 <style scoped>
diff --git a/src/components/map/infoWindow.vue b/src/components/map/infoWindow.vue
new file mode 100644
index 0000000..1df9061
--- /dev/null
+++ b/src/components/map/infoWindow.vue
@@ -0,0 +1,83 @@
+<!--
+  Description: 高德地图信息窗体 - 支路节点
+  Author: 李亚光
+  Date: 2023-05-10
+ -->
+<script lang="ts" setup name="infoWindow">
+const overlay = ref()
+const infoWindow = ref()
+const info = ref()
+// 初始化
+const initialize = (e) => {
+  overlay.value = e.overlay
+  infoWindow.value = e.infoWindow
+  info.value = e.info
+}
+defineExpose({ initialize })
+// 关闭
+const close = () => {
+  infoWindow.value.close()
+}
+</script>
+
+<template>
+  <div class="container">
+    <div class="title">
+      <div class="text">
+        {{ info?.nodeName }}
+      </div>
+      <div class="close" @click="close">
+        x
+      </div>
+    </div>
+    <div class="item">
+      节点编号 : {{ info?.busId }}
+    </div>
+    <div class="item">
+      <span>负荷有功功率 : {{ info?.pd }}</span>  <span>负荷无功功率 : {{ info?.qd }}</span>
+    </div>
+    <div class="item">
+      <span>节点碳势 : {{ info?.en }}</span>  <span>节点负荷碳流率 : {{ info?.flowRate }}</span>
+    </div>
+    <!-- // <div class="item">设备信息 : {{ device.produceCode }}</div>
+    // <div class="item">设备ID : {{ device.deviceId }}</div>
+    // <div class="item">IP地址 : {{ device.deviceIp }}</div>
+    // <div class="item">地址 : {{ device.deviceAddress }}</div> -->
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  width: 340px;
+  height: 140px;
+  padding: 10px;
+  background-color: #fff;
+  border: 1px solid #6d9ece;
+
+  .title {
+    font-size: 16px;
+    font-weight: 700;
+    padding: 0 10px;
+    display: flex;
+    justify-content: space-between;
+
+    .close {
+      color: #ccc;
+
+      &:hover {
+        cursor: pointer;
+      }
+    }
+  }
+
+  .item {
+    padding: 0 5px;
+    color: #111213;
+    font-size: 14px;
+    margin: 10px;
+    border-bottom: 1px solid #ccc;
+    display: flex;
+    justify-content: space-between;
+  }
+}
+</style>
diff --git a/src/components/map/infoWindow2.vue b/src/components/map/infoWindow2.vue
new file mode 100644
index 0000000..407e288
--- /dev/null
+++ b/src/components/map/infoWindow2.vue
@@ -0,0 +1,80 @@
+<!--
+  Description: 高德地图信息窗体 - 光伏节点
+  Author: 李亚光
+  Date: 2023-05-10
+ -->
+<script lang="ts" setup name="infoWindow">
+const overlay = ref()
+const infoWindow = ref()
+const info = ref()
+// 初始化
+const initialize = (e) => {
+  overlay.value = e.overlay
+  infoWindow.value = e.infoWindow
+  info.value = e.info
+  console.log(e, '123')
+}
+defineExpose({ initialize })
+// 关闭
+const close = () => {
+  infoWindow.value.close()
+}
+</script>
+
+<template>
+  <div class="container">
+    <div class="title">
+      <div class="text">
+        {{ info?.stationName }}
+      </div>
+      <div class="close" @click="close">
+        x
+      </div>
+    </div>
+    <div class="item">
+      光伏挂载节点 : {{ info?.nodeId }}
+    </div>
+    <div class="item">
+      <span>发电机组有功 : {{ info?.pg }}</span>  <span>发电机组无功 : {{ info?.qg }}</span>
+    </div>
+    <div class="item">
+      碳排强度 : {{ info?.strength }}
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  width: 340px;
+  height: 140px;
+  padding: 10px;
+  background-color: #fff;
+  border: 1px solid #6d9ece;
+
+  .title {
+    font-size: 16px;
+    font-weight: 700;
+    padding: 0 10px;
+    display: flex;
+    justify-content: space-between;
+
+    .close {
+      color: #ccc;
+
+      &:hover {
+        cursor: pointer;
+      }
+    }
+  }
+
+  .item {
+    padding: 0 5px;
+    color: #111213;
+    font-size: 14px;
+    margin: 10px;
+    border-bottom: 1px solid #ccc;
+    display: flex;
+    justify-content: space-between;
+  }
+}
+</style>
diff --git a/src/static/1.png b/src/static/1.png
new file mode 100644
index 0000000..9dca264
--- /dev/null
+++ b/src/static/1.png
Binary files differ
diff --git a/src/static/2.png b/src/static/2.png
new file mode 100644
index 0000000..0eb5760
--- /dev/null
+++ b/src/static/2.png
Binary files differ
diff --git a/src/views/data/electricity/components/busbarAdd.vue b/src/views/data/electricity/components/busbarAdd.vue
index 7f81ed6..fa5ccb8 100644
--- a/src/views/data/electricity/components/busbarAdd.vue
+++ b/src/views/data/electricity/components/busbarAdd.vue
@@ -7,8 +7,7 @@
 import type { FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
-import showPhoto from './showPhoto.vue'
-import { addElectricityList, updateElectricityList, uploadApi } from '@/api/api/index'
+import { electricityNodeAdd, electricityNodeUpdate } from '@/api/api/index'
 import { getUserList } from '@/api/system/user'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
@@ -16,12 +15,19 @@
 const dialogStatus = ref('') // 对话框类型：create,update
 const isEditMode = ref(true)
 const areaForm = ref({
-  electricityName: '', // 配电网名称
-  electricityArea: '', // 配电网区域
-  uploaderName: '', // 上传人
-  uploader: '',
-  uploadTime: '', // 上传时间
-  electricityDetail: '', // 详情图片
+  type: '', // 节点类型
+  gs: '', // 节点并联电导
+  bs: '', // 节点并联电纳
+  area: '', // 母线断面号
+  vm: '', // 节点电压初始幅值
+  va: '', // 节点电压初始相位角
+  zone: '', // 母线省损耗区域
+  vmax: '', // 节点最大电压
+  vmin: '', // 节点最小电压
+  pd: '', // 负荷有功功率
+  qd: '', // 负荷无功功率
+  // qd: '', // 负荷无功功率
+  // qd: '', // 负荷无功功率
 }) // 表单
 const textMap: { [key: string]: string } = {
   update: '编辑',
@@ -29,11 +35,17 @@
 } // 表头显示标题
 const btnLoading = ref(false) // 保存按钮的加载中状态
 const rules: FormRules = {
-  electricityName: [{ required: true, message: '请输入配电网名称', trigger: ['blur', 'change'] }],
-  electricityArea: [{ required: true, message: '请输入配电网区域', trigger: ['blur', 'change'] }],
-  uploader: [{ required: true, message: '请选择上传人', trigger: ['blur', 'change'] }],
-  uploadTime: [{ required: true, message: '请选择上传时间', trigger: ['blur', 'change'] }],
-  electricityDetail: [{ required: true, message: '请上传附件', trigger: ['blur', 'change'] }],
+  type: [{ required: true, message: '请选择节点类型', trigger: ['blur', 'change'] }],
+  gs: [{ required: true, message: '节点并联电导', trigger: ['blur', 'change'] }],
+  bs: [{ required: true, message: '节点并联电纳', trigger: ['blur', 'change'] }],
+  area: [{ required: true, message: '母线断面号', trigger: ['blur', 'change'] }],
+  vm: [{ required: true, message: '节点电压初始幅值', trigger: ['blur', 'change'] }],
+  va: [{ required: true, message: '节点电压初始相位角', trigger: ['blur', 'change'] }],
+  zone: [{ required: true, message: '母线省损耗区域', trigger: ['blur', 'change'] }],
+  vmax: [{ required: true, message: '节点最大电压', trigger: ['blur', 'change'] }],
+  vmin: [{ required: true, message: '节点最小电压', trigger: ['blur', 'change'] }],
+  pd: [{ required: true, message: '负荷有功功率', trigger: ['blur', 'change'] }],
+  qd: [{ required: true, message: '负荷无功功率', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 // 获取用户列表
 const userList = ref<any[]>([])
@@ -46,12 +58,17 @@
 // 重置表单
 const resetForm = () => {
   areaForm.value = {
-    electricityName: '', // 配电网名称
-    electricityArea: '', // 配电网区域
-    uploaderName: '', // 上传人+
-    uploader: '',
-    uploadTime: '', // 上传时间
-    electricityDetail: '',
+    type: '', // 节点类型
+    gs: '', // 节点并联电导
+    bs: '', // 节点并联电纳
+    area: '', // 母线断面号
+    vm: '', // 节点电压初始幅值
+    va: '', // 节点电压初始相位角
+    zone: '', // 母线省损耗区域
+    vmax: '', // 节点最大电压
+    vmin: '', // 节点最小电压
+    pd: '', // 负荷有功功率
+    qd: '', // 负荷无功功率
   }
 }
 const deviceTypeList = ref([])
@@ -80,9 +97,8 @@
 const createData = () => {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
-      areaForm.value.uploadTime = dayjs().format('YYYY-MM-DD')
       btnLoading.value = true
-      addElectricityList(areaForm.value).then((response) => {
+      electricityNodeAdd(areaForm.value).then((response) => {
         if (response.code === 200) {
           btnLoading.value = false
           // 通知父组件刷新状态
@@ -106,9 +122,8 @@
 const updateData = () => {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
-      areaForm.value.uploadTime = dayjs().format('YYYY-MM-DD')
       btnLoading.value = true
-      updateElectricityList(areaForm.value).then((response) => {
+      electricityNodeUpdate(areaForm.value).then((response) => {
         if (response.code === 200) {
           ElMessage({
             message: '修改成功',
@@ -168,91 +183,89 @@
   <el-dialog v-model="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
     <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="160px">
       <el-col :span="20">
-        <el-form-item label="节点类型" prop="deviceId">
-          <el-select v-model="areaForm.electricityName" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择节点类型' : ''" style="width: 100%;">
-            <el-option
-              v-for="item in []"
-              :key="item.id"
-              :label="item.deviceName"
-              :value="item.id"
-            />
+        <el-form-item label="节点类型">
+          <el-select
+            v-model="areaForm.type" class="m-2"
+            :placeholder="dialogStatus === 'create' ? '请选择节点类型' : ''" style="width: 100%;"
+          >
+            <el-option v-for="item in []" :key="item.id" :label="item.deviceName" :value="item.id" />
           </el-select>
         </el-form-item>
       </el-col>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点并联电导:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入节点并联电导' : ''" />
+          <el-form-item label="节点并联电导:" prop="gs">
+            <el-input v-model="areaForm.gs" :placeholder="dialogStatus === 'create' ? '请输入节点并联电导' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点并联电纳:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入节点并联电纳' : ''" />
+          <el-form-item label="节点并联电纳:" prop="bs">
+            <el-input v-model="areaForm.bs" :placeholder="dialogStatus === 'create' ? '请输入节点并联电纳' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="母线断面号:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入母线断面号' : ''" />
+          <el-form-item label="母线断面号:" prop="area">
+            <el-input v-model="areaForm.area" :placeholder="dialogStatus === 'create' ? '请输入母线断面号' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点电压初始幅值:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入节点电压初始幅值' : ''" />
+          <el-form-item label="节点电压初始幅值:" prop="vm">
+            <el-input v-model="areaForm.vm" :placeholder="dialogStatus === 'create' ? '请输入节点电压初始幅值' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点电压初始相位角:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入节点电压初始相位角' : ''" />
+          <el-form-item label="节点电压初始相位角:" prop="va">
+            <el-input v-model="areaForm.va" :placeholder="dialogStatus === 'create' ? '请输入节点电压初始相位角' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="母线省损耗区域:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入母线省损耗区域' : ''" />
+          <el-form-item label="母线省损耗区域:" prop="zone">
+            <el-input v-model="areaForm.zone" :placeholder="dialogStatus === 'create' ? '请输入母线省损耗区域' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点最大电压:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入节点最大电压' : ''" />
+          <el-form-item label="节点最大电压:" prop="vmax">
+            <el-input v-model="areaForm.vmax" :placeholder="dialogStatus === 'create' ? '请输入节点最大电压' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点最小电压:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入节点最小电压' : ''" />
+          <el-form-item label="节点最小电压:" prop="vmin">
+            <el-input v-model="areaForm.vmin" :placeholder="dialogStatus === 'create' ? '请输入节点最小电压' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="负荷有功功率:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入负荷有功功率' : ''" />
+          <el-form-item label="负荷有功功率:" prop="pd">
+            <el-input v-model="areaForm.pd" :placeholder="dialogStatus === 'create' ? '请输入负荷有功功率' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="负荷无功功率:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入负荷无功功率' : ''" />
+          <el-form-item label="负荷无功功率:" prop="qd">
+            <el-input v-model="areaForm.qd" :placeholder="dialogStatus === 'create' ? '请输入负荷无功功率' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
+      <!-- <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点碳势:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入节点碳势' : ''" />
+          <el-form-item label="节点碳势:" prop="qd">
+            <el-input v-model="areaForm.qd" :placeholder="dialogStatus === 'create' ? '请输入节点碳势' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -262,7 +275,7 @@
             <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入负荷碳流率' : ''" />
           </el-form-item>
         </el-col>
-      </el-row>
+      </el-row> -->
     </el-form>
     <template #footer>
       <div class="dialog-footer">
diff --git a/src/views/data/electricity/components/networkBranch.vue b/src/views/data/electricity/components/networkBranch.vue
index 8d137c0..c1eced0 100644
--- a/src/views/data/electricity/components/networkBranch.vue
+++ b/src/views/data/electricity/components/networkBranch.vue
@@ -6,11 +6,16 @@
 <script lang="ts" setup name="networkBranch">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import editList from './branchAdd.vue'
+import { electricityBranch } from '@/api/api/index'
 const props = defineProps({
   bak: {
     type: Function,
     required: true,
   },
+  id: {
+    type: String,
+    required: true,
+  },
 })
 const bak = () => {
   props.bak(1)
@@ -27,55 +32,31 @@
 const TimeRanges = ref()
 const loadingTable = ref(true)
 const columns = ref([
-  // { text: '设备类型', value: 'deviceTypeName', align: 'center' },
-  // { text: '设备编号', value: 'deviceNo', align: 'center' },
-  // { text: '安装位置', value: 'installLocaltion', align: 'center' },
-  // { text: '电量/V', value: 'electricalVoltage', align: 'center' },
-  // { text: '功率/W', value: 'power', align: 'center' },
-  // { text: '上传时间', value: 'uploadTime', align: 'center' },
-  { text: '支路首端节点', value: '1', align: 'center' },
-  { text: '支路末端节点', value: '2', align: 'center' },
-  { text: '支路电阻标幺值', value: '3', align: 'center' },
-  { text: '支路电纳标幺值', value: '4', align: 'center' },
-  { text: '长距离输电容量', value: '5', align: 'center' },
-  { text: '短距离输电容量', value: '7', align: 'center' },
-  { text: '紧急距离输电容量', value: '8', align: 'center' },
-  { text: '支路变比', value: '9', align: 'center' },
-  { text: '角度', value: '10', align: 'center' },
-  { text: '支路是否运行', value: '11', align: 'center' },
-  { text: '支路最小相位角', value: '12', align: 'center' },
-  { text: '支路碳流率', value: '13', align: 'center' },
+  { text: '支路首端节点', value: 'fbusId', align: 'center' },
+  { text: '支路末端节点', value: 'tbusId', align: 'center' },
+  { text: '支路电阻标幺值', value: 'r', align: 'center' },
+  { text: '支路电纳标幺值', value: 'b', align: 'center' },
+  { text: '长距离输电容量', value: 'ratea', align: 'center' },
+  { text: '短距离输电容量', value: 'rateb', align: 'center' },
+  { text: '紧急距离输电容量', value: 'ratec', align: 'center' },
+  { text: '支路变比', value: 'ratio', align: 'center' },
+  { text: '角度', value: 'angle', align: 'center' },
+  { text: '支路是否运行', value: 'status2', align: 'center' },
+  { text: '支路最小相位角', value: 'angmin', align: 'center' },
+  { text: '支路碳流率', value: 'angmax', align: 'center' },
 ]) // 表格
 const total = ref<number>(0)
 const list = ref<any[]>([])
 // 获取数据列表
 const fetchDataList = () => {
-  // loadingTable.value = true
-  // getMonitorStation(searchQuery).then((res) => {
-  //   list.value = res.data.rows
-  //   total.value = res.data.total
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      1: 22,
-      2: '23',
-      3: 100,
-      4: 100,
-      5: '220',
-      7: 220,
-      8: 110,
-      9: 1,
-      10: 90,
-      11: '是',
-      12: 10,
-      13: '12%',
-    },
-
-  ]
-  total.value = list.value.length
-  loadingTable.value = false
+  loadingTable.value = true
+  electricityBranch(props.id).then((res) => {
+    list.value = res.data.map(item => item.branchNodeInfos[0])
+    total.value = res.data.length
+    loadingTable.value = false
+  })
 }
+fetchDataList()
 // 搜索
 const search = () => {
   fetchDataList()
@@ -128,9 +109,6 @@
 const multiSelect = (row: any[]) => {
   selectList.value = row
 }
-onMounted(() => {
-  search()
-})
 </script>
 
 <template>

diff --git a/src/api/api/index.ts b/src/api/api/index.ts
index 4a6cf27..0af6bf9 100644
--- a/src/api/api/index.ts
+++ b/src/api/api/index.ts
@@ -110,13 +110,43 @@
     method: 'post',
   })
 }
-// 配电网节点查询
+// 配电网节点查询 / 母线参数
 export function electricityNode(id: any) {
   return request({
     url: `/electricityNode/list?electricityId=${id}`,
     method: 'get',
   })
 }
+// 母线参数新增
+export function electricityNodeAdd(data: object) {
+  return request({
+    url: '/electricityNode/add',
+    method: 'post',
+    data,
+  })
+}
+// 母线参数修改
+export function electricityNodeUpdate(data: object) {
+  return request({
+    url: '/electricityNode/update',
+    method: 'post',
+    data,
+  })
+}
+// 母线参数删除
+export function electricityNodeDelete(id: string) {
+  return request({
+    url: `/electricityNode/delete?id=${id}`,
+    method: 'post',
+  })
+}
+// 配电网支路查询
+export function electricityBranch(id: any) {
+  return request({
+    url: `/branchNodeInfo/branchList?electricityId=${id}`,
+    method: 'get',
+  })
+}
 // 光伏/楼宇/电动车管理列表
 export function getMonitorStation(params: any) {
   return request({
@@ -125,6 +155,13 @@
     params,
   })
 }
+// 光伏列表 - 不分页
+export function getMonitorStationList() {
+  return request({
+    url: '/monitorStation/list',
+    method: 'get',
+  })
+}
 // 添加 光伏/楼宇/电动车管
 export function addMonitorStation(data: any) {
   return request({
diff --git a/src/components.d.ts b/src/components.d.ts
index 1bd3d1b..5c3eb2a 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -40,6 +40,8 @@
     ImagePreview: typeof import('./components/ImagePreview/index.vue')['default']
     ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default']
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
+    InfoWindow: typeof import('./components/map/infoWindow.vue')['default']
+    InfoWindow2: typeof import('./components/map/infoWindow2.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     Map: typeof import('./components/map/index.vue')['default']
     MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index a5c8ec3..00994da 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -5,7 +5,9 @@
  -->
 <script lang="ts" setup name="GuadMap">
 import AMapLoader from '@amap/amap-jsapi-loader'
-import { electricityNode, getElectricityListAll } from '@/api/api/index'
+import infoDetail from './infoWindow.vue'
+import infoDetail2 from './infoWindow2.vue'
+import { electricityBranch, electricityNode, getElectricityListAll, getMonitorStationList } from '@/api/api/index'
 // 设置安全密钥
 window._AMapSecurityConfig = {
   securityJsCode: '56bf9671d4b3517d294caec4751889a1', // 后期需替换
@@ -24,10 +26,19 @@
   [111.739906, 40.83686],
   [111.739906, 40.83386],
 ])
-// 区域点数组
+// 电网节点数组
 const markerArr = ref([
 ])
+// 光伏数组
+const markerArr1 = ref([
+])
+// 信息窗体
+const infoWindow = ref()
+const infoWindow2 = ref()
+const windowInfoRef = ref()
+const windowInfoRef2 = ref()
 const markerArrInfo = ref()
+const markerArrInfo1 = ref()
 // 折现节点坐标
 const lineArr = ref([])
 // 初始化地图
@@ -35,14 +46,15 @@
   AMapLoader.load({
     key: '40849e82b4e33f5255b17372520c954d', // 后期需替换
     version: '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
-    plugins: ['AMap.Scale', 'AMap.MouseTool'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
+    plugins: ['AMap.Scale', 'AMap.MouseTool', 'AMap.ToolBar'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
   })
     .then((AMap) => {
       // 初始化地图
       map.value = new AMap.Map('map', {
-        viewMode: '2D', //  是否为3D地图模式
+        viewMode: '3D', //  是否为3D地图模式
         zoom: 17, // 初始化地图级别
-        center: markerArr.value[0],
+        // center: markerArr.value[0],
+        center: [116.26755900, 39.91547100],
         resizeEnable: true,
       })
       // 用来画区域的
@@ -78,7 +90,7 @@
       //   }
       //   console.log(arr)// 121.540994,29.870174;121.55138,29.858116;121.55756,29.874193;
       // })
-      // 标记点绘制
+      // 电网支路标记点绘制
       for (let i = 0; i < markerArr.value.length; i++) {
         const icon = new AMap.Icon({
           size: new AMap.Size(36, 36), // 图标尺寸
@@ -87,58 +99,213 @@
           imageSize: new AMap.Size(24, 30), // 根据所设置的大小拉伸或压缩图片
           imageOffset: new AMap.Pixel(0, 0), // 图像相对展示区域的偏移量，适于雪碧图等
         })
-        // const content = '<div>111</div>'
         const marker = new AMap.Marker({
           position: markerArr.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
           map: map.value,
           title: '测试坐标',
           icon,
-          offset: new AMap.Pixel(-20, -20),
+          offset: new AMap.Pixel(3, -30),
+        })
+        // 支路点详细信息// 信息窗体
+        infoWindow.value = new AMap.InfoWindow({
+          isCustom: true, // 自定义信息窗体
+          content: windowInfoRef.value.$el, // 窗体内容(vue组件)
+          offset: new AMap.Pixel(9, -5), // 偏移
+        })
+        marker.on('click', (e) => {
+          // 打开信息窗口
+          // infoWindow.value.setContent(e.target.content)
+          infoWindow.value.open(map.value, e.lnglat)
+          // 初始化信息窗口
+          windowInfoRef.value.initialize({
+            overlay: e.target,
+            infoWindow: infoWindow.value,
+            info: markerArrInfo.value[i],
+          })
         })
         marker.setLabel({
           offset: new AMap.Pixel(-10, -2), // 设置文本标注偏移量
-          content: `<div>${markerArrInfo.value[i].busId}</div>`, // 设置文本标注内容
+          content: `<div>${markerArrInfo.value[i].nodeName}</div>`, // 设置文本标注内容
           direction: 'right', // 设置文本标注方位
         })
         map.value.add([marker])
-        // 标记点文本
-        // 自动适应显示想显示的范围区域
-        // map.value.setFitView()
       }
-      // 折现(
-      // 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)
+      // 光伏标记点及光伏绘制
+      for (let i = 0; i < markerArr1.value.length; i++) {
+        const icon = new AMap.Icon({
+          size: new AMap.Size(36, 36), // 图标尺寸
+          image: 'http://111.198.10.15:11404/imgs/2.png', // Icon的图像
+          imageSize: new AMap.Size(24, 30), // 根据所设置的大小拉伸或压缩图片
+          imageOffset: new AMap.Pixel(0, 0), // 图像相对展示区域的偏移量，适于雪碧图等
+        })
+        // const content = '<div>111</div>'
+        const marker = new AMap.Marker({
+          position: markerArr1.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+          map: map.value,
+          title: '测试坐标',
+          icon,
+          offset: new AMap.Pixel(-20, -20),
+        })
+        // 信息窗体
+        infoWindow2.value = new AMap.InfoWindow({
+          isCustom: true, // 自定义信息窗体
+          content: windowInfoRef2.value.$el, // 窗体内容(vue组件)
+          offset: new AMap.Pixel(9, -5), // 偏移
+        })
+        marker.on('click', (e) => {
+          // 打开信息窗口
+          infoWindow2.value.open(map.value, e.lnglat)
+          // infoWindow2.value.setContent(e.target)
+          // 初始化信息窗口
+          windowInfoRef2.value.initialize({
+            overlay: e.target,
+            infoWindow: infoWindow2.value,
+            info: markerArrInfo1.value[i],
+          })
+        })
+        marker.setLabel({
+          offset: new AMap.Pixel(-10, -2), // 设置文本标注偏移量
+          content: `<div>${markerArrInfo1.value[i].stationName}</div>`, // 设置文本标注内容
+          direction: 'right', // 设置文本标注方位
+        })
+        map.value.add([marker])
+        // 绘制电网和节点连线
+        const path = markerArrInfo1.value.map((item) => {
+          return [[Number(item.lng), Number(item.lat)], [Number(item.nodeLng), Number(item.nodeLat)]]
+        })
+        const polyline = new AMap.Polyline({
+          path,
+          strokeColor: '#03A382',
+          strokeStyle: 'dashed',
+          strokeDasharray: [10, 3],
+          lineJoin: 'round',
+          lineCap: 'round',
+          zIndex: 50,
+          zooms: [16, 20],
+        })
+        polyline.setMap(map.value)
+        map.value.add(polyline)
+      }
+      // 电网支路折线绘制
+      for (let i = 0; i < lineArr.value.length; i++) {
+        // console.log(lineArr.value[i])
+        const path = lineArr.value.map(item => item.branchNodeInfos)
+        const line = path.map(item => (
+          item.map((child) => {
+            return ([[child.flng, child.flat], [child.tlng, child.tlat], child.status2])
+          })
+        ))
+        line.forEach((item) => {
+          item.forEach((child) => {
+            const path = [child[0], child[1]]
+            const polyline = new AMap.Polyline({
+              path,
+              // isOutline: true,
+              strokeColor: child[2] === 1 ? '#008d68' : '#000',
+              // strokeOpacity: 1,
+              strokeWeight: 3,
+              // 折线样式还支持 'dashed'
+              strokeStyle: child[2] !== 1 ? 'dashed' : 'dashed ',
+              // strokeStyle是dashed时有效
+              strokeDasharray: [10, 3],
+              lineJoin: 'round',
+              showDir: child[2] === 1,
+              // lineCap: 'square',
+              lineCap: 'round',
+              zIndex: 50,
+              zooms: [16, 20],
+
+            })
+            polyline.setMap(map.value)
+            map.value.add(polyline)
+          })
+        })
+        // 添加支路折线文本
+        // 创建纯文本标记
+        const textArr = path.map(item => (
+          item.map((child) => {
+            return ([[(Number(child.flng) + Number(child.tlng)) / 2, (Number(child.flat) + Number(child.tlat)) / 2], child.flowRate])
+          })
+        ))
+        textArr.forEach((item) => {
+          // console.log(item, 'item')
+          item.forEach((child) => {
+            const icon = new AMap.Icon({
+              size: new AMap.Size(36, 36), // 图标尺寸
+              // image: '', // Icon的图像
+              imageSize: new AMap.Size(24, 30), // 根据所设置的大小拉伸或压缩图片
+              imageOffset: new AMap.Pixel(0, 0), // 图像相对展示区域的偏移量，适于雪碧图等
+            })
+            // const content = '<div>111</div>'
+            const marker = new AMap.Marker({
+              position: child[0], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+              map: map.value,
+              content: '<span></span>',
+              offset: new AMap.Pixel(-20, -20),
+            })
+            marker.setLabel({
+              offset: new AMap.Pixel(-10, -2), // 设置文本标注偏移量
+              content: `<div>${`${child[1]}kgCO2/h`}</div>`, // 设置文本标注内容
+              direction: 'right', // 设置文本标注方位
+            })
+            map.value.add([marker])
+          })
+        })
+      }
     })
     .catch((e) => {
       console.log(e)
     })
 }
-onMounted(() => {
-  getElectricityListAll().then((res) => {
+onMounted(async () => {
+  // 获取电网列表
+  try {
+    const list = await getElectricityListAll()
     // 电网列表
-    electricityList.value = res.data
-    // 默认选中第一个查询节点
+    electricityList.value = list.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()
-      })
+      const res = await electricityNode(electricityList.value[0].id)
+      markerArr.value = res.data.map(item => ([Number(item.lng), Number(item.lat)]))
+      markerArrInfo.value = res.data
+      // 获取支路信息(折线)
+      const res1 = await electricityBranch(electricityList.value[0].id)
+      lineArr.value = res1.data
     }
-  })
+    // 获取光伏列表
+    const list1 = await getMonitorStationList()
+    markerArr1.value = list1.data.map(item => ([Number(item.lng), Number(item.lat)]))
+    markerArrInfo1.value = list1.data
+    // 初始化地图
+    initMap()
+  }
+  catch (error) {
+    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
+  //       // 获取支路
+  //       electricityBranch(electricityList.value[0].id).then(res => {
+  //         lineArr.value = res.data
+  //         // console.log(res.data)
+  //         initMap()
+  //       })
+  //     })
+  //   }
+  // })
 })
 </script>
 
 <template>
   <div id="map" />
+  <info-detail ref="windowInfoRef" />
+  <info-detail2 ref="windowInfoRef2" />
 </template>
 
 <style scoped>
diff --git a/src/components/map/infoWindow.vue b/src/components/map/infoWindow.vue
new file mode 100644
index 0000000..1df9061
--- /dev/null
+++ b/src/components/map/infoWindow.vue
@@ -0,0 +1,83 @@
+<!--
+  Description: 高德地图信息窗体 - 支路节点
+  Author: 李亚光
+  Date: 2023-05-10
+ -->
+<script lang="ts" setup name="infoWindow">
+const overlay = ref()
+const infoWindow = ref()
+const info = ref()
+// 初始化
+const initialize = (e) => {
+  overlay.value = e.overlay
+  infoWindow.value = e.infoWindow
+  info.value = e.info
+}
+defineExpose({ initialize })
+// 关闭
+const close = () => {
+  infoWindow.value.close()
+}
+</script>
+
+<template>
+  <div class="container">
+    <div class="title">
+      <div class="text">
+        {{ info?.nodeName }}
+      </div>
+      <div class="close" @click="close">
+        x
+      </div>
+    </div>
+    <div class="item">
+      节点编号 : {{ info?.busId }}
+    </div>
+    <div class="item">
+      <span>负荷有功功率 : {{ info?.pd }}</span>  <span>负荷无功功率 : {{ info?.qd }}</span>
+    </div>
+    <div class="item">
+      <span>节点碳势 : {{ info?.en }}</span>  <span>节点负荷碳流率 : {{ info?.flowRate }}</span>
+    </div>
+    <!-- // <div class="item">设备信息 : {{ device.produceCode }}</div>
+    // <div class="item">设备ID : {{ device.deviceId }}</div>
+    // <div class="item">IP地址 : {{ device.deviceIp }}</div>
+    // <div class="item">地址 : {{ device.deviceAddress }}</div> -->
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  width: 340px;
+  height: 140px;
+  padding: 10px;
+  background-color: #fff;
+  border: 1px solid #6d9ece;
+
+  .title {
+    font-size: 16px;
+    font-weight: 700;
+    padding: 0 10px;
+    display: flex;
+    justify-content: space-between;
+
+    .close {
+      color: #ccc;
+
+      &:hover {
+        cursor: pointer;
+      }
+    }
+  }
+
+  .item {
+    padding: 0 5px;
+    color: #111213;
+    font-size: 14px;
+    margin: 10px;
+    border-bottom: 1px solid #ccc;
+    display: flex;
+    justify-content: space-between;
+  }
+}
+</style>
diff --git a/src/components/map/infoWindow2.vue b/src/components/map/infoWindow2.vue
new file mode 100644
index 0000000..407e288
--- /dev/null
+++ b/src/components/map/infoWindow2.vue
@@ -0,0 +1,80 @@
+<!--
+  Description: 高德地图信息窗体 - 光伏节点
+  Author: 李亚光
+  Date: 2023-05-10
+ -->
+<script lang="ts" setup name="infoWindow">
+const overlay = ref()
+const infoWindow = ref()
+const info = ref()
+// 初始化
+const initialize = (e) => {
+  overlay.value = e.overlay
+  infoWindow.value = e.infoWindow
+  info.value = e.info
+  console.log(e, '123')
+}
+defineExpose({ initialize })
+// 关闭
+const close = () => {
+  infoWindow.value.close()
+}
+</script>
+
+<template>
+  <div class="container">
+    <div class="title">
+      <div class="text">
+        {{ info?.stationName }}
+      </div>
+      <div class="close" @click="close">
+        x
+      </div>
+    </div>
+    <div class="item">
+      光伏挂载节点 : {{ info?.nodeId }}
+    </div>
+    <div class="item">
+      <span>发电机组有功 : {{ info?.pg }}</span>  <span>发电机组无功 : {{ info?.qg }}</span>
+    </div>
+    <div class="item">
+      碳排强度 : {{ info?.strength }}
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  width: 340px;
+  height: 140px;
+  padding: 10px;
+  background-color: #fff;
+  border: 1px solid #6d9ece;
+
+  .title {
+    font-size: 16px;
+    font-weight: 700;
+    padding: 0 10px;
+    display: flex;
+    justify-content: space-between;
+
+    .close {
+      color: #ccc;
+
+      &:hover {
+        cursor: pointer;
+      }
+    }
+  }
+
+  .item {
+    padding: 0 5px;
+    color: #111213;
+    font-size: 14px;
+    margin: 10px;
+    border-bottom: 1px solid #ccc;
+    display: flex;
+    justify-content: space-between;
+  }
+}
+</style>
diff --git a/src/static/1.png b/src/static/1.png
new file mode 100644
index 0000000..9dca264
--- /dev/null
+++ b/src/static/1.png
Binary files differ
diff --git a/src/static/2.png b/src/static/2.png
new file mode 100644
index 0000000..0eb5760
--- /dev/null
+++ b/src/static/2.png
Binary files differ
diff --git a/src/views/data/electricity/components/busbarAdd.vue b/src/views/data/electricity/components/busbarAdd.vue
index 7f81ed6..fa5ccb8 100644
--- a/src/views/data/electricity/components/busbarAdd.vue
+++ b/src/views/data/electricity/components/busbarAdd.vue
@@ -7,8 +7,7 @@
 import type { FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
-import showPhoto from './showPhoto.vue'
-import { addElectricityList, updateElectricityList, uploadApi } from '@/api/api/index'
+import { electricityNodeAdd, electricityNodeUpdate } from '@/api/api/index'
 import { getUserList } from '@/api/system/user'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
@@ -16,12 +15,19 @@
 const dialogStatus = ref('') // 对话框类型：create,update
 const isEditMode = ref(true)
 const areaForm = ref({
-  electricityName: '', // 配电网名称
-  electricityArea: '', // 配电网区域
-  uploaderName: '', // 上传人
-  uploader: '',
-  uploadTime: '', // 上传时间
-  electricityDetail: '', // 详情图片
+  type: '', // 节点类型
+  gs: '', // 节点并联电导
+  bs: '', // 节点并联电纳
+  area: '', // 母线断面号
+  vm: '', // 节点电压初始幅值
+  va: '', // 节点电压初始相位角
+  zone: '', // 母线省损耗区域
+  vmax: '', // 节点最大电压
+  vmin: '', // 节点最小电压
+  pd: '', // 负荷有功功率
+  qd: '', // 负荷无功功率
+  // qd: '', // 负荷无功功率
+  // qd: '', // 负荷无功功率
 }) // 表单
 const textMap: { [key: string]: string } = {
   update: '编辑',
@@ -29,11 +35,17 @@
 } // 表头显示标题
 const btnLoading = ref(false) // 保存按钮的加载中状态
 const rules: FormRules = {
-  electricityName: [{ required: true, message: '请输入配电网名称', trigger: ['blur', 'change'] }],
-  electricityArea: [{ required: true, message: '请输入配电网区域', trigger: ['blur', 'change'] }],
-  uploader: [{ required: true, message: '请选择上传人', trigger: ['blur', 'change'] }],
-  uploadTime: [{ required: true, message: '请选择上传时间', trigger: ['blur', 'change'] }],
-  electricityDetail: [{ required: true, message: '请上传附件', trigger: ['blur', 'change'] }],
+  type: [{ required: true, message: '请选择节点类型', trigger: ['blur', 'change'] }],
+  gs: [{ required: true, message: '节点并联电导', trigger: ['blur', 'change'] }],
+  bs: [{ required: true, message: '节点并联电纳', trigger: ['blur', 'change'] }],
+  area: [{ required: true, message: '母线断面号', trigger: ['blur', 'change'] }],
+  vm: [{ required: true, message: '节点电压初始幅值', trigger: ['blur', 'change'] }],
+  va: [{ required: true, message: '节点电压初始相位角', trigger: ['blur', 'change'] }],
+  zone: [{ required: true, message: '母线省损耗区域', trigger: ['blur', 'change'] }],
+  vmax: [{ required: true, message: '节点最大电压', trigger: ['blur', 'change'] }],
+  vmin: [{ required: true, message: '节点最小电压', trigger: ['blur', 'change'] }],
+  pd: [{ required: true, message: '负荷有功功率', trigger: ['blur', 'change'] }],
+  qd: [{ required: true, message: '负荷无功功率', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 // 获取用户列表
 const userList = ref<any[]>([])
@@ -46,12 +58,17 @@
 // 重置表单
 const resetForm = () => {
   areaForm.value = {
-    electricityName: '', // 配电网名称
-    electricityArea: '', // 配电网区域
-    uploaderName: '', // 上传人+
-    uploader: '',
-    uploadTime: '', // 上传时间
-    electricityDetail: '',
+    type: '', // 节点类型
+    gs: '', // 节点并联电导
+    bs: '', // 节点并联电纳
+    area: '', // 母线断面号
+    vm: '', // 节点电压初始幅值
+    va: '', // 节点电压初始相位角
+    zone: '', // 母线省损耗区域
+    vmax: '', // 节点最大电压
+    vmin: '', // 节点最小电压
+    pd: '', // 负荷有功功率
+    qd: '', // 负荷无功功率
   }
 }
 const deviceTypeList = ref([])
@@ -80,9 +97,8 @@
 const createData = () => {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
-      areaForm.value.uploadTime = dayjs().format('YYYY-MM-DD')
       btnLoading.value = true
-      addElectricityList(areaForm.value).then((response) => {
+      electricityNodeAdd(areaForm.value).then((response) => {
         if (response.code === 200) {
           btnLoading.value = false
           // 通知父组件刷新状态
@@ -106,9 +122,8 @@
 const updateData = () => {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
-      areaForm.value.uploadTime = dayjs().format('YYYY-MM-DD')
       btnLoading.value = true
-      updateElectricityList(areaForm.value).then((response) => {
+      electricityNodeUpdate(areaForm.value).then((response) => {
         if (response.code === 200) {
           ElMessage({
             message: '修改成功',
@@ -168,91 +183,89 @@
   <el-dialog v-model="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
     <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="160px">
       <el-col :span="20">
-        <el-form-item label="节点类型" prop="deviceId">
-          <el-select v-model="areaForm.electricityName" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择节点类型' : ''" style="width: 100%;">
-            <el-option
-              v-for="item in []"
-              :key="item.id"
-              :label="item.deviceName"
-              :value="item.id"
-            />
+        <el-form-item label="节点类型">
+          <el-select
+            v-model="areaForm.type" class="m-2"
+            :placeholder="dialogStatus === 'create' ? '请选择节点类型' : ''" style="width: 100%;"
+          >
+            <el-option v-for="item in []" :key="item.id" :label="item.deviceName" :value="item.id" />
           </el-select>
         </el-form-item>
       </el-col>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点并联电导:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入节点并联电导' : ''" />
+          <el-form-item label="节点并联电导:" prop="gs">
+            <el-input v-model="areaForm.gs" :placeholder="dialogStatus === 'create' ? '请输入节点并联电导' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点并联电纳:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入节点并联电纳' : ''" />
+          <el-form-item label="节点并联电纳:" prop="bs">
+            <el-input v-model="areaForm.bs" :placeholder="dialogStatus === 'create' ? '请输入节点并联电纳' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="母线断面号:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入母线断面号' : ''" />
+          <el-form-item label="母线断面号:" prop="area">
+            <el-input v-model="areaForm.area" :placeholder="dialogStatus === 'create' ? '请输入母线断面号' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点电压初始幅值:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入节点电压初始幅值' : ''" />
+          <el-form-item label="节点电压初始幅值:" prop="vm">
+            <el-input v-model="areaForm.vm" :placeholder="dialogStatus === 'create' ? '请输入节点电压初始幅值' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点电压初始相位角:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入节点电压初始相位角' : ''" />
+          <el-form-item label="节点电压初始相位角:" prop="va">
+            <el-input v-model="areaForm.va" :placeholder="dialogStatus === 'create' ? '请输入节点电压初始相位角' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="母线省损耗区域:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入母线省损耗区域' : ''" />
+          <el-form-item label="母线省损耗区域:" prop="zone">
+            <el-input v-model="areaForm.zone" :placeholder="dialogStatus === 'create' ? '请输入母线省损耗区域' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点最大电压:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入节点最大电压' : ''" />
+          <el-form-item label="节点最大电压:" prop="vmax">
+            <el-input v-model="areaForm.vmax" :placeholder="dialogStatus === 'create' ? '请输入节点最大电压' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点最小电压:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入节点最小电压' : ''" />
+          <el-form-item label="节点最小电压:" prop="vmin">
+            <el-input v-model="areaForm.vmin" :placeholder="dialogStatus === 'create' ? '请输入节点最小电压' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="负荷有功功率:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入负荷有功功率' : ''" />
+          <el-form-item label="负荷有功功率:" prop="pd">
+            <el-input v-model="areaForm.pd" :placeholder="dialogStatus === 'create' ? '请输入负荷有功功率' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="负荷无功功率:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入负荷无功功率' : ''" />
+          <el-form-item label="负荷无功功率:" prop="qd">
+            <el-input v-model="areaForm.qd" :placeholder="dialogStatus === 'create' ? '请输入负荷无功功率' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
+      <!-- <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点碳势:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入节点碳势' : ''" />
+          <el-form-item label="节点碳势:" prop="qd">
+            <el-input v-model="areaForm.qd" :placeholder="dialogStatus === 'create' ? '请输入节点碳势' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -262,7 +275,7 @@
             <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入负荷碳流率' : ''" />
           </el-form-item>
         </el-col>
-      </el-row>
+      </el-row> -->
     </el-form>
     <template #footer>
       <div class="dialog-footer">
diff --git a/src/views/data/electricity/components/networkBranch.vue b/src/views/data/electricity/components/networkBranch.vue
index 8d137c0..c1eced0 100644
--- a/src/views/data/electricity/components/networkBranch.vue
+++ b/src/views/data/electricity/components/networkBranch.vue
@@ -6,11 +6,16 @@
 <script lang="ts" setup name="networkBranch">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import editList from './branchAdd.vue'
+import { electricityBranch } from '@/api/api/index'
 const props = defineProps({
   bak: {
     type: Function,
     required: true,
   },
+  id: {
+    type: String,
+    required: true,
+  },
 })
 const bak = () => {
   props.bak(1)
@@ -27,55 +32,31 @@
 const TimeRanges = ref()
 const loadingTable = ref(true)
 const columns = ref([
-  // { text: '设备类型', value: 'deviceTypeName', align: 'center' },
-  // { text: '设备编号', value: 'deviceNo', align: 'center' },
-  // { text: '安装位置', value: 'installLocaltion', align: 'center' },
-  // { text: '电量/V', value: 'electricalVoltage', align: 'center' },
-  // { text: '功率/W', value: 'power', align: 'center' },
-  // { text: '上传时间', value: 'uploadTime', align: 'center' },
-  { text: '支路首端节点', value: '1', align: 'center' },
-  { text: '支路末端节点', value: '2', align: 'center' },
-  { text: '支路电阻标幺值', value: '3', align: 'center' },
-  { text: '支路电纳标幺值', value: '4', align: 'center' },
-  { text: '长距离输电容量', value: '5', align: 'center' },
-  { text: '短距离输电容量', value: '7', align: 'center' },
-  { text: '紧急距离输电容量', value: '8', align: 'center' },
-  { text: '支路变比', value: '9', align: 'center' },
-  { text: '角度', value: '10', align: 'center' },
-  { text: '支路是否运行', value: '11', align: 'center' },
-  { text: '支路最小相位角', value: '12', align: 'center' },
-  { text: '支路碳流率', value: '13', align: 'center' },
+  { text: '支路首端节点', value: 'fbusId', align: 'center' },
+  { text: '支路末端节点', value: 'tbusId', align: 'center' },
+  { text: '支路电阻标幺值', value: 'r', align: 'center' },
+  { text: '支路电纳标幺值', value: 'b', align: 'center' },
+  { text: '长距离输电容量', value: 'ratea', align: 'center' },
+  { text: '短距离输电容量', value: 'rateb', align: 'center' },
+  { text: '紧急距离输电容量', value: 'ratec', align: 'center' },
+  { text: '支路变比', value: 'ratio', align: 'center' },
+  { text: '角度', value: 'angle', align: 'center' },
+  { text: '支路是否运行', value: 'status2', align: 'center' },
+  { text: '支路最小相位角', value: 'angmin', align: 'center' },
+  { text: '支路碳流率', value: 'angmax', align: 'center' },
 ]) // 表格
 const total = ref<number>(0)
 const list = ref<any[]>([])
 // 获取数据列表
 const fetchDataList = () => {
-  // loadingTable.value = true
-  // getMonitorStation(searchQuery).then((res) => {
-  //   list.value = res.data.rows
-  //   total.value = res.data.total
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      1: 22,
-      2: '23',
-      3: 100,
-      4: 100,
-      5: '220',
-      7: 220,
-      8: 110,
-      9: 1,
-      10: 90,
-      11: '是',
-      12: 10,
-      13: '12%',
-    },
-
-  ]
-  total.value = list.value.length
-  loadingTable.value = false
+  loadingTable.value = true
+  electricityBranch(props.id).then((res) => {
+    list.value = res.data.map(item => item.branchNodeInfos[0])
+    total.value = res.data.length
+    loadingTable.value = false
+  })
 }
+fetchDataList()
 // 搜索
 const search = () => {
   fetchDataList()
@@ -128,9 +109,6 @@
 const multiSelect = (row: any[]) => {
   selectList.value = row
 }
-onMounted(() => {
-  search()
-})
 </script>
 
 <template>
diff --git a/src/views/data/electricity/components/networkBusbar.vue b/src/views/data/electricity/components/networkBusbar.vue
index 5386ea1..c1eb19d 100644
--- a/src/views/data/electricity/components/networkBusbar.vue
+++ b/src/views/data/electricity/components/networkBusbar.vue
@@ -6,10 +6,15 @@
 <script lang="ts" setup name="networkBusbar">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import editList from './busbarAdd.vue'
+import { electricityNode, electricityNodeDelete } from '@/api/api/index'
 const props = defineProps({
   bak: {
     type: Function,
-    default: () => {},
+    default: () => { },
+  },
+  id: {
+    type: String,
+    required: true,
   },
 })
 const bak = () => {
@@ -27,55 +32,30 @@
 const TimeRanges = ref()
 const loadingTable = ref(true)
 const columns = ref([
-  // { text: '设备类型', value: 'deviceTypeName', align: 'center' },
-  // { text: '设备编号', value: 'deviceNo', align: 'center' },
-  // { text: '安装位置', value: 'installLocaltion', align: 'center' },
-  // { text: '电量/V', value: 'electricalVoltage', align: 'center' },
-  // { text: '功率/W', value: 'power', align: 'center' },
-  // { text: '上传时间', value: 'uploadTime', align: 'center' },
-  { text: '节点类型', value: '1', align: 'center' },
-  { text: '节点并联电导', value: '2', align: 'center' },
-  { text: '节点并联电纳', value: '3', align: 'center' },
-  { text: '母线断面号', value: '4', align: 'center' },
-  { text: '节点电压初始幅值', value: '5', align: 'center' },
-  { text: '节点电压初始相位角', value: '6', align: 'center' },
-  { text: '母线省损耗区域', value: '7', align: 'center' },
-  { text: '节点最大电压', value: '8', align: 'center' },
-  { text: '节点最小电压', value: '9', align: 'center' },
-  { text: '负荷有功功率', value: '10', align: 'center' },
-  { text: '负荷无功功率', value: '11', align: 'center' },
-  { text: '节点碳势', value: '12', align: 'center' },
-  { text: '负荷碳流率', value: '13', align: 'center' },
+  { text: '节点类型', value: 'type', align: 'center' },
+  { text: '节点并联电导', value: 'gs', align: 'center' },
+  { text: '节点并联电纳', value: 'bs', align: 'center' },
+  { text: '母线断面号', value: 'area', align: 'center' },
+  { text: '节点电压初始幅值', value: 'vm', align: 'center' },
+  { text: '节点电压初始相位角', value: 'va', align: 'center' },
+  { text: '母线省损耗区域', value: 'zone', align: 'center' },
+  { text: '节点最大电压', value: 'vmax', align: 'center' },
+  { text: '节点最小电压', value: 'vmin', align: 'center' },
+  { text: '负荷有功功率', value: 'pd', align: 'center' },
+  { text: '负荷无功功率', value: 'qd', align: 'center' },
+  { text: '节点碳势', value: 'en', align: 'center' },
+  { text: '负荷碳流率', value: 'flowRate', align: 'center' },
 ]) // 表格
 const total = ref<number>(0)
 const list = ref<any[]>([])
 // 获取数据列表
 const fetchDataList = () => {
-  // loadingTable.value = true
-  // getMonitorStation(searchQuery).then((res) => {
-  //   list.value = res.data.rows
-  //   total.value = res.data.total
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      1: '类型1',
-      2: '1',
-      3: '1',
-      4: '1',
-      5: '100',
-      6: '90',
-      7: 'C',
-      8: '220',
-      9: '110',
-      10: '1100',
-      11: '1100',
-      12: '低',
-      13: '1',
-    },
-  ]
-  total.value = list.value.length
-  loadingTable.value = false
+  loadingTable.value = true
+  electricityNode(props.id).then((res) => {
+    list.value = res.data
+    total.value = res.data.length
+    loadingTable.value = false
+  })
 }
 // 搜索
 const search = () => {

diff --git a/src/api/api/index.ts b/src/api/api/index.ts
index 4a6cf27..0af6bf9 100644
--- a/src/api/api/index.ts
+++ b/src/api/api/index.ts
@@ -110,13 +110,43 @@
     method: 'post',
   })
 }
-// 配电网节点查询
+// 配电网节点查询 / 母线参数
 export function electricityNode(id: any) {
   return request({
     url: `/electricityNode/list?electricityId=${id}`,
     method: 'get',
   })
 }
+// 母线参数新增
+export function electricityNodeAdd(data: object) {
+  return request({
+    url: '/electricityNode/add',
+    method: 'post',
+    data,
+  })
+}
+// 母线参数修改
+export function electricityNodeUpdate(data: object) {
+  return request({
+    url: '/electricityNode/update',
+    method: 'post',
+    data,
+  })
+}
+// 母线参数删除
+export function electricityNodeDelete(id: string) {
+  return request({
+    url: `/electricityNode/delete?id=${id}`,
+    method: 'post',
+  })
+}
+// 配电网支路查询
+export function electricityBranch(id: any) {
+  return request({
+    url: `/branchNodeInfo/branchList?electricityId=${id}`,
+    method: 'get',
+  })
+}
 // 光伏/楼宇/电动车管理列表
 export function getMonitorStation(params: any) {
   return request({
@@ -125,6 +155,13 @@
     params,
   })
 }
+// 光伏列表 - 不分页
+export function getMonitorStationList() {
+  return request({
+    url: '/monitorStation/list',
+    method: 'get',
+  })
+}
 // 添加 光伏/楼宇/电动车管
 export function addMonitorStation(data: any) {
   return request({
diff --git a/src/components.d.ts b/src/components.d.ts
index 1bd3d1b..5c3eb2a 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -40,6 +40,8 @@
     ImagePreview: typeof import('./components/ImagePreview/index.vue')['default']
     ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default']
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
+    InfoWindow: typeof import('./components/map/infoWindow.vue')['default']
+    InfoWindow2: typeof import('./components/map/infoWindow2.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     Map: typeof import('./components/map/index.vue')['default']
     MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index a5c8ec3..00994da 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -5,7 +5,9 @@
  -->
 <script lang="ts" setup name="GuadMap">
 import AMapLoader from '@amap/amap-jsapi-loader'
-import { electricityNode, getElectricityListAll } from '@/api/api/index'
+import infoDetail from './infoWindow.vue'
+import infoDetail2 from './infoWindow2.vue'
+import { electricityBranch, electricityNode, getElectricityListAll, getMonitorStationList } from '@/api/api/index'
 // 设置安全密钥
 window._AMapSecurityConfig = {
   securityJsCode: '56bf9671d4b3517d294caec4751889a1', // 后期需替换
@@ -24,10 +26,19 @@
   [111.739906, 40.83686],
   [111.739906, 40.83386],
 ])
-// 区域点数组
+// 电网节点数组
 const markerArr = ref([
 ])
+// 光伏数组
+const markerArr1 = ref([
+])
+// 信息窗体
+const infoWindow = ref()
+const infoWindow2 = ref()
+const windowInfoRef = ref()
+const windowInfoRef2 = ref()
 const markerArrInfo = ref()
+const markerArrInfo1 = ref()
 // 折现节点坐标
 const lineArr = ref([])
 // 初始化地图
@@ -35,14 +46,15 @@
   AMapLoader.load({
     key: '40849e82b4e33f5255b17372520c954d', // 后期需替换
     version: '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
-    plugins: ['AMap.Scale', 'AMap.MouseTool'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
+    plugins: ['AMap.Scale', 'AMap.MouseTool', 'AMap.ToolBar'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
   })
     .then((AMap) => {
       // 初始化地图
       map.value = new AMap.Map('map', {
-        viewMode: '2D', //  是否为3D地图模式
+        viewMode: '3D', //  是否为3D地图模式
         zoom: 17, // 初始化地图级别
-        center: markerArr.value[0],
+        // center: markerArr.value[0],
+        center: [116.26755900, 39.91547100],
         resizeEnable: true,
       })
       // 用来画区域的
@@ -78,7 +90,7 @@
       //   }
       //   console.log(arr)// 121.540994,29.870174;121.55138,29.858116;121.55756,29.874193;
       // })
-      // 标记点绘制
+      // 电网支路标记点绘制
       for (let i = 0; i < markerArr.value.length; i++) {
         const icon = new AMap.Icon({
           size: new AMap.Size(36, 36), // 图标尺寸
@@ -87,58 +99,213 @@
           imageSize: new AMap.Size(24, 30), // 根据所设置的大小拉伸或压缩图片
           imageOffset: new AMap.Pixel(0, 0), // 图像相对展示区域的偏移量，适于雪碧图等
         })
-        // const content = '<div>111</div>'
         const marker = new AMap.Marker({
           position: markerArr.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
           map: map.value,
           title: '测试坐标',
           icon,
-          offset: new AMap.Pixel(-20, -20),
+          offset: new AMap.Pixel(3, -30),
+        })
+        // 支路点详细信息// 信息窗体
+        infoWindow.value = new AMap.InfoWindow({
+          isCustom: true, // 自定义信息窗体
+          content: windowInfoRef.value.$el, // 窗体内容(vue组件)
+          offset: new AMap.Pixel(9, -5), // 偏移
+        })
+        marker.on('click', (e) => {
+          // 打开信息窗口
+          // infoWindow.value.setContent(e.target.content)
+          infoWindow.value.open(map.value, e.lnglat)
+          // 初始化信息窗口
+          windowInfoRef.value.initialize({
+            overlay: e.target,
+            infoWindow: infoWindow.value,
+            info: markerArrInfo.value[i],
+          })
         })
         marker.setLabel({
           offset: new AMap.Pixel(-10, -2), // 设置文本标注偏移量
-          content: `<div>${markerArrInfo.value[i].busId}</div>`, // 设置文本标注内容
+          content: `<div>${markerArrInfo.value[i].nodeName}</div>`, // 设置文本标注内容
           direction: 'right', // 设置文本标注方位
         })
         map.value.add([marker])
-        // 标记点文本
-        // 自动适应显示想显示的范围区域
-        // map.value.setFitView()
       }
-      // 折现(
-      // 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)
+      // 光伏标记点及光伏绘制
+      for (let i = 0; i < markerArr1.value.length; i++) {
+        const icon = new AMap.Icon({
+          size: new AMap.Size(36, 36), // 图标尺寸
+          image: 'http://111.198.10.15:11404/imgs/2.png', // Icon的图像
+          imageSize: new AMap.Size(24, 30), // 根据所设置的大小拉伸或压缩图片
+          imageOffset: new AMap.Pixel(0, 0), // 图像相对展示区域的偏移量，适于雪碧图等
+        })
+        // const content = '<div>111</div>'
+        const marker = new AMap.Marker({
+          position: markerArr1.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+          map: map.value,
+          title: '测试坐标',
+          icon,
+          offset: new AMap.Pixel(-20, -20),
+        })
+        // 信息窗体
+        infoWindow2.value = new AMap.InfoWindow({
+          isCustom: true, // 自定义信息窗体
+          content: windowInfoRef2.value.$el, // 窗体内容(vue组件)
+          offset: new AMap.Pixel(9, -5), // 偏移
+        })
+        marker.on('click', (e) => {
+          // 打开信息窗口
+          infoWindow2.value.open(map.value, e.lnglat)
+          // infoWindow2.value.setContent(e.target)
+          // 初始化信息窗口
+          windowInfoRef2.value.initialize({
+            overlay: e.target,
+            infoWindow: infoWindow2.value,
+            info: markerArrInfo1.value[i],
+          })
+        })
+        marker.setLabel({
+          offset: new AMap.Pixel(-10, -2), // 设置文本标注偏移量
+          content: `<div>${markerArrInfo1.value[i].stationName}</div>`, // 设置文本标注内容
+          direction: 'right', // 设置文本标注方位
+        })
+        map.value.add([marker])
+        // 绘制电网和节点连线
+        const path = markerArrInfo1.value.map((item) => {
+          return [[Number(item.lng), Number(item.lat)], [Number(item.nodeLng), Number(item.nodeLat)]]
+        })
+        const polyline = new AMap.Polyline({
+          path,
+          strokeColor: '#03A382',
+          strokeStyle: 'dashed',
+          strokeDasharray: [10, 3],
+          lineJoin: 'round',
+          lineCap: 'round',
+          zIndex: 50,
+          zooms: [16, 20],
+        })
+        polyline.setMap(map.value)
+        map.value.add(polyline)
+      }
+      // 电网支路折线绘制
+      for (let i = 0; i < lineArr.value.length; i++) {
+        // console.log(lineArr.value[i])
+        const path = lineArr.value.map(item => item.branchNodeInfos)
+        const line = path.map(item => (
+          item.map((child) => {
+            return ([[child.flng, child.flat], [child.tlng, child.tlat], child.status2])
+          })
+        ))
+        line.forEach((item) => {
+          item.forEach((child) => {
+            const path = [child[0], child[1]]
+            const polyline = new AMap.Polyline({
+              path,
+              // isOutline: true,
+              strokeColor: child[2] === 1 ? '#008d68' : '#000',
+              // strokeOpacity: 1,
+              strokeWeight: 3,
+              // 折线样式还支持 'dashed'
+              strokeStyle: child[2] !== 1 ? 'dashed' : 'dashed ',
+              // strokeStyle是dashed时有效
+              strokeDasharray: [10, 3],
+              lineJoin: 'round',
+              showDir: child[2] === 1,
+              // lineCap: 'square',
+              lineCap: 'round',
+              zIndex: 50,
+              zooms: [16, 20],
+
+            })
+            polyline.setMap(map.value)
+            map.value.add(polyline)
+          })
+        })
+        // 添加支路折线文本
+        // 创建纯文本标记
+        const textArr = path.map(item => (
+          item.map((child) => {
+            return ([[(Number(child.flng) + Number(child.tlng)) / 2, (Number(child.flat) + Number(child.tlat)) / 2], child.flowRate])
+          })
+        ))
+        textArr.forEach((item) => {
+          // console.log(item, 'item')
+          item.forEach((child) => {
+            const icon = new AMap.Icon({
+              size: new AMap.Size(36, 36), // 图标尺寸
+              // image: '', // Icon的图像
+              imageSize: new AMap.Size(24, 30), // 根据所设置的大小拉伸或压缩图片
+              imageOffset: new AMap.Pixel(0, 0), // 图像相对展示区域的偏移量，适于雪碧图等
+            })
+            // const content = '<div>111</div>'
+            const marker = new AMap.Marker({
+              position: child[0], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+              map: map.value,
+              content: '<span></span>',
+              offset: new AMap.Pixel(-20, -20),
+            })
+            marker.setLabel({
+              offset: new AMap.Pixel(-10, -2), // 设置文本标注偏移量
+              content: `<div>${`${child[1]}kgCO2/h`}</div>`, // 设置文本标注内容
+              direction: 'right', // 设置文本标注方位
+            })
+            map.value.add([marker])
+          })
+        })
+      }
     })
     .catch((e) => {
       console.log(e)
     })
 }
-onMounted(() => {
-  getElectricityListAll().then((res) => {
+onMounted(async () => {
+  // 获取电网列表
+  try {
+    const list = await getElectricityListAll()
     // 电网列表
-    electricityList.value = res.data
-    // 默认选中第一个查询节点
+    electricityList.value = list.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()
-      })
+      const res = await electricityNode(electricityList.value[0].id)
+      markerArr.value = res.data.map(item => ([Number(item.lng), Number(item.lat)]))
+      markerArrInfo.value = res.data
+      // 获取支路信息(折线)
+      const res1 = await electricityBranch(electricityList.value[0].id)
+      lineArr.value = res1.data
     }
-  })
+    // 获取光伏列表
+    const list1 = await getMonitorStationList()
+    markerArr1.value = list1.data.map(item => ([Number(item.lng), Number(item.lat)]))
+    markerArrInfo1.value = list1.data
+    // 初始化地图
+    initMap()
+  }
+  catch (error) {
+    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
+  //       // 获取支路
+  //       electricityBranch(electricityList.value[0].id).then(res => {
+  //         lineArr.value = res.data
+  //         // console.log(res.data)
+  //         initMap()
+  //       })
+  //     })
+  //   }
+  // })
 })
 </script>
 
 <template>
   <div id="map" />
+  <info-detail ref="windowInfoRef" />
+  <info-detail2 ref="windowInfoRef2" />
 </template>
 
 <style scoped>
diff --git a/src/components/map/infoWindow.vue b/src/components/map/infoWindow.vue
new file mode 100644
index 0000000..1df9061
--- /dev/null
+++ b/src/components/map/infoWindow.vue
@@ -0,0 +1,83 @@
+<!--
+  Description: 高德地图信息窗体 - 支路节点
+  Author: 李亚光
+  Date: 2023-05-10
+ -->
+<script lang="ts" setup name="infoWindow">
+const overlay = ref()
+const infoWindow = ref()
+const info = ref()
+// 初始化
+const initialize = (e) => {
+  overlay.value = e.overlay
+  infoWindow.value = e.infoWindow
+  info.value = e.info
+}
+defineExpose({ initialize })
+// 关闭
+const close = () => {
+  infoWindow.value.close()
+}
+</script>
+
+<template>
+  <div class="container">
+    <div class="title">
+      <div class="text">
+        {{ info?.nodeName }}
+      </div>
+      <div class="close" @click="close">
+        x
+      </div>
+    </div>
+    <div class="item">
+      节点编号 : {{ info?.busId }}
+    </div>
+    <div class="item">
+      <span>负荷有功功率 : {{ info?.pd }}</span>  <span>负荷无功功率 : {{ info?.qd }}</span>
+    </div>
+    <div class="item">
+      <span>节点碳势 : {{ info?.en }}</span>  <span>节点负荷碳流率 : {{ info?.flowRate }}</span>
+    </div>
+    <!-- // <div class="item">设备信息 : {{ device.produceCode }}</div>
+    // <div class="item">设备ID : {{ device.deviceId }}</div>
+    // <div class="item">IP地址 : {{ device.deviceIp }}</div>
+    // <div class="item">地址 : {{ device.deviceAddress }}</div> -->
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  width: 340px;
+  height: 140px;
+  padding: 10px;
+  background-color: #fff;
+  border: 1px solid #6d9ece;
+
+  .title {
+    font-size: 16px;
+    font-weight: 700;
+    padding: 0 10px;
+    display: flex;
+    justify-content: space-between;
+
+    .close {
+      color: #ccc;
+
+      &:hover {
+        cursor: pointer;
+      }
+    }
+  }
+
+  .item {
+    padding: 0 5px;
+    color: #111213;
+    font-size: 14px;
+    margin: 10px;
+    border-bottom: 1px solid #ccc;
+    display: flex;
+    justify-content: space-between;
+  }
+}
+</style>
diff --git a/src/components/map/infoWindow2.vue b/src/components/map/infoWindow2.vue
new file mode 100644
index 0000000..407e288
--- /dev/null
+++ b/src/components/map/infoWindow2.vue
@@ -0,0 +1,80 @@
+<!--
+  Description: 高德地图信息窗体 - 光伏节点
+  Author: 李亚光
+  Date: 2023-05-10
+ -->
+<script lang="ts" setup name="infoWindow">
+const overlay = ref()
+const infoWindow = ref()
+const info = ref()
+// 初始化
+const initialize = (e) => {
+  overlay.value = e.overlay
+  infoWindow.value = e.infoWindow
+  info.value = e.info
+  console.log(e, '123')
+}
+defineExpose({ initialize })
+// 关闭
+const close = () => {
+  infoWindow.value.close()
+}
+</script>
+
+<template>
+  <div class="container">
+    <div class="title">
+      <div class="text">
+        {{ info?.stationName }}
+      </div>
+      <div class="close" @click="close">
+        x
+      </div>
+    </div>
+    <div class="item">
+      光伏挂载节点 : {{ info?.nodeId }}
+    </div>
+    <div class="item">
+      <span>发电机组有功 : {{ info?.pg }}</span>  <span>发电机组无功 : {{ info?.qg }}</span>
+    </div>
+    <div class="item">
+      碳排强度 : {{ info?.strength }}
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  width: 340px;
+  height: 140px;
+  padding: 10px;
+  background-color: #fff;
+  border: 1px solid #6d9ece;
+
+  .title {
+    font-size: 16px;
+    font-weight: 700;
+    padding: 0 10px;
+    display: flex;
+    justify-content: space-between;
+
+    .close {
+      color: #ccc;
+
+      &:hover {
+        cursor: pointer;
+      }
+    }
+  }
+
+  .item {
+    padding: 0 5px;
+    color: #111213;
+    font-size: 14px;
+    margin: 10px;
+    border-bottom: 1px solid #ccc;
+    display: flex;
+    justify-content: space-between;
+  }
+}
+</style>
diff --git a/src/static/1.png b/src/static/1.png
new file mode 100644
index 0000000..9dca264
--- /dev/null
+++ b/src/static/1.png
Binary files differ
diff --git a/src/static/2.png b/src/static/2.png
new file mode 100644
index 0000000..0eb5760
--- /dev/null
+++ b/src/static/2.png
Binary files differ
diff --git a/src/views/data/electricity/components/busbarAdd.vue b/src/views/data/electricity/components/busbarAdd.vue
index 7f81ed6..fa5ccb8 100644
--- a/src/views/data/electricity/components/busbarAdd.vue
+++ b/src/views/data/electricity/components/busbarAdd.vue
@@ -7,8 +7,7 @@
 import type { FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
-import showPhoto from './showPhoto.vue'
-import { addElectricityList, updateElectricityList, uploadApi } from '@/api/api/index'
+import { electricityNodeAdd, electricityNodeUpdate } from '@/api/api/index'
 import { getUserList } from '@/api/system/user'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
@@ -16,12 +15,19 @@
 const dialogStatus = ref('') // 对话框类型：create,update
 const isEditMode = ref(true)
 const areaForm = ref({
-  electricityName: '', // 配电网名称
-  electricityArea: '', // 配电网区域
-  uploaderName: '', // 上传人
-  uploader: '',
-  uploadTime: '', // 上传时间
-  electricityDetail: '', // 详情图片
+  type: '', // 节点类型
+  gs: '', // 节点并联电导
+  bs: '', // 节点并联电纳
+  area: '', // 母线断面号
+  vm: '', // 节点电压初始幅值
+  va: '', // 节点电压初始相位角
+  zone: '', // 母线省损耗区域
+  vmax: '', // 节点最大电压
+  vmin: '', // 节点最小电压
+  pd: '', // 负荷有功功率
+  qd: '', // 负荷无功功率
+  // qd: '', // 负荷无功功率
+  // qd: '', // 负荷无功功率
 }) // 表单
 const textMap: { [key: string]: string } = {
   update: '编辑',
@@ -29,11 +35,17 @@
 } // 表头显示标题
 const btnLoading = ref(false) // 保存按钮的加载中状态
 const rules: FormRules = {
-  electricityName: [{ required: true, message: '请输入配电网名称', trigger: ['blur', 'change'] }],
-  electricityArea: [{ required: true, message: '请输入配电网区域', trigger: ['blur', 'change'] }],
-  uploader: [{ required: true, message: '请选择上传人', trigger: ['blur', 'change'] }],
-  uploadTime: [{ required: true, message: '请选择上传时间', trigger: ['blur', 'change'] }],
-  electricityDetail: [{ required: true, message: '请上传附件', trigger: ['blur', 'change'] }],
+  type: [{ required: true, message: '请选择节点类型', trigger: ['blur', 'change'] }],
+  gs: [{ required: true, message: '节点并联电导', trigger: ['blur', 'change'] }],
+  bs: [{ required: true, message: '节点并联电纳', trigger: ['blur', 'change'] }],
+  area: [{ required: true, message: '母线断面号', trigger: ['blur', 'change'] }],
+  vm: [{ required: true, message: '节点电压初始幅值', trigger: ['blur', 'change'] }],
+  va: [{ required: true, message: '节点电压初始相位角', trigger: ['blur', 'change'] }],
+  zone: [{ required: true, message: '母线省损耗区域', trigger: ['blur', 'change'] }],
+  vmax: [{ required: true, message: '节点最大电压', trigger: ['blur', 'change'] }],
+  vmin: [{ required: true, message: '节点最小电压', trigger: ['blur', 'change'] }],
+  pd: [{ required: true, message: '负荷有功功率', trigger: ['blur', 'change'] }],
+  qd: [{ required: true, message: '负荷无功功率', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 // 获取用户列表
 const userList = ref<any[]>([])
@@ -46,12 +58,17 @@
 // 重置表单
 const resetForm = () => {
   areaForm.value = {
-    electricityName: '', // 配电网名称
-    electricityArea: '', // 配电网区域
-    uploaderName: '', // 上传人+
-    uploader: '',
-    uploadTime: '', // 上传时间
-    electricityDetail: '',
+    type: '', // 节点类型
+    gs: '', // 节点并联电导
+    bs: '', // 节点并联电纳
+    area: '', // 母线断面号
+    vm: '', // 节点电压初始幅值
+    va: '', // 节点电压初始相位角
+    zone: '', // 母线省损耗区域
+    vmax: '', // 节点最大电压
+    vmin: '', // 节点最小电压
+    pd: '', // 负荷有功功率
+    qd: '', // 负荷无功功率
   }
 }
 const deviceTypeList = ref([])
@@ -80,9 +97,8 @@
 const createData = () => {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
-      areaForm.value.uploadTime = dayjs().format('YYYY-MM-DD')
       btnLoading.value = true
-      addElectricityList(areaForm.value).then((response) => {
+      electricityNodeAdd(areaForm.value).then((response) => {
         if (response.code === 200) {
           btnLoading.value = false
           // 通知父组件刷新状态
@@ -106,9 +122,8 @@
 const updateData = () => {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
-      areaForm.value.uploadTime = dayjs().format('YYYY-MM-DD')
       btnLoading.value = true
-      updateElectricityList(areaForm.value).then((response) => {
+      electricityNodeUpdate(areaForm.value).then((response) => {
         if (response.code === 200) {
           ElMessage({
             message: '修改成功',
@@ -168,91 +183,89 @@
   <el-dialog v-model="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
     <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="160px">
       <el-col :span="20">
-        <el-form-item label="节点类型" prop="deviceId">
-          <el-select v-model="areaForm.electricityName" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择节点类型' : ''" style="width: 100%;">
-            <el-option
-              v-for="item in []"
-              :key="item.id"
-              :label="item.deviceName"
-              :value="item.id"
-            />
+        <el-form-item label="节点类型">
+          <el-select
+            v-model="areaForm.type" class="m-2"
+            :placeholder="dialogStatus === 'create' ? '请选择节点类型' : ''" style="width: 100%;"
+          >
+            <el-option v-for="item in []" :key="item.id" :label="item.deviceName" :value="item.id" />
           </el-select>
         </el-form-item>
       </el-col>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点并联电导:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入节点并联电导' : ''" />
+          <el-form-item label="节点并联电导:" prop="gs">
+            <el-input v-model="areaForm.gs" :placeholder="dialogStatus === 'create' ? '请输入节点并联电导' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点并联电纳:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入节点并联电纳' : ''" />
+          <el-form-item label="节点并联电纳:" prop="bs">
+            <el-input v-model="areaForm.bs" :placeholder="dialogStatus === 'create' ? '请输入节点并联电纳' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="母线断面号:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入母线断面号' : ''" />
+          <el-form-item label="母线断面号:" prop="area">
+            <el-input v-model="areaForm.area" :placeholder="dialogStatus === 'create' ? '请输入母线断面号' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点电压初始幅值:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入节点电压初始幅值' : ''" />
+          <el-form-item label="节点电压初始幅值:" prop="vm">
+            <el-input v-model="areaForm.vm" :placeholder="dialogStatus === 'create' ? '请输入节点电压初始幅值' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点电压初始相位角:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入节点电压初始相位角' : ''" />
+          <el-form-item label="节点电压初始相位角:" prop="va">
+            <el-input v-model="areaForm.va" :placeholder="dialogStatus === 'create' ? '请输入节点电压初始相位角' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="母线省损耗区域:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入母线省损耗区域' : ''" />
+          <el-form-item label="母线省损耗区域:" prop="zone">
+            <el-input v-model="areaForm.zone" :placeholder="dialogStatus === 'create' ? '请输入母线省损耗区域' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点最大电压:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入节点最大电压' : ''" />
+          <el-form-item label="节点最大电压:" prop="vmax">
+            <el-input v-model="areaForm.vmax" :placeholder="dialogStatus === 'create' ? '请输入节点最大电压' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点最小电压:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入节点最小电压' : ''" />
+          <el-form-item label="节点最小电压:" prop="vmin">
+            <el-input v-model="areaForm.vmin" :placeholder="dialogStatus === 'create' ? '请输入节点最小电压' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="负荷有功功率:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入负荷有功功率' : ''" />
+          <el-form-item label="负荷有功功率:" prop="pd">
+            <el-input v-model="areaForm.pd" :placeholder="dialogStatus === 'create' ? '请输入负荷有功功率' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="负荷无功功率:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入负荷无功功率' : ''" />
+          <el-form-item label="负荷无功功率:" prop="qd">
+            <el-input v-model="areaForm.qd" :placeholder="dialogStatus === 'create' ? '请输入负荷无功功率' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
+      <!-- <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点碳势:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入节点碳势' : ''" />
+          <el-form-item label="节点碳势:" prop="qd">
+            <el-input v-model="areaForm.qd" :placeholder="dialogStatus === 'create' ? '请输入节点碳势' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -262,7 +275,7 @@
             <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入负荷碳流率' : ''" />
           </el-form-item>
         </el-col>
-      </el-row>
+      </el-row> -->
     </el-form>
     <template #footer>
       <div class="dialog-footer">
diff --git a/src/views/data/electricity/components/networkBranch.vue b/src/views/data/electricity/components/networkBranch.vue
index 8d137c0..c1eced0 100644
--- a/src/views/data/electricity/components/networkBranch.vue
+++ b/src/views/data/electricity/components/networkBranch.vue
@@ -6,11 +6,16 @@
 <script lang="ts" setup name="networkBranch">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import editList from './branchAdd.vue'
+import { electricityBranch } from '@/api/api/index'
 const props = defineProps({
   bak: {
     type: Function,
     required: true,
   },
+  id: {
+    type: String,
+    required: true,
+  },
 })
 const bak = () => {
   props.bak(1)
@@ -27,55 +32,31 @@
 const TimeRanges = ref()
 const loadingTable = ref(true)
 const columns = ref([
-  // { text: '设备类型', value: 'deviceTypeName', align: 'center' },
-  // { text: '设备编号', value: 'deviceNo', align: 'center' },
-  // { text: '安装位置', value: 'installLocaltion', align: 'center' },
-  // { text: '电量/V', value: 'electricalVoltage', align: 'center' },
-  // { text: '功率/W', value: 'power', align: 'center' },
-  // { text: '上传时间', value: 'uploadTime', align: 'center' },
-  { text: '支路首端节点', value: '1', align: 'center' },
-  { text: '支路末端节点', value: '2', align: 'center' },
-  { text: '支路电阻标幺值', value: '3', align: 'center' },
-  { text: '支路电纳标幺值', value: '4', align: 'center' },
-  { text: '长距离输电容量', value: '5', align: 'center' },
-  { text: '短距离输电容量', value: '7', align: 'center' },
-  { text: '紧急距离输电容量', value: '8', align: 'center' },
-  { text: '支路变比', value: '9', align: 'center' },
-  { text: '角度', value: '10', align: 'center' },
-  { text: '支路是否运行', value: '11', align: 'center' },
-  { text: '支路最小相位角', value: '12', align: 'center' },
-  { text: '支路碳流率', value: '13', align: 'center' },
+  { text: '支路首端节点', value: 'fbusId', align: 'center' },
+  { text: '支路末端节点', value: 'tbusId', align: 'center' },
+  { text: '支路电阻标幺值', value: 'r', align: 'center' },
+  { text: '支路电纳标幺值', value: 'b', align: 'center' },
+  { text: '长距离输电容量', value: 'ratea', align: 'center' },
+  { text: '短距离输电容量', value: 'rateb', align: 'center' },
+  { text: '紧急距离输电容量', value: 'ratec', align: 'center' },
+  { text: '支路变比', value: 'ratio', align: 'center' },
+  { text: '角度', value: 'angle', align: 'center' },
+  { text: '支路是否运行', value: 'status2', align: 'center' },
+  { text: '支路最小相位角', value: 'angmin', align: 'center' },
+  { text: '支路碳流率', value: 'angmax', align: 'center' },
 ]) // 表格
 const total = ref<number>(0)
 const list = ref<any[]>([])
 // 获取数据列表
 const fetchDataList = () => {
-  // loadingTable.value = true
-  // getMonitorStation(searchQuery).then((res) => {
-  //   list.value = res.data.rows
-  //   total.value = res.data.total
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      1: 22,
-      2: '23',
-      3: 100,
-      4: 100,
-      5: '220',
-      7: 220,
-      8: 110,
-      9: 1,
-      10: 90,
-      11: '是',
-      12: 10,
-      13: '12%',
-    },
-
-  ]
-  total.value = list.value.length
-  loadingTable.value = false
+  loadingTable.value = true
+  electricityBranch(props.id).then((res) => {
+    list.value = res.data.map(item => item.branchNodeInfos[0])
+    total.value = res.data.length
+    loadingTable.value = false
+  })
 }
+fetchDataList()
 // 搜索
 const search = () => {
   fetchDataList()
@@ -128,9 +109,6 @@
 const multiSelect = (row: any[]) => {
   selectList.value = row
 }
-onMounted(() => {
-  search()
-})
 </script>
 
 <template>
diff --git a/src/views/data/electricity/components/networkBusbar.vue b/src/views/data/electricity/components/networkBusbar.vue
index 5386ea1..c1eb19d 100644
--- a/src/views/data/electricity/components/networkBusbar.vue
+++ b/src/views/data/electricity/components/networkBusbar.vue
@@ -6,10 +6,15 @@
 <script lang="ts" setup name="networkBusbar">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import editList from './busbarAdd.vue'
+import { electricityNode, electricityNodeDelete } from '@/api/api/index'
 const props = defineProps({
   bak: {
     type: Function,
-    default: () => {},
+    default: () => { },
+  },
+  id: {
+    type: String,
+    required: true,
   },
 })
 const bak = () => {
@@ -27,55 +32,30 @@
 const TimeRanges = ref()
 const loadingTable = ref(true)
 const columns = ref([
-  // { text: '设备类型', value: 'deviceTypeName', align: 'center' },
-  // { text: '设备编号', value: 'deviceNo', align: 'center' },
-  // { text: '安装位置', value: 'installLocaltion', align: 'center' },
-  // { text: '电量/V', value: 'electricalVoltage', align: 'center' },
-  // { text: '功率/W', value: 'power', align: 'center' },
-  // { text: '上传时间', value: 'uploadTime', align: 'center' },
-  { text: '节点类型', value: '1', align: 'center' },
-  { text: '节点并联电导', value: '2', align: 'center' },
-  { text: '节点并联电纳', value: '3', align: 'center' },
-  { text: '母线断面号', value: '4', align: 'center' },
-  { text: '节点电压初始幅值', value: '5', align: 'center' },
-  { text: '节点电压初始相位角', value: '6', align: 'center' },
-  { text: '母线省损耗区域', value: '7', align: 'center' },
-  { text: '节点最大电压', value: '8', align: 'center' },
-  { text: '节点最小电压', value: '9', align: 'center' },
-  { text: '负荷有功功率', value: '10', align: 'center' },
-  { text: '负荷无功功率', value: '11', align: 'center' },
-  { text: '节点碳势', value: '12', align: 'center' },
-  { text: '负荷碳流率', value: '13', align: 'center' },
+  { text: '节点类型', value: 'type', align: 'center' },
+  { text: '节点并联电导', value: 'gs', align: 'center' },
+  { text: '节点并联电纳', value: 'bs', align: 'center' },
+  { text: '母线断面号', value: 'area', align: 'center' },
+  { text: '节点电压初始幅值', value: 'vm', align: 'center' },
+  { text: '节点电压初始相位角', value: 'va', align: 'center' },
+  { text: '母线省损耗区域', value: 'zone', align: 'center' },
+  { text: '节点最大电压', value: 'vmax', align: 'center' },
+  { text: '节点最小电压', value: 'vmin', align: 'center' },
+  { text: '负荷有功功率', value: 'pd', align: 'center' },
+  { text: '负荷无功功率', value: 'qd', align: 'center' },
+  { text: '节点碳势', value: 'en', align: 'center' },
+  { text: '负荷碳流率', value: 'flowRate', align: 'center' },
 ]) // 表格
 const total = ref<number>(0)
 const list = ref<any[]>([])
 // 获取数据列表
 const fetchDataList = () => {
-  // loadingTable.value = true
-  // getMonitorStation(searchQuery).then((res) => {
-  //   list.value = res.data.rows
-  //   total.value = res.data.total
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      1: '类型1',
-      2: '1',
-      3: '1',
-      4: '1',
-      5: '100',
-      6: '90',
-      7: 'C',
-      8: '220',
-      9: '110',
-      10: '1100',
-      11: '1100',
-      12: '低',
-      13: '1',
-    },
-  ]
-  total.value = list.value.length
-  loadingTable.value = false
+  loadingTable.value = true
+  electricityNode(props.id).then((res) => {
+    list.value = res.data
+    total.value = res.data.length
+    loadingTable.value = false
+  })
 }
 // 搜索
 const search = () => {
diff --git a/src/views/data/electricity/index.vue b/src/views/data/electricity/index.vue
index 881f988..f37ba02 100644
--- a/src/views/data/electricity/index.vue
+++ b/src/views/data/electricity/index.vue
@@ -15,12 +15,8 @@
   },
   {
     id: '1',
-    title: '设备监测',
+    title: '设备监测数据',
   },
-  // {
-  //   id: '2',
-  //   title: '电动汽车及储能',
-  // },
 ])
 const select = ref('')
 const confirm = (selectp: string) => {
@@ -41,7 +37,7 @@
     <!-- 分布式光伏 -->
     <page v-if="select === '分布式光伏'" :station-type="type" />
     <!-- 设备监测 -->
-    <device v-if="select === '设备监测'" />
+    <device v-if="select === '设备监测数据'" />
   </div>
 </template>
 

diff --git a/src/api/api/index.ts b/src/api/api/index.ts
index 4a6cf27..0af6bf9 100644
--- a/src/api/api/index.ts
+++ b/src/api/api/index.ts
@@ -110,13 +110,43 @@
     method: 'post',
   })
 }
-// 配电网节点查询
+// 配电网节点查询 / 母线参数
 export function electricityNode(id: any) {
   return request({
     url: `/electricityNode/list?electricityId=${id}`,
     method: 'get',
   })
 }
+// 母线参数新增
+export function electricityNodeAdd(data: object) {
+  return request({
+    url: '/electricityNode/add',
+    method: 'post',
+    data,
+  })
+}
+// 母线参数修改
+export function electricityNodeUpdate(data: object) {
+  return request({
+    url: '/electricityNode/update',
+    method: 'post',
+    data,
+  })
+}
+// 母线参数删除
+export function electricityNodeDelete(id: string) {
+  return request({
+    url: `/electricityNode/delete?id=${id}`,
+    method: 'post',
+  })
+}
+// 配电网支路查询
+export function electricityBranch(id: any) {
+  return request({
+    url: `/branchNodeInfo/branchList?electricityId=${id}`,
+    method: 'get',
+  })
+}
 // 光伏/楼宇/电动车管理列表
 export function getMonitorStation(params: any) {
   return request({
@@ -125,6 +155,13 @@
     params,
   })
 }
+// 光伏列表 - 不分页
+export function getMonitorStationList() {
+  return request({
+    url: '/monitorStation/list',
+    method: 'get',
+  })
+}
 // 添加 光伏/楼宇/电动车管
 export function addMonitorStation(data: any) {
   return request({
diff --git a/src/components.d.ts b/src/components.d.ts
index 1bd3d1b..5c3eb2a 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -40,6 +40,8 @@
     ImagePreview: typeof import('./components/ImagePreview/index.vue')['default']
     ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default']
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
+    InfoWindow: typeof import('./components/map/infoWindow.vue')['default']
+    InfoWindow2: typeof import('./components/map/infoWindow2.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     Map: typeof import('./components/map/index.vue')['default']
     MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index a5c8ec3..00994da 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -5,7 +5,9 @@
  -->
 <script lang="ts" setup name="GuadMap">
 import AMapLoader from '@amap/amap-jsapi-loader'
-import { electricityNode, getElectricityListAll } from '@/api/api/index'
+import infoDetail from './infoWindow.vue'
+import infoDetail2 from './infoWindow2.vue'
+import { electricityBranch, electricityNode, getElectricityListAll, getMonitorStationList } from '@/api/api/index'
 // 设置安全密钥
 window._AMapSecurityConfig = {
   securityJsCode: '56bf9671d4b3517d294caec4751889a1', // 后期需替换
@@ -24,10 +26,19 @@
   [111.739906, 40.83686],
   [111.739906, 40.83386],
 ])
-// 区域点数组
+// 电网节点数组
 const markerArr = ref([
 ])
+// 光伏数组
+const markerArr1 = ref([
+])
+// 信息窗体
+const infoWindow = ref()
+const infoWindow2 = ref()
+const windowInfoRef = ref()
+const windowInfoRef2 = ref()
 const markerArrInfo = ref()
+const markerArrInfo1 = ref()
 // 折现节点坐标
 const lineArr = ref([])
 // 初始化地图
@@ -35,14 +46,15 @@
   AMapLoader.load({
     key: '40849e82b4e33f5255b17372520c954d', // 后期需替换
     version: '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
-    plugins: ['AMap.Scale', 'AMap.MouseTool'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
+    plugins: ['AMap.Scale', 'AMap.MouseTool', 'AMap.ToolBar'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
   })
     .then((AMap) => {
       // 初始化地图
       map.value = new AMap.Map('map', {
-        viewMode: '2D', //  是否为3D地图模式
+        viewMode: '3D', //  是否为3D地图模式
         zoom: 17, // 初始化地图级别
-        center: markerArr.value[0],
+        // center: markerArr.value[0],
+        center: [116.26755900, 39.91547100],
         resizeEnable: true,
       })
       // 用来画区域的
@@ -78,7 +90,7 @@
       //   }
       //   console.log(arr)// 121.540994,29.870174;121.55138,29.858116;121.55756,29.874193;
       // })
-      // 标记点绘制
+      // 电网支路标记点绘制
       for (let i = 0; i < markerArr.value.length; i++) {
         const icon = new AMap.Icon({
           size: new AMap.Size(36, 36), // 图标尺寸
@@ -87,58 +99,213 @@
           imageSize: new AMap.Size(24, 30), // 根据所设置的大小拉伸或压缩图片
           imageOffset: new AMap.Pixel(0, 0), // 图像相对展示区域的偏移量，适于雪碧图等
         })
-        // const content = '<div>111</div>'
         const marker = new AMap.Marker({
           position: markerArr.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
           map: map.value,
           title: '测试坐标',
           icon,
-          offset: new AMap.Pixel(-20, -20),
+          offset: new AMap.Pixel(3, -30),
+        })
+        // 支路点详细信息// 信息窗体
+        infoWindow.value = new AMap.InfoWindow({
+          isCustom: true, // 自定义信息窗体
+          content: windowInfoRef.value.$el, // 窗体内容(vue组件)
+          offset: new AMap.Pixel(9, -5), // 偏移
+        })
+        marker.on('click', (e) => {
+          // 打开信息窗口
+          // infoWindow.value.setContent(e.target.content)
+          infoWindow.value.open(map.value, e.lnglat)
+          // 初始化信息窗口
+          windowInfoRef.value.initialize({
+            overlay: e.target,
+            infoWindow: infoWindow.value,
+            info: markerArrInfo.value[i],
+          })
         })
         marker.setLabel({
           offset: new AMap.Pixel(-10, -2), // 设置文本标注偏移量
-          content: `<div>${markerArrInfo.value[i].busId}</div>`, // 设置文本标注内容
+          content: `<div>${markerArrInfo.value[i].nodeName}</div>`, // 设置文本标注内容
           direction: 'right', // 设置文本标注方位
         })
         map.value.add([marker])
-        // 标记点文本
-        // 自动适应显示想显示的范围区域
-        // map.value.setFitView()
       }
-      // 折现(
-      // 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)
+      // 光伏标记点及光伏绘制
+      for (let i = 0; i < markerArr1.value.length; i++) {
+        const icon = new AMap.Icon({
+          size: new AMap.Size(36, 36), // 图标尺寸
+          image: 'http://111.198.10.15:11404/imgs/2.png', // Icon的图像
+          imageSize: new AMap.Size(24, 30), // 根据所设置的大小拉伸或压缩图片
+          imageOffset: new AMap.Pixel(0, 0), // 图像相对展示区域的偏移量，适于雪碧图等
+        })
+        // const content = '<div>111</div>'
+        const marker = new AMap.Marker({
+          position: markerArr1.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+          map: map.value,
+          title: '测试坐标',
+          icon,
+          offset: new AMap.Pixel(-20, -20),
+        })
+        // 信息窗体
+        infoWindow2.value = new AMap.InfoWindow({
+          isCustom: true, // 自定义信息窗体
+          content: windowInfoRef2.value.$el, // 窗体内容(vue组件)
+          offset: new AMap.Pixel(9, -5), // 偏移
+        })
+        marker.on('click', (e) => {
+          // 打开信息窗口
+          infoWindow2.value.open(map.value, e.lnglat)
+          // infoWindow2.value.setContent(e.target)
+          // 初始化信息窗口
+          windowInfoRef2.value.initialize({
+            overlay: e.target,
+            infoWindow: infoWindow2.value,
+            info: markerArrInfo1.value[i],
+          })
+        })
+        marker.setLabel({
+          offset: new AMap.Pixel(-10, -2), // 设置文本标注偏移量
+          content: `<div>${markerArrInfo1.value[i].stationName}</div>`, // 设置文本标注内容
+          direction: 'right', // 设置文本标注方位
+        })
+        map.value.add([marker])
+        // 绘制电网和节点连线
+        const path = markerArrInfo1.value.map((item) => {
+          return [[Number(item.lng), Number(item.lat)], [Number(item.nodeLng), Number(item.nodeLat)]]
+        })
+        const polyline = new AMap.Polyline({
+          path,
+          strokeColor: '#03A382',
+          strokeStyle: 'dashed',
+          strokeDasharray: [10, 3],
+          lineJoin: 'round',
+          lineCap: 'round',
+          zIndex: 50,
+          zooms: [16, 20],
+        })
+        polyline.setMap(map.value)
+        map.value.add(polyline)
+      }
+      // 电网支路折线绘制
+      for (let i = 0; i < lineArr.value.length; i++) {
+        // console.log(lineArr.value[i])
+        const path = lineArr.value.map(item => item.branchNodeInfos)
+        const line = path.map(item => (
+          item.map((child) => {
+            return ([[child.flng, child.flat], [child.tlng, child.tlat], child.status2])
+          })
+        ))
+        line.forEach((item) => {
+          item.forEach((child) => {
+            const path = [child[0], child[1]]
+            const polyline = new AMap.Polyline({
+              path,
+              // isOutline: true,
+              strokeColor: child[2] === 1 ? '#008d68' : '#000',
+              // strokeOpacity: 1,
+              strokeWeight: 3,
+              // 折线样式还支持 'dashed'
+              strokeStyle: child[2] !== 1 ? 'dashed' : 'dashed ',
+              // strokeStyle是dashed时有效
+              strokeDasharray: [10, 3],
+              lineJoin: 'round',
+              showDir: child[2] === 1,
+              // lineCap: 'square',
+              lineCap: 'round',
+              zIndex: 50,
+              zooms: [16, 20],
+
+            })
+            polyline.setMap(map.value)
+            map.value.add(polyline)
+          })
+        })
+        // 添加支路折线文本
+        // 创建纯文本标记
+        const textArr = path.map(item => (
+          item.map((child) => {
+            return ([[(Number(child.flng) + Number(child.tlng)) / 2, (Number(child.flat) + Number(child.tlat)) / 2], child.flowRate])
+          })
+        ))
+        textArr.forEach((item) => {
+          // console.log(item, 'item')
+          item.forEach((child) => {
+            const icon = new AMap.Icon({
+              size: new AMap.Size(36, 36), // 图标尺寸
+              // image: '', // Icon的图像
+              imageSize: new AMap.Size(24, 30), // 根据所设置的大小拉伸或压缩图片
+              imageOffset: new AMap.Pixel(0, 0), // 图像相对展示区域的偏移量，适于雪碧图等
+            })
+            // const content = '<div>111</div>'
+            const marker = new AMap.Marker({
+              position: child[0], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+              map: map.value,
+              content: '<span></span>',
+              offset: new AMap.Pixel(-20, -20),
+            })
+            marker.setLabel({
+              offset: new AMap.Pixel(-10, -2), // 设置文本标注偏移量
+              content: `<div>${`${child[1]}kgCO2/h`}</div>`, // 设置文本标注内容
+              direction: 'right', // 设置文本标注方位
+            })
+            map.value.add([marker])
+          })
+        })
+      }
     })
     .catch((e) => {
       console.log(e)
     })
 }
-onMounted(() => {
-  getElectricityListAll().then((res) => {
+onMounted(async () => {
+  // 获取电网列表
+  try {
+    const list = await getElectricityListAll()
     // 电网列表
-    electricityList.value = res.data
-    // 默认选中第一个查询节点
+    electricityList.value = list.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()
-      })
+      const res = await electricityNode(electricityList.value[0].id)
+      markerArr.value = res.data.map(item => ([Number(item.lng), Number(item.lat)]))
+      markerArrInfo.value = res.data
+      // 获取支路信息(折线)
+      const res1 = await electricityBranch(electricityList.value[0].id)
+      lineArr.value = res1.data
     }
-  })
+    // 获取光伏列表
+    const list1 = await getMonitorStationList()
+    markerArr1.value = list1.data.map(item => ([Number(item.lng), Number(item.lat)]))
+    markerArrInfo1.value = list1.data
+    // 初始化地图
+    initMap()
+  }
+  catch (error) {
+    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
+  //       // 获取支路
+  //       electricityBranch(electricityList.value[0].id).then(res => {
+  //         lineArr.value = res.data
+  //         // console.log(res.data)
+  //         initMap()
+  //       })
+  //     })
+  //   }
+  // })
 })
 </script>
 
 <template>
   <div id="map" />
+  <info-detail ref="windowInfoRef" />
+  <info-detail2 ref="windowInfoRef2" />
 </template>
 
 <style scoped>
diff --git a/src/components/map/infoWindow.vue b/src/components/map/infoWindow.vue
new file mode 100644
index 0000000..1df9061
--- /dev/null
+++ b/src/components/map/infoWindow.vue
@@ -0,0 +1,83 @@
+<!--
+  Description: 高德地图信息窗体 - 支路节点
+  Author: 李亚光
+  Date: 2023-05-10
+ -->
+<script lang="ts" setup name="infoWindow">
+const overlay = ref()
+const infoWindow = ref()
+const info = ref()
+// 初始化
+const initialize = (e) => {
+  overlay.value = e.overlay
+  infoWindow.value = e.infoWindow
+  info.value = e.info
+}
+defineExpose({ initialize })
+// 关闭
+const close = () => {
+  infoWindow.value.close()
+}
+</script>
+
+<template>
+  <div class="container">
+    <div class="title">
+      <div class="text">
+        {{ info?.nodeName }}
+      </div>
+      <div class="close" @click="close">
+        x
+      </div>
+    </div>
+    <div class="item">
+      节点编号 : {{ info?.busId }}
+    </div>
+    <div class="item">
+      <span>负荷有功功率 : {{ info?.pd }}</span>  <span>负荷无功功率 : {{ info?.qd }}</span>
+    </div>
+    <div class="item">
+      <span>节点碳势 : {{ info?.en }}</span>  <span>节点负荷碳流率 : {{ info?.flowRate }}</span>
+    </div>
+    <!-- // <div class="item">设备信息 : {{ device.produceCode }}</div>
+    // <div class="item">设备ID : {{ device.deviceId }}</div>
+    // <div class="item">IP地址 : {{ device.deviceIp }}</div>
+    // <div class="item">地址 : {{ device.deviceAddress }}</div> -->
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  width: 340px;
+  height: 140px;
+  padding: 10px;
+  background-color: #fff;
+  border: 1px solid #6d9ece;
+
+  .title {
+    font-size: 16px;
+    font-weight: 700;
+    padding: 0 10px;
+    display: flex;
+    justify-content: space-between;
+
+    .close {
+      color: #ccc;
+
+      &:hover {
+        cursor: pointer;
+      }
+    }
+  }
+
+  .item {
+    padding: 0 5px;
+    color: #111213;
+    font-size: 14px;
+    margin: 10px;
+    border-bottom: 1px solid #ccc;
+    display: flex;
+    justify-content: space-between;
+  }
+}
+</style>
diff --git a/src/components/map/infoWindow2.vue b/src/components/map/infoWindow2.vue
new file mode 100644
index 0000000..407e288
--- /dev/null
+++ b/src/components/map/infoWindow2.vue
@@ -0,0 +1,80 @@
+<!--
+  Description: 高德地图信息窗体 - 光伏节点
+  Author: 李亚光
+  Date: 2023-05-10
+ -->
+<script lang="ts" setup name="infoWindow">
+const overlay = ref()
+const infoWindow = ref()
+const info = ref()
+// 初始化
+const initialize = (e) => {
+  overlay.value = e.overlay
+  infoWindow.value = e.infoWindow
+  info.value = e.info
+  console.log(e, '123')
+}
+defineExpose({ initialize })
+// 关闭
+const close = () => {
+  infoWindow.value.close()
+}
+</script>
+
+<template>
+  <div class="container">
+    <div class="title">
+      <div class="text">
+        {{ info?.stationName }}
+      </div>
+      <div class="close" @click="close">
+        x
+      </div>
+    </div>
+    <div class="item">
+      光伏挂载节点 : {{ info?.nodeId }}
+    </div>
+    <div class="item">
+      <span>发电机组有功 : {{ info?.pg }}</span>  <span>发电机组无功 : {{ info?.qg }}</span>
+    </div>
+    <div class="item">
+      碳排强度 : {{ info?.strength }}
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  width: 340px;
+  height: 140px;
+  padding: 10px;
+  background-color: #fff;
+  border: 1px solid #6d9ece;
+
+  .title {
+    font-size: 16px;
+    font-weight: 700;
+    padding: 0 10px;
+    display: flex;
+    justify-content: space-between;
+
+    .close {
+      color: #ccc;
+
+      &:hover {
+        cursor: pointer;
+      }
+    }
+  }
+
+  .item {
+    padding: 0 5px;
+    color: #111213;
+    font-size: 14px;
+    margin: 10px;
+    border-bottom: 1px solid #ccc;
+    display: flex;
+    justify-content: space-between;
+  }
+}
+</style>
diff --git a/src/static/1.png b/src/static/1.png
new file mode 100644
index 0000000..9dca264
--- /dev/null
+++ b/src/static/1.png
Binary files differ
diff --git a/src/static/2.png b/src/static/2.png
new file mode 100644
index 0000000..0eb5760
--- /dev/null
+++ b/src/static/2.png
Binary files differ
diff --git a/src/views/data/electricity/components/busbarAdd.vue b/src/views/data/electricity/components/busbarAdd.vue
index 7f81ed6..fa5ccb8 100644
--- a/src/views/data/electricity/components/busbarAdd.vue
+++ b/src/views/data/electricity/components/busbarAdd.vue
@@ -7,8 +7,7 @@
 import type { FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
-import showPhoto from './showPhoto.vue'
-import { addElectricityList, updateElectricityList, uploadApi } from '@/api/api/index'
+import { electricityNodeAdd, electricityNodeUpdate } from '@/api/api/index'
 import { getUserList } from '@/api/system/user'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
@@ -16,12 +15,19 @@
 const dialogStatus = ref('') // 对话框类型：create,update
 const isEditMode = ref(true)
 const areaForm = ref({
-  electricityName: '', // 配电网名称
-  electricityArea: '', // 配电网区域
-  uploaderName: '', // 上传人
-  uploader: '',
-  uploadTime: '', // 上传时间
-  electricityDetail: '', // 详情图片
+  type: '', // 节点类型
+  gs: '', // 节点并联电导
+  bs: '', // 节点并联电纳
+  area: '', // 母线断面号
+  vm: '', // 节点电压初始幅值
+  va: '', // 节点电压初始相位角
+  zone: '', // 母线省损耗区域
+  vmax: '', // 节点最大电压
+  vmin: '', // 节点最小电压
+  pd: '', // 负荷有功功率
+  qd: '', // 负荷无功功率
+  // qd: '', // 负荷无功功率
+  // qd: '', // 负荷无功功率
 }) // 表单
 const textMap: { [key: string]: string } = {
   update: '编辑',
@@ -29,11 +35,17 @@
 } // 表头显示标题
 const btnLoading = ref(false) // 保存按钮的加载中状态
 const rules: FormRules = {
-  electricityName: [{ required: true, message: '请输入配电网名称', trigger: ['blur', 'change'] }],
-  electricityArea: [{ required: true, message: '请输入配电网区域', trigger: ['blur', 'change'] }],
-  uploader: [{ required: true, message: '请选择上传人', trigger: ['blur', 'change'] }],
-  uploadTime: [{ required: true, message: '请选择上传时间', trigger: ['blur', 'change'] }],
-  electricityDetail: [{ required: true, message: '请上传附件', trigger: ['blur', 'change'] }],
+  type: [{ required: true, message: '请选择节点类型', trigger: ['blur', 'change'] }],
+  gs: [{ required: true, message: '节点并联电导', trigger: ['blur', 'change'] }],
+  bs: [{ required: true, message: '节点并联电纳', trigger: ['blur', 'change'] }],
+  area: [{ required: true, message: '母线断面号', trigger: ['blur', 'change'] }],
+  vm: [{ required: true, message: '节点电压初始幅值', trigger: ['blur', 'change'] }],
+  va: [{ required: true, message: '节点电压初始相位角', trigger: ['blur', 'change'] }],
+  zone: [{ required: true, message: '母线省损耗区域', trigger: ['blur', 'change'] }],
+  vmax: [{ required: true, message: '节点最大电压', trigger: ['blur', 'change'] }],
+  vmin: [{ required: true, message: '节点最小电压', trigger: ['blur', 'change'] }],
+  pd: [{ required: true, message: '负荷有功功率', trigger: ['blur', 'change'] }],
+  qd: [{ required: true, message: '负荷无功功率', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 // 获取用户列表
 const userList = ref<any[]>([])
@@ -46,12 +58,17 @@
 // 重置表单
 const resetForm = () => {
   areaForm.value = {
-    electricityName: '', // 配电网名称
-    electricityArea: '', // 配电网区域
-    uploaderName: '', // 上传人+
-    uploader: '',
-    uploadTime: '', // 上传时间
-    electricityDetail: '',
+    type: '', // 节点类型
+    gs: '', // 节点并联电导
+    bs: '', // 节点并联电纳
+    area: '', // 母线断面号
+    vm: '', // 节点电压初始幅值
+    va: '', // 节点电压初始相位角
+    zone: '', // 母线省损耗区域
+    vmax: '', // 节点最大电压
+    vmin: '', // 节点最小电压
+    pd: '', // 负荷有功功率
+    qd: '', // 负荷无功功率
   }
 }
 const deviceTypeList = ref([])
@@ -80,9 +97,8 @@
 const createData = () => {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
-      areaForm.value.uploadTime = dayjs().format('YYYY-MM-DD')
       btnLoading.value = true
-      addElectricityList(areaForm.value).then((response) => {
+      electricityNodeAdd(areaForm.value).then((response) => {
         if (response.code === 200) {
           btnLoading.value = false
           // 通知父组件刷新状态
@@ -106,9 +122,8 @@
 const updateData = () => {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
-      areaForm.value.uploadTime = dayjs().format('YYYY-MM-DD')
       btnLoading.value = true
-      updateElectricityList(areaForm.value).then((response) => {
+      electricityNodeUpdate(areaForm.value).then((response) => {
         if (response.code === 200) {
           ElMessage({
             message: '修改成功',
@@ -168,91 +183,89 @@
   <el-dialog v-model="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
     <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="160px">
       <el-col :span="20">
-        <el-form-item label="节点类型" prop="deviceId">
-          <el-select v-model="areaForm.electricityName" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择节点类型' : ''" style="width: 100%;">
-            <el-option
-              v-for="item in []"
-              :key="item.id"
-              :label="item.deviceName"
-              :value="item.id"
-            />
+        <el-form-item label="节点类型">
+          <el-select
+            v-model="areaForm.type" class="m-2"
+            :placeholder="dialogStatus === 'create' ? '请选择节点类型' : ''" style="width: 100%;"
+          >
+            <el-option v-for="item in []" :key="item.id" :label="item.deviceName" :value="item.id" />
           </el-select>
         </el-form-item>
       </el-col>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点并联电导:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入节点并联电导' : ''" />
+          <el-form-item label="节点并联电导:" prop="gs">
+            <el-input v-model="areaForm.gs" :placeholder="dialogStatus === 'create' ? '请输入节点并联电导' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点并联电纳:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入节点并联电纳' : ''" />
+          <el-form-item label="节点并联电纳:" prop="bs">
+            <el-input v-model="areaForm.bs" :placeholder="dialogStatus === 'create' ? '请输入节点并联电纳' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="母线断面号:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入母线断面号' : ''" />
+          <el-form-item label="母线断面号:" prop="area">
+            <el-input v-model="areaForm.area" :placeholder="dialogStatus === 'create' ? '请输入母线断面号' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点电压初始幅值:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入节点电压初始幅值' : ''" />
+          <el-form-item label="节点电压初始幅值:" prop="vm">
+            <el-input v-model="areaForm.vm" :placeholder="dialogStatus === 'create' ? '请输入节点电压初始幅值' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点电压初始相位角:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入节点电压初始相位角' : ''" />
+          <el-form-item label="节点电压初始相位角:" prop="va">
+            <el-input v-model="areaForm.va" :placeholder="dialogStatus === 'create' ? '请输入节点电压初始相位角' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="母线省损耗区域:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入母线省损耗区域' : ''" />
+          <el-form-item label="母线省损耗区域:" prop="zone">
+            <el-input v-model="areaForm.zone" :placeholder="dialogStatus === 'create' ? '请输入母线省损耗区域' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点最大电压:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入节点最大电压' : ''" />
+          <el-form-item label="节点最大电压:" prop="vmax">
+            <el-input v-model="areaForm.vmax" :placeholder="dialogStatus === 'create' ? '请输入节点最大电压' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点最小电压:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入节点最小电压' : ''" />
+          <el-form-item label="节点最小电压:" prop="vmin">
+            <el-input v-model="areaForm.vmin" :placeholder="dialogStatus === 'create' ? '请输入节点最小电压' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="负荷有功功率:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入负荷有功功率' : ''" />
+          <el-form-item label="负荷有功功率:" prop="pd">
+            <el-input v-model="areaForm.pd" :placeholder="dialogStatus === 'create' ? '请输入负荷有功功率' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="负荷无功功率:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入负荷无功功率' : ''" />
+          <el-form-item label="负荷无功功率:" prop="qd">
+            <el-input v-model="areaForm.qd" :placeholder="dialogStatus === 'create' ? '请输入负荷无功功率' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
+      <!-- <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点碳势:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入节点碳势' : ''" />
+          <el-form-item label="节点碳势:" prop="qd">
+            <el-input v-model="areaForm.qd" :placeholder="dialogStatus === 'create' ? '请输入节点碳势' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -262,7 +275,7 @@
             <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入负荷碳流率' : ''" />
           </el-form-item>
         </el-col>
-      </el-row>
+      </el-row> -->
     </el-form>
     <template #footer>
       <div class="dialog-footer">
diff --git a/src/views/data/electricity/components/networkBranch.vue b/src/views/data/electricity/components/networkBranch.vue
index 8d137c0..c1eced0 100644
--- a/src/views/data/electricity/components/networkBranch.vue
+++ b/src/views/data/electricity/components/networkBranch.vue
@@ -6,11 +6,16 @@
 <script lang="ts" setup name="networkBranch">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import editList from './branchAdd.vue'
+import { electricityBranch } from '@/api/api/index'
 const props = defineProps({
   bak: {
     type: Function,
     required: true,
   },
+  id: {
+    type: String,
+    required: true,
+  },
 })
 const bak = () => {
   props.bak(1)
@@ -27,55 +32,31 @@
 const TimeRanges = ref()
 const loadingTable = ref(true)
 const columns = ref([
-  // { text: '设备类型', value: 'deviceTypeName', align: 'center' },
-  // { text: '设备编号', value: 'deviceNo', align: 'center' },
-  // { text: '安装位置', value: 'installLocaltion', align: 'center' },
-  // { text: '电量/V', value: 'electricalVoltage', align: 'center' },
-  // { text: '功率/W', value: 'power', align: 'center' },
-  // { text: '上传时间', value: 'uploadTime', align: 'center' },
-  { text: '支路首端节点', value: '1', align: 'center' },
-  { text: '支路末端节点', value: '2', align: 'center' },
-  { text: '支路电阻标幺值', value: '3', align: 'center' },
-  { text: '支路电纳标幺值', value: '4', align: 'center' },
-  { text: '长距离输电容量', value: '5', align: 'center' },
-  { text: '短距离输电容量', value: '7', align: 'center' },
-  { text: '紧急距离输电容量', value: '8', align: 'center' },
-  { text: '支路变比', value: '9', align: 'center' },
-  { text: '角度', value: '10', align: 'center' },
-  { text: '支路是否运行', value: '11', align: 'center' },
-  { text: '支路最小相位角', value: '12', align: 'center' },
-  { text: '支路碳流率', value: '13', align: 'center' },
+  { text: '支路首端节点', value: 'fbusId', align: 'center' },
+  { text: '支路末端节点', value: 'tbusId', align: 'center' },
+  { text: '支路电阻标幺值', value: 'r', align: 'center' },
+  { text: '支路电纳标幺值', value: 'b', align: 'center' },
+  { text: '长距离输电容量', value: 'ratea', align: 'center' },
+  { text: '短距离输电容量', value: 'rateb', align: 'center' },
+  { text: '紧急距离输电容量', value: 'ratec', align: 'center' },
+  { text: '支路变比', value: 'ratio', align: 'center' },
+  { text: '角度', value: 'angle', align: 'center' },
+  { text: '支路是否运行', value: 'status2', align: 'center' },
+  { text: '支路最小相位角', value: 'angmin', align: 'center' },
+  { text: '支路碳流率', value: 'angmax', align: 'center' },
 ]) // 表格
 const total = ref<number>(0)
 const list = ref<any[]>([])
 // 获取数据列表
 const fetchDataList = () => {
-  // loadingTable.value = true
-  // getMonitorStation(searchQuery).then((res) => {
-  //   list.value = res.data.rows
-  //   total.value = res.data.total
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      1: 22,
-      2: '23',
-      3: 100,
-      4: 100,
-      5: '220',
-      7: 220,
-      8: 110,
-      9: 1,
-      10: 90,
-      11: '是',
-      12: 10,
-      13: '12%',
-    },
-
-  ]
-  total.value = list.value.length
-  loadingTable.value = false
+  loadingTable.value = true
+  electricityBranch(props.id).then((res) => {
+    list.value = res.data.map(item => item.branchNodeInfos[0])
+    total.value = res.data.length
+    loadingTable.value = false
+  })
 }
+fetchDataList()
 // 搜索
 const search = () => {
   fetchDataList()
@@ -128,9 +109,6 @@
 const multiSelect = (row: any[]) => {
   selectList.value = row
 }
-onMounted(() => {
-  search()
-})
 </script>
 
 <template>
diff --git a/src/views/data/electricity/components/networkBusbar.vue b/src/views/data/electricity/components/networkBusbar.vue
index 5386ea1..c1eb19d 100644
--- a/src/views/data/electricity/components/networkBusbar.vue
+++ b/src/views/data/electricity/components/networkBusbar.vue
@@ -6,10 +6,15 @@
 <script lang="ts" setup name="networkBusbar">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import editList from './busbarAdd.vue'
+import { electricityNode, electricityNodeDelete } from '@/api/api/index'
 const props = defineProps({
   bak: {
     type: Function,
-    default: () => {},
+    default: () => { },
+  },
+  id: {
+    type: String,
+    required: true,
   },
 })
 const bak = () => {
@@ -27,55 +32,30 @@
 const TimeRanges = ref()
 const loadingTable = ref(true)
 const columns = ref([
-  // { text: '设备类型', value: 'deviceTypeName', align: 'center' },
-  // { text: '设备编号', value: 'deviceNo', align: 'center' },
-  // { text: '安装位置', value: 'installLocaltion', align: 'center' },
-  // { text: '电量/V', value: 'electricalVoltage', align: 'center' },
-  // { text: '功率/W', value: 'power', align: 'center' },
-  // { text: '上传时间', value: 'uploadTime', align: 'center' },
-  { text: '节点类型', value: '1', align: 'center' },
-  { text: '节点并联电导', value: '2', align: 'center' },
-  { text: '节点并联电纳', value: '3', align: 'center' },
-  { text: '母线断面号', value: '4', align: 'center' },
-  { text: '节点电压初始幅值', value: '5', align: 'center' },
-  { text: '节点电压初始相位角', value: '6', align: 'center' },
-  { text: '母线省损耗区域', value: '7', align: 'center' },
-  { text: '节点最大电压', value: '8', align: 'center' },
-  { text: '节点最小电压', value: '9', align: 'center' },
-  { text: '负荷有功功率', value: '10', align: 'center' },
-  { text: '负荷无功功率', value: '11', align: 'center' },
-  { text: '节点碳势', value: '12', align: 'center' },
-  { text: '负荷碳流率', value: '13', align: 'center' },
+  { text: '节点类型', value: 'type', align: 'center' },
+  { text: '节点并联电导', value: 'gs', align: 'center' },
+  { text: '节点并联电纳', value: 'bs', align: 'center' },
+  { text: '母线断面号', value: 'area', align: 'center' },
+  { text: '节点电压初始幅值', value: 'vm', align: 'center' },
+  { text: '节点电压初始相位角', value: 'va', align: 'center' },
+  { text: '母线省损耗区域', value: 'zone', align: 'center' },
+  { text: '节点最大电压', value: 'vmax', align: 'center' },
+  { text: '节点最小电压', value: 'vmin', align: 'center' },
+  { text: '负荷有功功率', value: 'pd', align: 'center' },
+  { text: '负荷无功功率', value: 'qd', align: 'center' },
+  { text: '节点碳势', value: 'en', align: 'center' },
+  { text: '负荷碳流率', value: 'flowRate', align: 'center' },
 ]) // 表格
 const total = ref<number>(0)
 const list = ref<any[]>([])
 // 获取数据列表
 const fetchDataList = () => {
-  // loadingTable.value = true
-  // getMonitorStation(searchQuery).then((res) => {
-  //   list.value = res.data.rows
-  //   total.value = res.data.total
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      1: '类型1',
-      2: '1',
-      3: '1',
-      4: '1',
-      5: '100',
-      6: '90',
-      7: 'C',
-      8: '220',
-      9: '110',
-      10: '1100',
-      11: '1100',
-      12: '低',
-      13: '1',
-    },
-  ]
-  total.value = list.value.length
-  loadingTable.value = false
+  loadingTable.value = true
+  electricityNode(props.id).then((res) => {
+    list.value = res.data
+    total.value = res.data.length
+    loadingTable.value = false
+  })
 }
 // 搜索
 const search = () => {
diff --git a/src/views/data/electricity/index.vue b/src/views/data/electricity/index.vue
index 881f988..f37ba02 100644
--- a/src/views/data/electricity/index.vue
+++ b/src/views/data/electricity/index.vue
@@ -15,12 +15,8 @@
   },
   {
     id: '1',
-    title: '设备监测',
+    title: '设备监测数据',
   },
-  // {
-  //   id: '2',
-  //   title: '电动汽车及储能',
-  // },
 ])
 const select = ref('')
 const confirm = (selectp: string) => {
@@ -41,7 +37,7 @@
     <!-- 分布式光伏 -->
     <page v-if="select === '分布式光伏'" :station-type="type" />
     <!-- 设备监测 -->
-    <device v-if="select === '设备监测'" />
+    <device v-if="select === '设备监测数据'" />
   </div>
 </template>
 
diff --git a/src/views/data/electricity/network.vue b/src/views/data/electricity/network.vue
index d95d2cd..b79c34b 100644
--- a/src/views/data/electricity/network.vue
+++ b/src/views/data/electricity/network.vue
@@ -34,59 +34,28 @@
 const loadingTable = ref(true)
 // table列表
 const columns = ref([
-  // { text: '配电网名称', value: 'electricityName', align: 'center' },
+  { text: '配电网名称', value: 'electricityName', align: 'center' },
   // { text: '配电网区域', value: 'electricityArea', align: 'center' },
   // { text: '上传人', value: 'uploaderName', align: 'center' },
   // { text: '上传时间', value: 'uploadTime', align: 'center' },
-  { text: '基准功率', value: 'w', align: 'center' },
-  { text: '系统节点数', value: 'x', align: 'center' },
-  { text: '发电机数', value: 'f', align: 'center' },
-  { text: '系统负荷数', value: 'xt', align: 'center' },
-  { text: '节点之间支路数', value: 'j', align: 'center' },
+  { text: '基准功率', value: 'basePower', align: 'center' },
+  { text: '系统节点数', value: 'codeNum', align: 'center' },
+  { text: '发电机数', value: 'genNum', align: 'center' },
+  { text: '系统负荷数', value: 'loadNum', align: 'center' },
+  { text: '节点之间支路数', value: 'branchNum', align: 'center' },
 ])
 const total = ref<number>(0)
 // table列表数据
 const list = ref<any[]>([])
 // 获取数据列表
 const fetchDataList = () => {
-  // loadingTable.value = true
-  // getElectricityList(searchQuery).then((res) => {
-  //   list.value = res.data.rows
-  //   total.value = res.data.total
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      w: 1000,
-      x: 33,
-      f: 5,
-      xt: 32,
-      j: 37,
-    },
-    {
-      w: 1200,
-      x: 133,
-      f: 15,
-      xt: 132,
-      j: 327,
-    },
-    {
-      w: 1100,
-      x: 22,
-      f: 35,
-      xt: 322,
-      j: 39,
-    },
-    {
-      w: 1000,
-      x: 66,
-      f: 12,
-      xt: 62,
-      j: 47,
-    },
-  ]
-  total.value = list.value.length
-  loadingTable.value = false
+  loadingTable.value = true
+  getElectricityList(searchQuery).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+    console.log(res.data, '配电网管理')
+    loadingTable.value = false
+  })
 }
 // 搜索
 const search = () => {
@@ -138,15 +107,16 @@
 const detailRef = ref()
 // 查看详情
 const detail = (row: any) => {
-  if (row.electricityDetail) {
-    detailRef.value.initDialog(row)
-  }
-  else {
-    ElMessage({
-      type: 'info',
-      message: '暂无内容',
-    })
-  }
+  // if (row.electricityDetail) {
+  //   detailRef.value.initDialog(row)
+  // }
+  // else {
+  //   ElMessage({
+  //     type: 'info',
+  //     message: '暂无内容',
+  //   })
+  // }
+  editRef.value.initDialog('detail', row)
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -167,15 +137,26 @@
 onMounted(() => {
   search()
 })
+// 母线参数
+const networdId = ref('')
+const bushbar = (row: any) => {
+  showTable.value = 2
+  networdId.value = row.id
+}
+// 之路参数
+const branch = (row: any) => {
+  showTable.value = 3
+  networdId.value = row.id
+}
 </script>
 
 <template>
   <!-- 配电网分支参数 -->
-  <network-branch v-show="showTable === 3" ref="branchRef" :bak="changeShow" />
+  <network-branch v-if="showTable === 3" :id="networdId" ref="branchRef" :bak="changeShow" />
   <!-- 配电网母线参数 -->
-  <network-busbar v-show="showTable === 2" ref="busbarRef" :bak="changeShow" />
+  <network-busbar v-if="showTable === 2" :id="networdId" ref="busbarRef" :bak="changeShow" />
   <!-- 配电网 -->
-  <div v-show="showTable === 1">
+  <div v-if="showTable === 1">
     <edit-list ref="editRef" @refresh="search" />
     <detail-dialog ref="detailRef" />
     <!-- 筛选条件 -->
@@ -219,7 +200,7 @@
                 size="small"
                 type="primary"
                 link
-                @click="() => { showTable = 2;(row) }"
+                @click="bushbar(row)"
               >
                 母线参数
               </el-button>
@@ -231,7 +212,7 @@
                 size="small"
                 type="primary"
                 link
-                @click="() => { showTable = 3;(row) }"
+                @click="branch(row)"
               >
                 支线参数
               </el-button>

diff --git a/src/api/api/index.ts b/src/api/api/index.ts
index 4a6cf27..0af6bf9 100644
--- a/src/api/api/index.ts
+++ b/src/api/api/index.ts
@@ -110,13 +110,43 @@
     method: 'post',
   })
 }
-// 配电网节点查询
+// 配电网节点查询 / 母线参数
 export function electricityNode(id: any) {
   return request({
     url: `/electricityNode/list?electricityId=${id}`,
     method: 'get',
   })
 }
+// 母线参数新增
+export function electricityNodeAdd(data: object) {
+  return request({
+    url: '/electricityNode/add',
+    method: 'post',
+    data,
+  })
+}
+// 母线参数修改
+export function electricityNodeUpdate(data: object) {
+  return request({
+    url: '/electricityNode/update',
+    method: 'post',
+    data,
+  })
+}
+// 母线参数删除
+export function electricityNodeDelete(id: string) {
+  return request({
+    url: `/electricityNode/delete?id=${id}`,
+    method: 'post',
+  })
+}
+// 配电网支路查询
+export function electricityBranch(id: any) {
+  return request({
+    url: `/branchNodeInfo/branchList?electricityId=${id}`,
+    method: 'get',
+  })
+}
 // 光伏/楼宇/电动车管理列表
 export function getMonitorStation(params: any) {
   return request({
@@ -125,6 +155,13 @@
     params,
   })
 }
+// 光伏列表 - 不分页
+export function getMonitorStationList() {
+  return request({
+    url: '/monitorStation/list',
+    method: 'get',
+  })
+}
 // 添加 光伏/楼宇/电动车管
 export function addMonitorStation(data: any) {
   return request({
diff --git a/src/components.d.ts b/src/components.d.ts
index 1bd3d1b..5c3eb2a 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -40,6 +40,8 @@
     ImagePreview: typeof import('./components/ImagePreview/index.vue')['default']
     ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default']
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
+    InfoWindow: typeof import('./components/map/infoWindow.vue')['default']
+    InfoWindow2: typeof import('./components/map/infoWindow2.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     Map: typeof import('./components/map/index.vue')['default']
     MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index a5c8ec3..00994da 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -5,7 +5,9 @@
  -->
 <script lang="ts" setup name="GuadMap">
 import AMapLoader from '@amap/amap-jsapi-loader'
-import { electricityNode, getElectricityListAll } from '@/api/api/index'
+import infoDetail from './infoWindow.vue'
+import infoDetail2 from './infoWindow2.vue'
+import { electricityBranch, electricityNode, getElectricityListAll, getMonitorStationList } from '@/api/api/index'
 // 设置安全密钥
 window._AMapSecurityConfig = {
   securityJsCode: '56bf9671d4b3517d294caec4751889a1', // 后期需替换
@@ -24,10 +26,19 @@
   [111.739906, 40.83686],
   [111.739906, 40.83386],
 ])
-// 区域点数组
+// 电网节点数组
 const markerArr = ref([
 ])
+// 光伏数组
+const markerArr1 = ref([
+])
+// 信息窗体
+const infoWindow = ref()
+const infoWindow2 = ref()
+const windowInfoRef = ref()
+const windowInfoRef2 = ref()
 const markerArrInfo = ref()
+const markerArrInfo1 = ref()
 // 折现节点坐标
 const lineArr = ref([])
 // 初始化地图
@@ -35,14 +46,15 @@
   AMapLoader.load({
     key: '40849e82b4e33f5255b17372520c954d', // 后期需替换
     version: '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
-    plugins: ['AMap.Scale', 'AMap.MouseTool'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
+    plugins: ['AMap.Scale', 'AMap.MouseTool', 'AMap.ToolBar'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
   })
     .then((AMap) => {
       // 初始化地图
       map.value = new AMap.Map('map', {
-        viewMode: '2D', //  是否为3D地图模式
+        viewMode: '3D', //  是否为3D地图模式
         zoom: 17, // 初始化地图级别
-        center: markerArr.value[0],
+        // center: markerArr.value[0],
+        center: [116.26755900, 39.91547100],
         resizeEnable: true,
       })
       // 用来画区域的
@@ -78,7 +90,7 @@
       //   }
       //   console.log(arr)// 121.540994,29.870174;121.55138,29.858116;121.55756,29.874193;
       // })
-      // 标记点绘制
+      // 电网支路标记点绘制
       for (let i = 0; i < markerArr.value.length; i++) {
         const icon = new AMap.Icon({
           size: new AMap.Size(36, 36), // 图标尺寸
@@ -87,58 +99,213 @@
           imageSize: new AMap.Size(24, 30), // 根据所设置的大小拉伸或压缩图片
           imageOffset: new AMap.Pixel(0, 0), // 图像相对展示区域的偏移量，适于雪碧图等
         })
-        // const content = '<div>111</div>'
         const marker = new AMap.Marker({
           position: markerArr.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
           map: map.value,
           title: '测试坐标',
           icon,
-          offset: new AMap.Pixel(-20, -20),
+          offset: new AMap.Pixel(3, -30),
+        })
+        // 支路点详细信息// 信息窗体
+        infoWindow.value = new AMap.InfoWindow({
+          isCustom: true, // 自定义信息窗体
+          content: windowInfoRef.value.$el, // 窗体内容(vue组件)
+          offset: new AMap.Pixel(9, -5), // 偏移
+        })
+        marker.on('click', (e) => {
+          // 打开信息窗口
+          // infoWindow.value.setContent(e.target.content)
+          infoWindow.value.open(map.value, e.lnglat)
+          // 初始化信息窗口
+          windowInfoRef.value.initialize({
+            overlay: e.target,
+            infoWindow: infoWindow.value,
+            info: markerArrInfo.value[i],
+          })
         })
         marker.setLabel({
           offset: new AMap.Pixel(-10, -2), // 设置文本标注偏移量
-          content: `<div>${markerArrInfo.value[i].busId}</div>`, // 设置文本标注内容
+          content: `<div>${markerArrInfo.value[i].nodeName}</div>`, // 设置文本标注内容
           direction: 'right', // 设置文本标注方位
         })
         map.value.add([marker])
-        // 标记点文本
-        // 自动适应显示想显示的范围区域
-        // map.value.setFitView()
       }
-      // 折现(
-      // 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)
+      // 光伏标记点及光伏绘制
+      for (let i = 0; i < markerArr1.value.length; i++) {
+        const icon = new AMap.Icon({
+          size: new AMap.Size(36, 36), // 图标尺寸
+          image: 'http://111.198.10.15:11404/imgs/2.png', // Icon的图像
+          imageSize: new AMap.Size(24, 30), // 根据所设置的大小拉伸或压缩图片
+          imageOffset: new AMap.Pixel(0, 0), // 图像相对展示区域的偏移量，适于雪碧图等
+        })
+        // const content = '<div>111</div>'
+        const marker = new AMap.Marker({
+          position: markerArr1.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+          map: map.value,
+          title: '测试坐标',
+          icon,
+          offset: new AMap.Pixel(-20, -20),
+        })
+        // 信息窗体
+        infoWindow2.value = new AMap.InfoWindow({
+          isCustom: true, // 自定义信息窗体
+          content: windowInfoRef2.value.$el, // 窗体内容(vue组件)
+          offset: new AMap.Pixel(9, -5), // 偏移
+        })
+        marker.on('click', (e) => {
+          // 打开信息窗口
+          infoWindow2.value.open(map.value, e.lnglat)
+          // infoWindow2.value.setContent(e.target)
+          // 初始化信息窗口
+          windowInfoRef2.value.initialize({
+            overlay: e.target,
+            infoWindow: infoWindow2.value,
+            info: markerArrInfo1.value[i],
+          })
+        })
+        marker.setLabel({
+          offset: new AMap.Pixel(-10, -2), // 设置文本标注偏移量
+          content: `<div>${markerArrInfo1.value[i].stationName}</div>`, // 设置文本标注内容
+          direction: 'right', // 设置文本标注方位
+        })
+        map.value.add([marker])
+        // 绘制电网和节点连线
+        const path = markerArrInfo1.value.map((item) => {
+          return [[Number(item.lng), Number(item.lat)], [Number(item.nodeLng), Number(item.nodeLat)]]
+        })
+        const polyline = new AMap.Polyline({
+          path,
+          strokeColor: '#03A382',
+          strokeStyle: 'dashed',
+          strokeDasharray: [10, 3],
+          lineJoin: 'round',
+          lineCap: 'round',
+          zIndex: 50,
+          zooms: [16, 20],
+        })
+        polyline.setMap(map.value)
+        map.value.add(polyline)
+      }
+      // 电网支路折线绘制
+      for (let i = 0; i < lineArr.value.length; i++) {
+        // console.log(lineArr.value[i])
+        const path = lineArr.value.map(item => item.branchNodeInfos)
+        const line = path.map(item => (
+          item.map((child) => {
+            return ([[child.flng, child.flat], [child.tlng, child.tlat], child.status2])
+          })
+        ))
+        line.forEach((item) => {
+          item.forEach((child) => {
+            const path = [child[0], child[1]]
+            const polyline = new AMap.Polyline({
+              path,
+              // isOutline: true,
+              strokeColor: child[2] === 1 ? '#008d68' : '#000',
+              // strokeOpacity: 1,
+              strokeWeight: 3,
+              // 折线样式还支持 'dashed'
+              strokeStyle: child[2] !== 1 ? 'dashed' : 'dashed ',
+              // strokeStyle是dashed时有效
+              strokeDasharray: [10, 3],
+              lineJoin: 'round',
+              showDir: child[2] === 1,
+              // lineCap: 'square',
+              lineCap: 'round',
+              zIndex: 50,
+              zooms: [16, 20],
+
+            })
+            polyline.setMap(map.value)
+            map.value.add(polyline)
+          })
+        })
+        // 添加支路折线文本
+        // 创建纯文本标记
+        const textArr = path.map(item => (
+          item.map((child) => {
+            return ([[(Number(child.flng) + Number(child.tlng)) / 2, (Number(child.flat) + Number(child.tlat)) / 2], child.flowRate])
+          })
+        ))
+        textArr.forEach((item) => {
+          // console.log(item, 'item')
+          item.forEach((child) => {
+            const icon = new AMap.Icon({
+              size: new AMap.Size(36, 36), // 图标尺寸
+              // image: '', // Icon的图像
+              imageSize: new AMap.Size(24, 30), // 根据所设置的大小拉伸或压缩图片
+              imageOffset: new AMap.Pixel(0, 0), // 图像相对展示区域的偏移量，适于雪碧图等
+            })
+            // const content = '<div>111</div>'
+            const marker = new AMap.Marker({
+              position: child[0], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+              map: map.value,
+              content: '<span></span>',
+              offset: new AMap.Pixel(-20, -20),
+            })
+            marker.setLabel({
+              offset: new AMap.Pixel(-10, -2), // 设置文本标注偏移量
+              content: `<div>${`${child[1]}kgCO2/h`}</div>`, // 设置文本标注内容
+              direction: 'right', // 设置文本标注方位
+            })
+            map.value.add([marker])
+          })
+        })
+      }
     })
     .catch((e) => {
       console.log(e)
     })
 }
-onMounted(() => {
-  getElectricityListAll().then((res) => {
+onMounted(async () => {
+  // 获取电网列表
+  try {
+    const list = await getElectricityListAll()
     // 电网列表
-    electricityList.value = res.data
-    // 默认选中第一个查询节点
+    electricityList.value = list.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()
-      })
+      const res = await electricityNode(electricityList.value[0].id)
+      markerArr.value = res.data.map(item => ([Number(item.lng), Number(item.lat)]))
+      markerArrInfo.value = res.data
+      // 获取支路信息(折线)
+      const res1 = await electricityBranch(electricityList.value[0].id)
+      lineArr.value = res1.data
     }
-  })
+    // 获取光伏列表
+    const list1 = await getMonitorStationList()
+    markerArr1.value = list1.data.map(item => ([Number(item.lng), Number(item.lat)]))
+    markerArrInfo1.value = list1.data
+    // 初始化地图
+    initMap()
+  }
+  catch (error) {
+    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
+  //       // 获取支路
+  //       electricityBranch(electricityList.value[0].id).then(res => {
+  //         lineArr.value = res.data
+  //         // console.log(res.data)
+  //         initMap()
+  //       })
+  //     })
+  //   }
+  // })
 })
 </script>
 
 <template>
   <div id="map" />
+  <info-detail ref="windowInfoRef" />
+  <info-detail2 ref="windowInfoRef2" />
 </template>
 
 <style scoped>
diff --git a/src/components/map/infoWindow.vue b/src/components/map/infoWindow.vue
new file mode 100644
index 0000000..1df9061
--- /dev/null
+++ b/src/components/map/infoWindow.vue
@@ -0,0 +1,83 @@
+<!--
+  Description: 高德地图信息窗体 - 支路节点
+  Author: 李亚光
+  Date: 2023-05-10
+ -->
+<script lang="ts" setup name="infoWindow">
+const overlay = ref()
+const infoWindow = ref()
+const info = ref()
+// 初始化
+const initialize = (e) => {
+  overlay.value = e.overlay
+  infoWindow.value = e.infoWindow
+  info.value = e.info
+}
+defineExpose({ initialize })
+// 关闭
+const close = () => {
+  infoWindow.value.close()
+}
+</script>
+
+<template>
+  <div class="container">
+    <div class="title">
+      <div class="text">
+        {{ info?.nodeName }}
+      </div>
+      <div class="close" @click="close">
+        x
+      </div>
+    </div>
+    <div class="item">
+      节点编号 : {{ info?.busId }}
+    </div>
+    <div class="item">
+      <span>负荷有功功率 : {{ info?.pd }}</span>  <span>负荷无功功率 : {{ info?.qd }}</span>
+    </div>
+    <div class="item">
+      <span>节点碳势 : {{ info?.en }}</span>  <span>节点负荷碳流率 : {{ info?.flowRate }}</span>
+    </div>
+    <!-- // <div class="item">设备信息 : {{ device.produceCode }}</div>
+    // <div class="item">设备ID : {{ device.deviceId }}</div>
+    // <div class="item">IP地址 : {{ device.deviceIp }}</div>
+    // <div class="item">地址 : {{ device.deviceAddress }}</div> -->
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  width: 340px;
+  height: 140px;
+  padding: 10px;
+  background-color: #fff;
+  border: 1px solid #6d9ece;
+
+  .title {
+    font-size: 16px;
+    font-weight: 700;
+    padding: 0 10px;
+    display: flex;
+    justify-content: space-between;
+
+    .close {
+      color: #ccc;
+
+      &:hover {
+        cursor: pointer;
+      }
+    }
+  }
+
+  .item {
+    padding: 0 5px;
+    color: #111213;
+    font-size: 14px;
+    margin: 10px;
+    border-bottom: 1px solid #ccc;
+    display: flex;
+    justify-content: space-between;
+  }
+}
+</style>
diff --git a/src/components/map/infoWindow2.vue b/src/components/map/infoWindow2.vue
new file mode 100644
index 0000000..407e288
--- /dev/null
+++ b/src/components/map/infoWindow2.vue
@@ -0,0 +1,80 @@
+<!--
+  Description: 高德地图信息窗体 - 光伏节点
+  Author: 李亚光
+  Date: 2023-05-10
+ -->
+<script lang="ts" setup name="infoWindow">
+const overlay = ref()
+const infoWindow = ref()
+const info = ref()
+// 初始化
+const initialize = (e) => {
+  overlay.value = e.overlay
+  infoWindow.value = e.infoWindow
+  info.value = e.info
+  console.log(e, '123')
+}
+defineExpose({ initialize })
+// 关闭
+const close = () => {
+  infoWindow.value.close()
+}
+</script>
+
+<template>
+  <div class="container">
+    <div class="title">
+      <div class="text">
+        {{ info?.stationName }}
+      </div>
+      <div class="close" @click="close">
+        x
+      </div>
+    </div>
+    <div class="item">
+      光伏挂载节点 : {{ info?.nodeId }}
+    </div>
+    <div class="item">
+      <span>发电机组有功 : {{ info?.pg }}</span>  <span>发电机组无功 : {{ info?.qg }}</span>
+    </div>
+    <div class="item">
+      碳排强度 : {{ info?.strength }}
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  width: 340px;
+  height: 140px;
+  padding: 10px;
+  background-color: #fff;
+  border: 1px solid #6d9ece;
+
+  .title {
+    font-size: 16px;
+    font-weight: 700;
+    padding: 0 10px;
+    display: flex;
+    justify-content: space-between;
+
+    .close {
+      color: #ccc;
+
+      &:hover {
+        cursor: pointer;
+      }
+    }
+  }
+
+  .item {
+    padding: 0 5px;
+    color: #111213;
+    font-size: 14px;
+    margin: 10px;
+    border-bottom: 1px solid #ccc;
+    display: flex;
+    justify-content: space-between;
+  }
+}
+</style>
diff --git a/src/static/1.png b/src/static/1.png
new file mode 100644
index 0000000..9dca264
--- /dev/null
+++ b/src/static/1.png
Binary files differ
diff --git a/src/static/2.png b/src/static/2.png
new file mode 100644
index 0000000..0eb5760
--- /dev/null
+++ b/src/static/2.png
Binary files differ
diff --git a/src/views/data/electricity/components/busbarAdd.vue b/src/views/data/electricity/components/busbarAdd.vue
index 7f81ed6..fa5ccb8 100644
--- a/src/views/data/electricity/components/busbarAdd.vue
+++ b/src/views/data/electricity/components/busbarAdd.vue
@@ -7,8 +7,7 @@
 import type { FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
-import showPhoto from './showPhoto.vue'
-import { addElectricityList, updateElectricityList, uploadApi } from '@/api/api/index'
+import { electricityNodeAdd, electricityNodeUpdate } from '@/api/api/index'
 import { getUserList } from '@/api/system/user'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
@@ -16,12 +15,19 @@
 const dialogStatus = ref('') // 对话框类型：create,update
 const isEditMode = ref(true)
 const areaForm = ref({
-  electricityName: '', // 配电网名称
-  electricityArea: '', // 配电网区域
-  uploaderName: '', // 上传人
-  uploader: '',
-  uploadTime: '', // 上传时间
-  electricityDetail: '', // 详情图片
+  type: '', // 节点类型
+  gs: '', // 节点并联电导
+  bs: '', // 节点并联电纳
+  area: '', // 母线断面号
+  vm: '', // 节点电压初始幅值
+  va: '', // 节点电压初始相位角
+  zone: '', // 母线省损耗区域
+  vmax: '', // 节点最大电压
+  vmin: '', // 节点最小电压
+  pd: '', // 负荷有功功率
+  qd: '', // 负荷无功功率
+  // qd: '', // 负荷无功功率
+  // qd: '', // 负荷无功功率
 }) // 表单
 const textMap: { [key: string]: string } = {
   update: '编辑',
@@ -29,11 +35,17 @@
 } // 表头显示标题
 const btnLoading = ref(false) // 保存按钮的加载中状态
 const rules: FormRules = {
-  electricityName: [{ required: true, message: '请输入配电网名称', trigger: ['blur', 'change'] }],
-  electricityArea: [{ required: true, message: '请输入配电网区域', trigger: ['blur', 'change'] }],
-  uploader: [{ required: true, message: '请选择上传人', trigger: ['blur', 'change'] }],
-  uploadTime: [{ required: true, message: '请选择上传时间', trigger: ['blur', 'change'] }],
-  electricityDetail: [{ required: true, message: '请上传附件', trigger: ['blur', 'change'] }],
+  type: [{ required: true, message: '请选择节点类型', trigger: ['blur', 'change'] }],
+  gs: [{ required: true, message: '节点并联电导', trigger: ['blur', 'change'] }],
+  bs: [{ required: true, message: '节点并联电纳', trigger: ['blur', 'change'] }],
+  area: [{ required: true, message: '母线断面号', trigger: ['blur', 'change'] }],
+  vm: [{ required: true, message: '节点电压初始幅值', trigger: ['blur', 'change'] }],
+  va: [{ required: true, message: '节点电压初始相位角', trigger: ['blur', 'change'] }],
+  zone: [{ required: true, message: '母线省损耗区域', trigger: ['blur', 'change'] }],
+  vmax: [{ required: true, message: '节点最大电压', trigger: ['blur', 'change'] }],
+  vmin: [{ required: true, message: '节点最小电压', trigger: ['blur', 'change'] }],
+  pd: [{ required: true, message: '负荷有功功率', trigger: ['blur', 'change'] }],
+  qd: [{ required: true, message: '负荷无功功率', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 // 获取用户列表
 const userList = ref<any[]>([])
@@ -46,12 +58,17 @@
 // 重置表单
 const resetForm = () => {
   areaForm.value = {
-    electricityName: '', // 配电网名称
-    electricityArea: '', // 配电网区域
-    uploaderName: '', // 上传人+
-    uploader: '',
-    uploadTime: '', // 上传时间
-    electricityDetail: '',
+    type: '', // 节点类型
+    gs: '', // 节点并联电导
+    bs: '', // 节点并联电纳
+    area: '', // 母线断面号
+    vm: '', // 节点电压初始幅值
+    va: '', // 节点电压初始相位角
+    zone: '', // 母线省损耗区域
+    vmax: '', // 节点最大电压
+    vmin: '', // 节点最小电压
+    pd: '', // 负荷有功功率
+    qd: '', // 负荷无功功率
   }
 }
 const deviceTypeList = ref([])
@@ -80,9 +97,8 @@
 const createData = () => {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
-      areaForm.value.uploadTime = dayjs().format('YYYY-MM-DD')
       btnLoading.value = true
-      addElectricityList(areaForm.value).then((response) => {
+      electricityNodeAdd(areaForm.value).then((response) => {
         if (response.code === 200) {
           btnLoading.value = false
           // 通知父组件刷新状态
@@ -106,9 +122,8 @@
 const updateData = () => {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
-      areaForm.value.uploadTime = dayjs().format('YYYY-MM-DD')
       btnLoading.value = true
-      updateElectricityList(areaForm.value).then((response) => {
+      electricityNodeUpdate(areaForm.value).then((response) => {
         if (response.code === 200) {
           ElMessage({
             message: '修改成功',
@@ -168,91 +183,89 @@
   <el-dialog v-model="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
     <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="160px">
       <el-col :span="20">
-        <el-form-item label="节点类型" prop="deviceId">
-          <el-select v-model="areaForm.electricityName" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择节点类型' : ''" style="width: 100%;">
-            <el-option
-              v-for="item in []"
-              :key="item.id"
-              :label="item.deviceName"
-              :value="item.id"
-            />
+        <el-form-item label="节点类型">
+          <el-select
+            v-model="areaForm.type" class="m-2"
+            :placeholder="dialogStatus === 'create' ? '请选择节点类型' : ''" style="width: 100%;"
+          >
+            <el-option v-for="item in []" :key="item.id" :label="item.deviceName" :value="item.id" />
           </el-select>
         </el-form-item>
       </el-col>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点并联电导:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入节点并联电导' : ''" />
+          <el-form-item label="节点并联电导:" prop="gs">
+            <el-input v-model="areaForm.gs" :placeholder="dialogStatus === 'create' ? '请输入节点并联电导' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点并联电纳:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入节点并联电纳' : ''" />
+          <el-form-item label="节点并联电纳:" prop="bs">
+            <el-input v-model="areaForm.bs" :placeholder="dialogStatus === 'create' ? '请输入节点并联电纳' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="母线断面号:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入母线断面号' : ''" />
+          <el-form-item label="母线断面号:" prop="area">
+            <el-input v-model="areaForm.area" :placeholder="dialogStatus === 'create' ? '请输入母线断面号' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点电压初始幅值:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入节点电压初始幅值' : ''" />
+          <el-form-item label="节点电压初始幅值:" prop="vm">
+            <el-input v-model="areaForm.vm" :placeholder="dialogStatus === 'create' ? '请输入节点电压初始幅值' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点电压初始相位角:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入节点电压初始相位角' : ''" />
+          <el-form-item label="节点电压初始相位角:" prop="va">
+            <el-input v-model="areaForm.va" :placeholder="dialogStatus === 'create' ? '请输入节点电压初始相位角' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="母线省损耗区域:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入母线省损耗区域' : ''" />
+          <el-form-item label="母线省损耗区域:" prop="zone">
+            <el-input v-model="areaForm.zone" :placeholder="dialogStatus === 'create' ? '请输入母线省损耗区域' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点最大电压:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入节点最大电压' : ''" />
+          <el-form-item label="节点最大电压:" prop="vmax">
+            <el-input v-model="areaForm.vmax" :placeholder="dialogStatus === 'create' ? '请输入节点最大电压' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点最小电压:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入节点最小电压' : ''" />
+          <el-form-item label="节点最小电压:" prop="vmin">
+            <el-input v-model="areaForm.vmin" :placeholder="dialogStatus === 'create' ? '请输入节点最小电压' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="负荷有功功率:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入负荷有功功率' : ''" />
+          <el-form-item label="负荷有功功率:" prop="pd">
+            <el-input v-model="areaForm.pd" :placeholder="dialogStatus === 'create' ? '请输入负荷有功功率' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="负荷无功功率:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入负荷无功功率' : ''" />
+          <el-form-item label="负荷无功功率:" prop="qd">
+            <el-input v-model="areaForm.qd" :placeholder="dialogStatus === 'create' ? '请输入负荷无功功率' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
+      <!-- <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点碳势:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入节点碳势' : ''" />
+          <el-form-item label="节点碳势:" prop="qd">
+            <el-input v-model="areaForm.qd" :placeholder="dialogStatus === 'create' ? '请输入节点碳势' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -262,7 +275,7 @@
             <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入负荷碳流率' : ''" />
           </el-form-item>
         </el-col>
-      </el-row>
+      </el-row> -->
     </el-form>
     <template #footer>
       <div class="dialog-footer">
diff --git a/src/views/data/electricity/components/networkBranch.vue b/src/views/data/electricity/components/networkBranch.vue
index 8d137c0..c1eced0 100644
--- a/src/views/data/electricity/components/networkBranch.vue
+++ b/src/views/data/electricity/components/networkBranch.vue
@@ -6,11 +6,16 @@
 <script lang="ts" setup name="networkBranch">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import editList from './branchAdd.vue'
+import { electricityBranch } from '@/api/api/index'
 const props = defineProps({
   bak: {
     type: Function,
     required: true,
   },
+  id: {
+    type: String,
+    required: true,
+  },
 })
 const bak = () => {
   props.bak(1)
@@ -27,55 +32,31 @@
 const TimeRanges = ref()
 const loadingTable = ref(true)
 const columns = ref([
-  // { text: '设备类型', value: 'deviceTypeName', align: 'center' },
-  // { text: '设备编号', value: 'deviceNo', align: 'center' },
-  // { text: '安装位置', value: 'installLocaltion', align: 'center' },
-  // { text: '电量/V', value: 'electricalVoltage', align: 'center' },
-  // { text: '功率/W', value: 'power', align: 'center' },
-  // { text: '上传时间', value: 'uploadTime', align: 'center' },
-  { text: '支路首端节点', value: '1', align: 'center' },
-  { text: '支路末端节点', value: '2', align: 'center' },
-  { text: '支路电阻标幺值', value: '3', align: 'center' },
-  { text: '支路电纳标幺值', value: '4', align: 'center' },
-  { text: '长距离输电容量', value: '5', align: 'center' },
-  { text: '短距离输电容量', value: '7', align: 'center' },
-  { text: '紧急距离输电容量', value: '8', align: 'center' },
-  { text: '支路变比', value: '9', align: 'center' },
-  { text: '角度', value: '10', align: 'center' },
-  { text: '支路是否运行', value: '11', align: 'center' },
-  { text: '支路最小相位角', value: '12', align: 'center' },
-  { text: '支路碳流率', value: '13', align: 'center' },
+  { text: '支路首端节点', value: 'fbusId', align: 'center' },
+  { text: '支路末端节点', value: 'tbusId', align: 'center' },
+  { text: '支路电阻标幺值', value: 'r', align: 'center' },
+  { text: '支路电纳标幺值', value: 'b', align: 'center' },
+  { text: '长距离输电容量', value: 'ratea', align: 'center' },
+  { text: '短距离输电容量', value: 'rateb', align: 'center' },
+  { text: '紧急距离输电容量', value: 'ratec', align: 'center' },
+  { text: '支路变比', value: 'ratio', align: 'center' },
+  { text: '角度', value: 'angle', align: 'center' },
+  { text: '支路是否运行', value: 'status2', align: 'center' },
+  { text: '支路最小相位角', value: 'angmin', align: 'center' },
+  { text: '支路碳流率', value: 'angmax', align: 'center' },
 ]) // 表格
 const total = ref<number>(0)
 const list = ref<any[]>([])
 // 获取数据列表
 const fetchDataList = () => {
-  // loadingTable.value = true
-  // getMonitorStation(searchQuery).then((res) => {
-  //   list.value = res.data.rows
-  //   total.value = res.data.total
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      1: 22,
-      2: '23',
-      3: 100,
-      4: 100,
-      5: '220',
-      7: 220,
-      8: 110,
-      9: 1,
-      10: 90,
-      11: '是',
-      12: 10,
-      13: '12%',
-    },
-
-  ]
-  total.value = list.value.length
-  loadingTable.value = false
+  loadingTable.value = true
+  electricityBranch(props.id).then((res) => {
+    list.value = res.data.map(item => item.branchNodeInfos[0])
+    total.value = res.data.length
+    loadingTable.value = false
+  })
 }
+fetchDataList()
 // 搜索
 const search = () => {
   fetchDataList()
@@ -128,9 +109,6 @@
 const multiSelect = (row: any[]) => {
   selectList.value = row
 }
-onMounted(() => {
-  search()
-})
 </script>
 
 <template>
diff --git a/src/views/data/electricity/components/networkBusbar.vue b/src/views/data/electricity/components/networkBusbar.vue
index 5386ea1..c1eb19d 100644
--- a/src/views/data/electricity/components/networkBusbar.vue
+++ b/src/views/data/electricity/components/networkBusbar.vue
@@ -6,10 +6,15 @@
 <script lang="ts" setup name="networkBusbar">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import editList from './busbarAdd.vue'
+import { electricityNode, electricityNodeDelete } from '@/api/api/index'
 const props = defineProps({
   bak: {
     type: Function,
-    default: () => {},
+    default: () => { },
+  },
+  id: {
+    type: String,
+    required: true,
   },
 })
 const bak = () => {
@@ -27,55 +32,30 @@
 const TimeRanges = ref()
 const loadingTable = ref(true)
 const columns = ref([
-  // { text: '设备类型', value: 'deviceTypeName', align: 'center' },
-  // { text: '设备编号', value: 'deviceNo', align: 'center' },
-  // { text: '安装位置', value: 'installLocaltion', align: 'center' },
-  // { text: '电量/V', value: 'electricalVoltage', align: 'center' },
-  // { text: '功率/W', value: 'power', align: 'center' },
-  // { text: '上传时间', value: 'uploadTime', align: 'center' },
-  { text: '节点类型', value: '1', align: 'center' },
-  { text: '节点并联电导', value: '2', align: 'center' },
-  { text: '节点并联电纳', value: '3', align: 'center' },
-  { text: '母线断面号', value: '4', align: 'center' },
-  { text: '节点电压初始幅值', value: '5', align: 'center' },
-  { text: '节点电压初始相位角', value: '6', align: 'center' },
-  { text: '母线省损耗区域', value: '7', align: 'center' },
-  { text: '节点最大电压', value: '8', align: 'center' },
-  { text: '节点最小电压', value: '9', align: 'center' },
-  { text: '负荷有功功率', value: '10', align: 'center' },
-  { text: '负荷无功功率', value: '11', align: 'center' },
-  { text: '节点碳势', value: '12', align: 'center' },
-  { text: '负荷碳流率', value: '13', align: 'center' },
+  { text: '节点类型', value: 'type', align: 'center' },
+  { text: '节点并联电导', value: 'gs', align: 'center' },
+  { text: '节点并联电纳', value: 'bs', align: 'center' },
+  { text: '母线断面号', value: 'area', align: 'center' },
+  { text: '节点电压初始幅值', value: 'vm', align: 'center' },
+  { text: '节点电压初始相位角', value: 'va', align: 'center' },
+  { text: '母线省损耗区域', value: 'zone', align: 'center' },
+  { text: '节点最大电压', value: 'vmax', align: 'center' },
+  { text: '节点最小电压', value: 'vmin', align: 'center' },
+  { text: '负荷有功功率', value: 'pd', align: 'center' },
+  { text: '负荷无功功率', value: 'qd', align: 'center' },
+  { text: '节点碳势', value: 'en', align: 'center' },
+  { text: '负荷碳流率', value: 'flowRate', align: 'center' },
 ]) // 表格
 const total = ref<number>(0)
 const list = ref<any[]>([])
 // 获取数据列表
 const fetchDataList = () => {
-  // loadingTable.value = true
-  // getMonitorStation(searchQuery).then((res) => {
-  //   list.value = res.data.rows
-  //   total.value = res.data.total
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      1: '类型1',
-      2: '1',
-      3: '1',
-      4: '1',
-      5: '100',
-      6: '90',
-      7: 'C',
-      8: '220',
-      9: '110',
-      10: '1100',
-      11: '1100',
-      12: '低',
-      13: '1',
-    },
-  ]
-  total.value = list.value.length
-  loadingTable.value = false
+  loadingTable.value = true
+  electricityNode(props.id).then((res) => {
+    list.value = res.data
+    total.value = res.data.length
+    loadingTable.value = false
+  })
 }
 // 搜索
 const search = () => {
diff --git a/src/views/data/electricity/index.vue b/src/views/data/electricity/index.vue
index 881f988..f37ba02 100644
--- a/src/views/data/electricity/index.vue
+++ b/src/views/data/electricity/index.vue
@@ -15,12 +15,8 @@
   },
   {
     id: '1',
-    title: '设备监测',
+    title: '设备监测数据',
   },
-  // {
-  //   id: '2',
-  //   title: '电动汽车及储能',
-  // },
 ])
 const select = ref('')
 const confirm = (selectp: string) => {
@@ -41,7 +37,7 @@
     <!-- 分布式光伏 -->
     <page v-if="select === '分布式光伏'" :station-type="type" />
     <!-- 设备监测 -->
-    <device v-if="select === '设备监测'" />
+    <device v-if="select === '设备监测数据'" />
   </div>
 </template>
 
diff --git a/src/views/data/electricity/network.vue b/src/views/data/electricity/network.vue
index d95d2cd..b79c34b 100644
--- a/src/views/data/electricity/network.vue
+++ b/src/views/data/electricity/network.vue
@@ -34,59 +34,28 @@
 const loadingTable = ref(true)
 // table列表
 const columns = ref([
-  // { text: '配电网名称', value: 'electricityName', align: 'center' },
+  { text: '配电网名称', value: 'electricityName', align: 'center' },
   // { text: '配电网区域', value: 'electricityArea', align: 'center' },
   // { text: '上传人', value: 'uploaderName', align: 'center' },
   // { text: '上传时间', value: 'uploadTime', align: 'center' },
-  { text: '基准功率', value: 'w', align: 'center' },
-  { text: '系统节点数', value: 'x', align: 'center' },
-  { text: '发电机数', value: 'f', align: 'center' },
-  { text: '系统负荷数', value: 'xt', align: 'center' },
-  { text: '节点之间支路数', value: 'j', align: 'center' },
+  { text: '基准功率', value: 'basePower', align: 'center' },
+  { text: '系统节点数', value: 'codeNum', align: 'center' },
+  { text: '发电机数', value: 'genNum', align: 'center' },
+  { text: '系统负荷数', value: 'loadNum', align: 'center' },
+  { text: '节点之间支路数', value: 'branchNum', align: 'center' },
 ])
 const total = ref<number>(0)
 // table列表数据
 const list = ref<any[]>([])
 // 获取数据列表
 const fetchDataList = () => {
-  // loadingTable.value = true
-  // getElectricityList(searchQuery).then((res) => {
-  //   list.value = res.data.rows
-  //   total.value = res.data.total
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      w: 1000,
-      x: 33,
-      f: 5,
-      xt: 32,
-      j: 37,
-    },
-    {
-      w: 1200,
-      x: 133,
-      f: 15,
-      xt: 132,
-      j: 327,
-    },
-    {
-      w: 1100,
-      x: 22,
-      f: 35,
-      xt: 322,
-      j: 39,
-    },
-    {
-      w: 1000,
-      x: 66,
-      f: 12,
-      xt: 62,
-      j: 47,
-    },
-  ]
-  total.value = list.value.length
-  loadingTable.value = false
+  loadingTable.value = true
+  getElectricityList(searchQuery).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+    console.log(res.data, '配电网管理')
+    loadingTable.value = false
+  })
 }
 // 搜索
 const search = () => {
@@ -138,15 +107,16 @@
 const detailRef = ref()
 // 查看详情
 const detail = (row: any) => {
-  if (row.electricityDetail) {
-    detailRef.value.initDialog(row)
-  }
-  else {
-    ElMessage({
-      type: 'info',
-      message: '暂无内容',
-    })
-  }
+  // if (row.electricityDetail) {
+  //   detailRef.value.initDialog(row)
+  // }
+  // else {
+  //   ElMessage({
+  //     type: 'info',
+  //     message: '暂无内容',
+  //   })
+  // }
+  editRef.value.initDialog('detail', row)
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -167,15 +137,26 @@
 onMounted(() => {
   search()
 })
+// 母线参数
+const networdId = ref('')
+const bushbar = (row: any) => {
+  showTable.value = 2
+  networdId.value = row.id
+}
+// 之路参数
+const branch = (row: any) => {
+  showTable.value = 3
+  networdId.value = row.id
+}
 </script>
 
 <template>
   <!-- 配电网分支参数 -->
-  <network-branch v-show="showTable === 3" ref="branchRef" :bak="changeShow" />
+  <network-branch v-if="showTable === 3" :id="networdId" ref="branchRef" :bak="changeShow" />
   <!-- 配电网母线参数 -->
-  <network-busbar v-show="showTable === 2" ref="busbarRef" :bak="changeShow" />
+  <network-busbar v-if="showTable === 2" :id="networdId" ref="busbarRef" :bak="changeShow" />
   <!-- 配电网 -->
-  <div v-show="showTable === 1">
+  <div v-if="showTable === 1">
     <edit-list ref="editRef" @refresh="search" />
     <detail-dialog ref="detailRef" />
     <!-- 筛选条件 -->
@@ -219,7 +200,7 @@
                 size="small"
                 type="primary"
                 link
-                @click="() => { showTable = 2;(row) }"
+                @click="bushbar(row)"
               >
                 母线参数
               </el-button>
@@ -231,7 +212,7 @@
                 size="small"
                 type="primary"
                 link
-                @click="() => { showTable = 3;(row) }"
+                @click="branch(row)"
               >
                 支线参数
               </el-button>
diff --git a/src/views/data/electricity/networkAdd.vue b/src/views/data/electricity/networkAdd.vue
index 159e7dd..d3b1a76 100644
--- a/src/views/data/electricity/networkAdd.vue
+++ b/src/views/data/electricity/networkAdd.vue
@@ -12,23 +12,25 @@
 const isEditMode = ref(true)
 const areaForm = ref({
   electricityName: '', // 配电网名称
-  electricityArea: '', // 配电网区域
-  uploaderName: '', // 上传人
-  uploader: '',
-  uploadTime: '', // 上传时间
-  electricityDetail: '', // 详情图片
+  basePower: '', // 基准功率
+  codeNum: '', // 系统节点数
+  genNum: '', // 发电机数
+  loadNum: '', // 系统负荷数
+  branchNum: '', // 节点之间支路数
 }) // 表单
 const textMap: { [key: string]: string } = {
   update: '编辑',
   create: '新增',
+  detail: '详情',
 } // 表头显示标题
 const btnLoading = ref(false) // 保存按钮的加载中状态
 const rules: FormRules = {
   electricityName: [{ required: true, message: '请输入配电网名称', trigger: ['blur', 'change'] }],
-  electricityArea: [{ required: true, message: '请输入配电网区域', trigger: ['blur', 'change'] }],
-  uploader: [{ required: true, message: '请选择上传人', trigger: ['blur', 'change'] }],
-  uploadTime: [{ required: true, message: '请选择上传时间', trigger: ['blur', 'change'] }],
-  electricityDetail: [{ required: true, message: '请上传附件', trigger: ['blur', 'change'] }],
+  basePower: [{ required: true, message: '请输入基准功率', trigger: ['blur', 'change'] }],
+  codeNum: [{ required: true, message: '请输入系统节点数', trigger: ['blur', 'change'] }],
+  genNum: [{ required: true, message: '请输入发电机数', trigger: ['blur', 'change'] }],
+  loadNum: [{ required: true, message: '请输入系统负荷数', trigger: ['blur', 'change'] }],
+  branchNum: [{ required: true, message: '请输入节点之间支路数', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 // 获取用户列表
 const userList = ref<any[]>([])
@@ -45,11 +47,11 @@
 const resetForm = () => {
   areaForm.value = {
     electricityName: '', // 配电网名称
-    electricityArea: '', // 配电网区域
-    uploaderName: '', // 上传人+
-    uploader: '',
-    uploadTime: '', // 上传时间
-    electricityDetail: '',
+    basePower: '', // 基准功率
+    codeNum: '', // 系统节点数
+    genNum: '', // 发电机数
+    loadNum: '', // 系统负荷数
+    branchNum: '', // 节点之间支路数
   }
 }
 const deviceTypeList = ref([])
@@ -69,6 +71,10 @@
     areaForm.value = row
     isEditMode.value = true
   }
+  else if (dialogStatus.value === 'detail') {
+    areaForm.value = row
+    isEditMode.value = false
+  }
 }
 defineExpose({
   initDialog,
@@ -78,7 +84,7 @@
 const createData = () => {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
-      areaForm.value.uploadTime = dayjs().format('YYYY-MM-DD')
+      // areaForm.value.uploadTime = dayjs().format('YYYY-MM-DD')
       btnLoading.value = true
       addElectricityList(areaForm.value).then((response) => {
         if (response.code === 200) {
@@ -104,7 +110,7 @@
 const updateData = () => {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
-      areaForm.value.uploadTime = dayjs().format('YYYY-MM-DD')
+      // areaForm.value.uploadTime = dayjs().format('YYYY-MM-DD')
       btnLoading.value = true
       updateElectricityList(areaForm.value).then((response) => {
         if (response.code === 200) {
@@ -167,36 +173,43 @@
     <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="140px">
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="基准功率:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '基准功率' : ''" />
+          <el-form-item label="配电网名称:" prop="electricityName">
+            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '配电网名称' : ''" :disabled="dialogStatus === 'detail'" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="系统节点数:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '系统节点数' : ''" />
+          <el-form-item label="基准功率:" prop="basePower">
+            <el-input v-model="areaForm.basePower" :placeholder="dialogStatus === 'create' ? '基准功率' : ''" :disabled="dialogStatus === 'detail'" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="发电机数:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '发电机数' : ''" />
+          <el-form-item label="系统节点数:" prop="codeNum">
+            <el-input v-model="areaForm.codeNum" :placeholder="dialogStatus === 'create' ? '系统节点数' : ''" :disabled="dialogStatus === 'detail'" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="系统负荷数:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '系统负荷数' : ''" />
+          <el-form-item label="发电机数:" prop="genNum">
+            <el-input v-model="areaForm.genNum" :placeholder="dialogStatus === 'create' ? '发电机数' : ''" :disabled="dialogStatus === 'detail'" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点之间支路数:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '节点之间支路数' : ''" />
+          <el-form-item label="系统负荷数:" prop="loadNum">
+            <el-input v-model="areaForm.loadNum" :placeholder="dialogStatus === 'create' ? '系统负荷数' : ''" :disabled="dialogStatus === 'detail'" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="20">
+          <el-form-item label="节点之间支路数:" prop="branchNum">
+            <el-input v-model="areaForm.branchNum" :placeholder="dialogStatus === 'create' ? '节点之间支路数' : ''" :disabled="dialogStatus === 'detail'" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -240,7 +253,7 @@
         </el-col>
       </el-row> -->
     </el-form>
-    <template #footer>
+    <template v-if="dialogStatus !== 'detail'" #footer>
       <div class="dialog-footer">
         <el-button :loading="btnLoading" type="primary" @click="saveData">
           保存
@@ -250,6 +263,13 @@
         </el-button>
       </div>
     </template>
+    <template v-else #footer>
+      <div class="dialog-footer">
+        <el-button :loading="btnLoading" type="primary" @click="dialogFormVisible = false">
+          确认
+        </el-button>
+      </div>
+    </template>
   </el-dialog>
 </template>
 

diff --git a/src/api/api/index.ts b/src/api/api/index.ts
index 4a6cf27..0af6bf9 100644
--- a/src/api/api/index.ts
+++ b/src/api/api/index.ts
@@ -110,13 +110,43 @@
     method: 'post',
   })
 }
-// 配电网节点查询
+// 配电网节点查询 / 母线参数
 export function electricityNode(id: any) {
   return request({
     url: `/electricityNode/list?electricityId=${id}`,
     method: 'get',
   })
 }
+// 母线参数新增
+export function electricityNodeAdd(data: object) {
+  return request({
+    url: '/electricityNode/add',
+    method: 'post',
+    data,
+  })
+}
+// 母线参数修改
+export function electricityNodeUpdate(data: object) {
+  return request({
+    url: '/electricityNode/update',
+    method: 'post',
+    data,
+  })
+}
+// 母线参数删除
+export function electricityNodeDelete(id: string) {
+  return request({
+    url: `/electricityNode/delete?id=${id}`,
+    method: 'post',
+  })
+}
+// 配电网支路查询
+export function electricityBranch(id: any) {
+  return request({
+    url: `/branchNodeInfo/branchList?electricityId=${id}`,
+    method: 'get',
+  })
+}
 // 光伏/楼宇/电动车管理列表
 export function getMonitorStation(params: any) {
   return request({
@@ -125,6 +155,13 @@
     params,
   })
 }
+// 光伏列表 - 不分页
+export function getMonitorStationList() {
+  return request({
+    url: '/monitorStation/list',
+    method: 'get',
+  })
+}
 // 添加 光伏/楼宇/电动车管
 export function addMonitorStation(data: any) {
   return request({
diff --git a/src/components.d.ts b/src/components.d.ts
index 1bd3d1b..5c3eb2a 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -40,6 +40,8 @@
     ImagePreview: typeof import('./components/ImagePreview/index.vue')['default']
     ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default']
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
+    InfoWindow: typeof import('./components/map/infoWindow.vue')['default']
+    InfoWindow2: typeof import('./components/map/infoWindow2.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     Map: typeof import('./components/map/index.vue')['default']
     MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index a5c8ec3..00994da 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -5,7 +5,9 @@
  -->
 <script lang="ts" setup name="GuadMap">
 import AMapLoader from '@amap/amap-jsapi-loader'
-import { electricityNode, getElectricityListAll } from '@/api/api/index'
+import infoDetail from './infoWindow.vue'
+import infoDetail2 from './infoWindow2.vue'
+import { electricityBranch, electricityNode, getElectricityListAll, getMonitorStationList } from '@/api/api/index'
 // 设置安全密钥
 window._AMapSecurityConfig = {
   securityJsCode: '56bf9671d4b3517d294caec4751889a1', // 后期需替换
@@ -24,10 +26,19 @@
   [111.739906, 40.83686],
   [111.739906, 40.83386],
 ])
-// 区域点数组
+// 电网节点数组
 const markerArr = ref([
 ])
+// 光伏数组
+const markerArr1 = ref([
+])
+// 信息窗体
+const infoWindow = ref()
+const infoWindow2 = ref()
+const windowInfoRef = ref()
+const windowInfoRef2 = ref()
 const markerArrInfo = ref()
+const markerArrInfo1 = ref()
 // 折现节点坐标
 const lineArr = ref([])
 // 初始化地图
@@ -35,14 +46,15 @@
   AMapLoader.load({
     key: '40849e82b4e33f5255b17372520c954d', // 后期需替换
     version: '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
-    plugins: ['AMap.Scale', 'AMap.MouseTool'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
+    plugins: ['AMap.Scale', 'AMap.MouseTool', 'AMap.ToolBar'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
   })
     .then((AMap) => {
       // 初始化地图
       map.value = new AMap.Map('map', {
-        viewMode: '2D', //  是否为3D地图模式
+        viewMode: '3D', //  是否为3D地图模式
         zoom: 17, // 初始化地图级别
-        center: markerArr.value[0],
+        // center: markerArr.value[0],
+        center: [116.26755900, 39.91547100],
         resizeEnable: true,
       })
       // 用来画区域的
@@ -78,7 +90,7 @@
       //   }
       //   console.log(arr)// 121.540994,29.870174;121.55138,29.858116;121.55756,29.874193;
       // })
-      // 标记点绘制
+      // 电网支路标记点绘制
       for (let i = 0; i < markerArr.value.length; i++) {
         const icon = new AMap.Icon({
           size: new AMap.Size(36, 36), // 图标尺寸
@@ -87,58 +99,213 @@
           imageSize: new AMap.Size(24, 30), // 根据所设置的大小拉伸或压缩图片
           imageOffset: new AMap.Pixel(0, 0), // 图像相对展示区域的偏移量，适于雪碧图等
         })
-        // const content = '<div>111</div>'
         const marker = new AMap.Marker({
           position: markerArr.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
           map: map.value,
           title: '测试坐标',
           icon,
-          offset: new AMap.Pixel(-20, -20),
+          offset: new AMap.Pixel(3, -30),
+        })
+        // 支路点详细信息// 信息窗体
+        infoWindow.value = new AMap.InfoWindow({
+          isCustom: true, // 自定义信息窗体
+          content: windowInfoRef.value.$el, // 窗体内容(vue组件)
+          offset: new AMap.Pixel(9, -5), // 偏移
+        })
+        marker.on('click', (e) => {
+          // 打开信息窗口
+          // infoWindow.value.setContent(e.target.content)
+          infoWindow.value.open(map.value, e.lnglat)
+          // 初始化信息窗口
+          windowInfoRef.value.initialize({
+            overlay: e.target,
+            infoWindow: infoWindow.value,
+            info: markerArrInfo.value[i],
+          })
         })
         marker.setLabel({
           offset: new AMap.Pixel(-10, -2), // 设置文本标注偏移量
-          content: `<div>${markerArrInfo.value[i].busId}</div>`, // 设置文本标注内容
+          content: `<div>${markerArrInfo.value[i].nodeName}</div>`, // 设置文本标注内容
           direction: 'right', // 设置文本标注方位
         })
         map.value.add([marker])
-        // 标记点文本
-        // 自动适应显示想显示的范围区域
-        // map.value.setFitView()
       }
-      // 折现(
-      // 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)
+      // 光伏标记点及光伏绘制
+      for (let i = 0; i < markerArr1.value.length; i++) {
+        const icon = new AMap.Icon({
+          size: new AMap.Size(36, 36), // 图标尺寸
+          image: 'http://111.198.10.15:11404/imgs/2.png', // Icon的图像
+          imageSize: new AMap.Size(24, 30), // 根据所设置的大小拉伸或压缩图片
+          imageOffset: new AMap.Pixel(0, 0), // 图像相对展示区域的偏移量，适于雪碧图等
+        })
+        // const content = '<div>111</div>'
+        const marker = new AMap.Marker({
+          position: markerArr1.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+          map: map.value,
+          title: '测试坐标',
+          icon,
+          offset: new AMap.Pixel(-20, -20),
+        })
+        // 信息窗体
+        infoWindow2.value = new AMap.InfoWindow({
+          isCustom: true, // 自定义信息窗体
+          content: windowInfoRef2.value.$el, // 窗体内容(vue组件)
+          offset: new AMap.Pixel(9, -5), // 偏移
+        })
+        marker.on('click', (e) => {
+          // 打开信息窗口
+          infoWindow2.value.open(map.value, e.lnglat)
+          // infoWindow2.value.setContent(e.target)
+          // 初始化信息窗口
+          windowInfoRef2.value.initialize({
+            overlay: e.target,
+            infoWindow: infoWindow2.value,
+            info: markerArrInfo1.value[i],
+          })
+        })
+        marker.setLabel({
+          offset: new AMap.Pixel(-10, -2), // 设置文本标注偏移量
+          content: `<div>${markerArrInfo1.value[i].stationName}</div>`, // 设置文本标注内容
+          direction: 'right', // 设置文本标注方位
+        })
+        map.value.add([marker])
+        // 绘制电网和节点连线
+        const path = markerArrInfo1.value.map((item) => {
+          return [[Number(item.lng), Number(item.lat)], [Number(item.nodeLng), Number(item.nodeLat)]]
+        })
+        const polyline = new AMap.Polyline({
+          path,
+          strokeColor: '#03A382',
+          strokeStyle: 'dashed',
+          strokeDasharray: [10, 3],
+          lineJoin: 'round',
+          lineCap: 'round',
+          zIndex: 50,
+          zooms: [16, 20],
+        })
+        polyline.setMap(map.value)
+        map.value.add(polyline)
+      }
+      // 电网支路折线绘制
+      for (let i = 0; i < lineArr.value.length; i++) {
+        // console.log(lineArr.value[i])
+        const path = lineArr.value.map(item => item.branchNodeInfos)
+        const line = path.map(item => (
+          item.map((child) => {
+            return ([[child.flng, child.flat], [child.tlng, child.tlat], child.status2])
+          })
+        ))
+        line.forEach((item) => {
+          item.forEach((child) => {
+            const path = [child[0], child[1]]
+            const polyline = new AMap.Polyline({
+              path,
+              // isOutline: true,
+              strokeColor: child[2] === 1 ? '#008d68' : '#000',
+              // strokeOpacity: 1,
+              strokeWeight: 3,
+              // 折线样式还支持 'dashed'
+              strokeStyle: child[2] !== 1 ? 'dashed' : 'dashed ',
+              // strokeStyle是dashed时有效
+              strokeDasharray: [10, 3],
+              lineJoin: 'round',
+              showDir: child[2] === 1,
+              // lineCap: 'square',
+              lineCap: 'round',
+              zIndex: 50,
+              zooms: [16, 20],
+
+            })
+            polyline.setMap(map.value)
+            map.value.add(polyline)
+          })
+        })
+        // 添加支路折线文本
+        // 创建纯文本标记
+        const textArr = path.map(item => (
+          item.map((child) => {
+            return ([[(Number(child.flng) + Number(child.tlng)) / 2, (Number(child.flat) + Number(child.tlat)) / 2], child.flowRate])
+          })
+        ))
+        textArr.forEach((item) => {
+          // console.log(item, 'item')
+          item.forEach((child) => {
+            const icon = new AMap.Icon({
+              size: new AMap.Size(36, 36), // 图标尺寸
+              // image: '', // Icon的图像
+              imageSize: new AMap.Size(24, 30), // 根据所设置的大小拉伸或压缩图片
+              imageOffset: new AMap.Pixel(0, 0), // 图像相对展示区域的偏移量，适于雪碧图等
+            })
+            // const content = '<div>111</div>'
+            const marker = new AMap.Marker({
+              position: child[0], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+              map: map.value,
+              content: '<span></span>',
+              offset: new AMap.Pixel(-20, -20),
+            })
+            marker.setLabel({
+              offset: new AMap.Pixel(-10, -2), // 设置文本标注偏移量
+              content: `<div>${`${child[1]}kgCO2/h`}</div>`, // 设置文本标注内容
+              direction: 'right', // 设置文本标注方位
+            })
+            map.value.add([marker])
+          })
+        })
+      }
     })
     .catch((e) => {
       console.log(e)
     })
 }
-onMounted(() => {
-  getElectricityListAll().then((res) => {
+onMounted(async () => {
+  // 获取电网列表
+  try {
+    const list = await getElectricityListAll()
     // 电网列表
-    electricityList.value = res.data
-    // 默认选中第一个查询节点
+    electricityList.value = list.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()
-      })
+      const res = await electricityNode(electricityList.value[0].id)
+      markerArr.value = res.data.map(item => ([Number(item.lng), Number(item.lat)]))
+      markerArrInfo.value = res.data
+      // 获取支路信息(折线)
+      const res1 = await electricityBranch(electricityList.value[0].id)
+      lineArr.value = res1.data
     }
-  })
+    // 获取光伏列表
+    const list1 = await getMonitorStationList()
+    markerArr1.value = list1.data.map(item => ([Number(item.lng), Number(item.lat)]))
+    markerArrInfo1.value = list1.data
+    // 初始化地图
+    initMap()
+  }
+  catch (error) {
+    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
+  //       // 获取支路
+  //       electricityBranch(electricityList.value[0].id).then(res => {
+  //         lineArr.value = res.data
+  //         // console.log(res.data)
+  //         initMap()
+  //       })
+  //     })
+  //   }
+  // })
 })
 </script>
 
 <template>
   <div id="map" />
+  <info-detail ref="windowInfoRef" />
+  <info-detail2 ref="windowInfoRef2" />
 </template>
 
 <style scoped>
diff --git a/src/components/map/infoWindow.vue b/src/components/map/infoWindow.vue
new file mode 100644
index 0000000..1df9061
--- /dev/null
+++ b/src/components/map/infoWindow.vue
@@ -0,0 +1,83 @@
+<!--
+  Description: 高德地图信息窗体 - 支路节点
+  Author: 李亚光
+  Date: 2023-05-10
+ -->
+<script lang="ts" setup name="infoWindow">
+const overlay = ref()
+const infoWindow = ref()
+const info = ref()
+// 初始化
+const initialize = (e) => {
+  overlay.value = e.overlay
+  infoWindow.value = e.infoWindow
+  info.value = e.info
+}
+defineExpose({ initialize })
+// 关闭
+const close = () => {
+  infoWindow.value.close()
+}
+</script>
+
+<template>
+  <div class="container">
+    <div class="title">
+      <div class="text">
+        {{ info?.nodeName }}
+      </div>
+      <div class="close" @click="close">
+        x
+      </div>
+    </div>
+    <div class="item">
+      节点编号 : {{ info?.busId }}
+    </div>
+    <div class="item">
+      <span>负荷有功功率 : {{ info?.pd }}</span>  <span>负荷无功功率 : {{ info?.qd }}</span>
+    </div>
+    <div class="item">
+      <span>节点碳势 : {{ info?.en }}</span>  <span>节点负荷碳流率 : {{ info?.flowRate }}</span>
+    </div>
+    <!-- // <div class="item">设备信息 : {{ device.produceCode }}</div>
+    // <div class="item">设备ID : {{ device.deviceId }}</div>
+    // <div class="item">IP地址 : {{ device.deviceIp }}</div>
+    // <div class="item">地址 : {{ device.deviceAddress }}</div> -->
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  width: 340px;
+  height: 140px;
+  padding: 10px;
+  background-color: #fff;
+  border: 1px solid #6d9ece;
+
+  .title {
+    font-size: 16px;
+    font-weight: 700;
+    padding: 0 10px;
+    display: flex;
+    justify-content: space-between;
+
+    .close {
+      color: #ccc;
+
+      &:hover {
+        cursor: pointer;
+      }
+    }
+  }
+
+  .item {
+    padding: 0 5px;
+    color: #111213;
+    font-size: 14px;
+    margin: 10px;
+    border-bottom: 1px solid #ccc;
+    display: flex;
+    justify-content: space-between;
+  }
+}
+</style>
diff --git a/src/components/map/infoWindow2.vue b/src/components/map/infoWindow2.vue
new file mode 100644
index 0000000..407e288
--- /dev/null
+++ b/src/components/map/infoWindow2.vue
@@ -0,0 +1,80 @@
+<!--
+  Description: 高德地图信息窗体 - 光伏节点
+  Author: 李亚光
+  Date: 2023-05-10
+ -->
+<script lang="ts" setup name="infoWindow">
+const overlay = ref()
+const infoWindow = ref()
+const info = ref()
+// 初始化
+const initialize = (e) => {
+  overlay.value = e.overlay
+  infoWindow.value = e.infoWindow
+  info.value = e.info
+  console.log(e, '123')
+}
+defineExpose({ initialize })
+// 关闭
+const close = () => {
+  infoWindow.value.close()
+}
+</script>
+
+<template>
+  <div class="container">
+    <div class="title">
+      <div class="text">
+        {{ info?.stationName }}
+      </div>
+      <div class="close" @click="close">
+        x
+      </div>
+    </div>
+    <div class="item">
+      光伏挂载节点 : {{ info?.nodeId }}
+    </div>
+    <div class="item">
+      <span>发电机组有功 : {{ info?.pg }}</span>  <span>发电机组无功 : {{ info?.qg }}</span>
+    </div>
+    <div class="item">
+      碳排强度 : {{ info?.strength }}
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  width: 340px;
+  height: 140px;
+  padding: 10px;
+  background-color: #fff;
+  border: 1px solid #6d9ece;
+
+  .title {
+    font-size: 16px;
+    font-weight: 700;
+    padding: 0 10px;
+    display: flex;
+    justify-content: space-between;
+
+    .close {
+      color: #ccc;
+
+      &:hover {
+        cursor: pointer;
+      }
+    }
+  }
+
+  .item {
+    padding: 0 5px;
+    color: #111213;
+    font-size: 14px;
+    margin: 10px;
+    border-bottom: 1px solid #ccc;
+    display: flex;
+    justify-content: space-between;
+  }
+}
+</style>
diff --git a/src/static/1.png b/src/static/1.png
new file mode 100644
index 0000000..9dca264
--- /dev/null
+++ b/src/static/1.png
Binary files differ
diff --git a/src/static/2.png b/src/static/2.png
new file mode 100644
index 0000000..0eb5760
--- /dev/null
+++ b/src/static/2.png
Binary files differ
diff --git a/src/views/data/electricity/components/busbarAdd.vue b/src/views/data/electricity/components/busbarAdd.vue
index 7f81ed6..fa5ccb8 100644
--- a/src/views/data/electricity/components/busbarAdd.vue
+++ b/src/views/data/electricity/components/busbarAdd.vue
@@ -7,8 +7,7 @@
 import type { FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
-import showPhoto from './showPhoto.vue'
-import { addElectricityList, updateElectricityList, uploadApi } from '@/api/api/index'
+import { electricityNodeAdd, electricityNodeUpdate } from '@/api/api/index'
 import { getUserList } from '@/api/system/user'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
@@ -16,12 +15,19 @@
 const dialogStatus = ref('') // 对话框类型：create,update
 const isEditMode = ref(true)
 const areaForm = ref({
-  electricityName: '', // 配电网名称
-  electricityArea: '', // 配电网区域
-  uploaderName: '', // 上传人
-  uploader: '',
-  uploadTime: '', // 上传时间
-  electricityDetail: '', // 详情图片
+  type: '', // 节点类型
+  gs: '', // 节点并联电导
+  bs: '', // 节点并联电纳
+  area: '', // 母线断面号
+  vm: '', // 节点电压初始幅值
+  va: '', // 节点电压初始相位角
+  zone: '', // 母线省损耗区域
+  vmax: '', // 节点最大电压
+  vmin: '', // 节点最小电压
+  pd: '', // 负荷有功功率
+  qd: '', // 负荷无功功率
+  // qd: '', // 负荷无功功率
+  // qd: '', // 负荷无功功率
 }) // 表单
 const textMap: { [key: string]: string } = {
   update: '编辑',
@@ -29,11 +35,17 @@
 } // 表头显示标题
 const btnLoading = ref(false) // 保存按钮的加载中状态
 const rules: FormRules = {
-  electricityName: [{ required: true, message: '请输入配电网名称', trigger: ['blur', 'change'] }],
-  electricityArea: [{ required: true, message: '请输入配电网区域', trigger: ['blur', 'change'] }],
-  uploader: [{ required: true, message: '请选择上传人', trigger: ['blur', 'change'] }],
-  uploadTime: [{ required: true, message: '请选择上传时间', trigger: ['blur', 'change'] }],
-  electricityDetail: [{ required: true, message: '请上传附件', trigger: ['blur', 'change'] }],
+  type: [{ required: true, message: '请选择节点类型', trigger: ['blur', 'change'] }],
+  gs: [{ required: true, message: '节点并联电导', trigger: ['blur', 'change'] }],
+  bs: [{ required: true, message: '节点并联电纳', trigger: ['blur', 'change'] }],
+  area: [{ required: true, message: '母线断面号', trigger: ['blur', 'change'] }],
+  vm: [{ required: true, message: '节点电压初始幅值', trigger: ['blur', 'change'] }],
+  va: [{ required: true, message: '节点电压初始相位角', trigger: ['blur', 'change'] }],
+  zone: [{ required: true, message: '母线省损耗区域', trigger: ['blur', 'change'] }],
+  vmax: [{ required: true, message: '节点最大电压', trigger: ['blur', 'change'] }],
+  vmin: [{ required: true, message: '节点最小电压', trigger: ['blur', 'change'] }],
+  pd: [{ required: true, message: '负荷有功功率', trigger: ['blur', 'change'] }],
+  qd: [{ required: true, message: '负荷无功功率', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 // 获取用户列表
 const userList = ref<any[]>([])
@@ -46,12 +58,17 @@
 // 重置表单
 const resetForm = () => {
   areaForm.value = {
-    electricityName: '', // 配电网名称
-    electricityArea: '', // 配电网区域
-    uploaderName: '', // 上传人+
-    uploader: '',
-    uploadTime: '', // 上传时间
-    electricityDetail: '',
+    type: '', // 节点类型
+    gs: '', // 节点并联电导
+    bs: '', // 节点并联电纳
+    area: '', // 母线断面号
+    vm: '', // 节点电压初始幅值
+    va: '', // 节点电压初始相位角
+    zone: '', // 母线省损耗区域
+    vmax: '', // 节点最大电压
+    vmin: '', // 节点最小电压
+    pd: '', // 负荷有功功率
+    qd: '', // 负荷无功功率
   }
 }
 const deviceTypeList = ref([])
@@ -80,9 +97,8 @@
 const createData = () => {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
-      areaForm.value.uploadTime = dayjs().format('YYYY-MM-DD')
       btnLoading.value = true
-      addElectricityList(areaForm.value).then((response) => {
+      electricityNodeAdd(areaForm.value).then((response) => {
         if (response.code === 200) {
           btnLoading.value = false
           // 通知父组件刷新状态
@@ -106,9 +122,8 @@
 const updateData = () => {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
-      areaForm.value.uploadTime = dayjs().format('YYYY-MM-DD')
       btnLoading.value = true
-      updateElectricityList(areaForm.value).then((response) => {
+      electricityNodeUpdate(areaForm.value).then((response) => {
         if (response.code === 200) {
           ElMessage({
             message: '修改成功',
@@ -168,91 +183,89 @@
   <el-dialog v-model="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
     <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="160px">
       <el-col :span="20">
-        <el-form-item label="节点类型" prop="deviceId">
-          <el-select v-model="areaForm.electricityName" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择节点类型' : ''" style="width: 100%;">
-            <el-option
-              v-for="item in []"
-              :key="item.id"
-              :label="item.deviceName"
-              :value="item.id"
-            />
+        <el-form-item label="节点类型">
+          <el-select
+            v-model="areaForm.type" class="m-2"
+            :placeholder="dialogStatus === 'create' ? '请选择节点类型' : ''" style="width: 100%;"
+          >
+            <el-option v-for="item in []" :key="item.id" :label="item.deviceName" :value="item.id" />
           </el-select>
         </el-form-item>
       </el-col>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点并联电导:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入节点并联电导' : ''" />
+          <el-form-item label="节点并联电导:" prop="gs">
+            <el-input v-model="areaForm.gs" :placeholder="dialogStatus === 'create' ? '请输入节点并联电导' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点并联电纳:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入节点并联电纳' : ''" />
+          <el-form-item label="节点并联电纳:" prop="bs">
+            <el-input v-model="areaForm.bs" :placeholder="dialogStatus === 'create' ? '请输入节点并联电纳' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="母线断面号:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入母线断面号' : ''" />
+          <el-form-item label="母线断面号:" prop="area">
+            <el-input v-model="areaForm.area" :placeholder="dialogStatus === 'create' ? '请输入母线断面号' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点电压初始幅值:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入节点电压初始幅值' : ''" />
+          <el-form-item label="节点电压初始幅值:" prop="vm">
+            <el-input v-model="areaForm.vm" :placeholder="dialogStatus === 'create' ? '请输入节点电压初始幅值' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点电压初始相位角:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入节点电压初始相位角' : ''" />
+          <el-form-item label="节点电压初始相位角:" prop="va">
+            <el-input v-model="areaForm.va" :placeholder="dialogStatus === 'create' ? '请输入节点电压初始相位角' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="母线省损耗区域:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入母线省损耗区域' : ''" />
+          <el-form-item label="母线省损耗区域:" prop="zone">
+            <el-input v-model="areaForm.zone" :placeholder="dialogStatus === 'create' ? '请输入母线省损耗区域' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点最大电压:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入节点最大电压' : ''" />
+          <el-form-item label="节点最大电压:" prop="vmax">
+            <el-input v-model="areaForm.vmax" :placeholder="dialogStatus === 'create' ? '请输入节点最大电压' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点最小电压:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入节点最小电压' : ''" />
+          <el-form-item label="节点最小电压:" prop="vmin">
+            <el-input v-model="areaForm.vmin" :placeholder="dialogStatus === 'create' ? '请输入节点最小电压' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="负荷有功功率:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入负荷有功功率' : ''" />
+          <el-form-item label="负荷有功功率:" prop="pd">
+            <el-input v-model="areaForm.pd" :placeholder="dialogStatus === 'create' ? '请输入负荷有功功率' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="负荷无功功率:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入负荷无功功率' : ''" />
+          <el-form-item label="负荷无功功率:" prop="qd">
+            <el-input v-model="areaForm.qd" :placeholder="dialogStatus === 'create' ? '请输入负荷无功功率' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
+      <!-- <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点碳势:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入节点碳势' : ''" />
+          <el-form-item label="节点碳势:" prop="qd">
+            <el-input v-model="areaForm.qd" :placeholder="dialogStatus === 'create' ? '请输入节点碳势' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -262,7 +275,7 @@
             <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入负荷碳流率' : ''" />
           </el-form-item>
         </el-col>
-      </el-row>
+      </el-row> -->
     </el-form>
     <template #footer>
       <div class="dialog-footer">
diff --git a/src/views/data/electricity/components/networkBranch.vue b/src/views/data/electricity/components/networkBranch.vue
index 8d137c0..c1eced0 100644
--- a/src/views/data/electricity/components/networkBranch.vue
+++ b/src/views/data/electricity/components/networkBranch.vue
@@ -6,11 +6,16 @@
 <script lang="ts" setup name="networkBranch">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import editList from './branchAdd.vue'
+import { electricityBranch } from '@/api/api/index'
 const props = defineProps({
   bak: {
     type: Function,
     required: true,
   },
+  id: {
+    type: String,
+    required: true,
+  },
 })
 const bak = () => {
   props.bak(1)
@@ -27,55 +32,31 @@
 const TimeRanges = ref()
 const loadingTable = ref(true)
 const columns = ref([
-  // { text: '设备类型', value: 'deviceTypeName', align: 'center' },
-  // { text: '设备编号', value: 'deviceNo', align: 'center' },
-  // { text: '安装位置', value: 'installLocaltion', align: 'center' },
-  // { text: '电量/V', value: 'electricalVoltage', align: 'center' },
-  // { text: '功率/W', value: 'power', align: 'center' },
-  // { text: '上传时间', value: 'uploadTime', align: 'center' },
-  { text: '支路首端节点', value: '1', align: 'center' },
-  { text: '支路末端节点', value: '2', align: 'center' },
-  { text: '支路电阻标幺值', value: '3', align: 'center' },
-  { text: '支路电纳标幺值', value: '4', align: 'center' },
-  { text: '长距离输电容量', value: '5', align: 'center' },
-  { text: '短距离输电容量', value: '7', align: 'center' },
-  { text: '紧急距离输电容量', value: '8', align: 'center' },
-  { text: '支路变比', value: '9', align: 'center' },
-  { text: '角度', value: '10', align: 'center' },
-  { text: '支路是否运行', value: '11', align: 'center' },
-  { text: '支路最小相位角', value: '12', align: 'center' },
-  { text: '支路碳流率', value: '13', align: 'center' },
+  { text: '支路首端节点', value: 'fbusId', align: 'center' },
+  { text: '支路末端节点', value: 'tbusId', align: 'center' },
+  { text: '支路电阻标幺值', value: 'r', align: 'center' },
+  { text: '支路电纳标幺值', value: 'b', align: 'center' },
+  { text: '长距离输电容量', value: 'ratea', align: 'center' },
+  { text: '短距离输电容量', value: 'rateb', align: 'center' },
+  { text: '紧急距离输电容量', value: 'ratec', align: 'center' },
+  { text: '支路变比', value: 'ratio', align: 'center' },
+  { text: '角度', value: 'angle', align: 'center' },
+  { text: '支路是否运行', value: 'status2', align: 'center' },
+  { text: '支路最小相位角', value: 'angmin', align: 'center' },
+  { text: '支路碳流率', value: 'angmax', align: 'center' },
 ]) // 表格
 const total = ref<number>(0)
 const list = ref<any[]>([])
 // 获取数据列表
 const fetchDataList = () => {
-  // loadingTable.value = true
-  // getMonitorStation(searchQuery).then((res) => {
-  //   list.value = res.data.rows
-  //   total.value = res.data.total
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      1: 22,
-      2: '23',
-      3: 100,
-      4: 100,
-      5: '220',
-      7: 220,
-      8: 110,
-      9: 1,
-      10: 90,
-      11: '是',
-      12: 10,
-      13: '12%',
-    },
-
-  ]
-  total.value = list.value.length
-  loadingTable.value = false
+  loadingTable.value = true
+  electricityBranch(props.id).then((res) => {
+    list.value = res.data.map(item => item.branchNodeInfos[0])
+    total.value = res.data.length
+    loadingTable.value = false
+  })
 }
+fetchDataList()
 // 搜索
 const search = () => {
   fetchDataList()
@@ -128,9 +109,6 @@
 const multiSelect = (row: any[]) => {
   selectList.value = row
 }
-onMounted(() => {
-  search()
-})
 </script>
 
 <template>
diff --git a/src/views/data/electricity/components/networkBusbar.vue b/src/views/data/electricity/components/networkBusbar.vue
index 5386ea1..c1eb19d 100644
--- a/src/views/data/electricity/components/networkBusbar.vue
+++ b/src/views/data/electricity/components/networkBusbar.vue
@@ -6,10 +6,15 @@
 <script lang="ts" setup name="networkBusbar">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import editList from './busbarAdd.vue'
+import { electricityNode, electricityNodeDelete } from '@/api/api/index'
 const props = defineProps({
   bak: {
     type: Function,
-    default: () => {},
+    default: () => { },
+  },
+  id: {
+    type: String,
+    required: true,
   },
 })
 const bak = () => {
@@ -27,55 +32,30 @@
 const TimeRanges = ref()
 const loadingTable = ref(true)
 const columns = ref([
-  // { text: '设备类型', value: 'deviceTypeName', align: 'center' },
-  // { text: '设备编号', value: 'deviceNo', align: 'center' },
-  // { text: '安装位置', value: 'installLocaltion', align: 'center' },
-  // { text: '电量/V', value: 'electricalVoltage', align: 'center' },
-  // { text: '功率/W', value: 'power', align: 'center' },
-  // { text: '上传时间', value: 'uploadTime', align: 'center' },
-  { text: '节点类型', value: '1', align: 'center' },
-  { text: '节点并联电导', value: '2', align: 'center' },
-  { text: '节点并联电纳', value: '3', align: 'center' },
-  { text: '母线断面号', value: '4', align: 'center' },
-  { text: '节点电压初始幅值', value: '5', align: 'center' },
-  { text: '节点电压初始相位角', value: '6', align: 'center' },
-  { text: '母线省损耗区域', value: '7', align: 'center' },
-  { text: '节点最大电压', value: '8', align: 'center' },
-  { text: '节点最小电压', value: '9', align: 'center' },
-  { text: '负荷有功功率', value: '10', align: 'center' },
-  { text: '负荷无功功率', value: '11', align: 'center' },
-  { text: '节点碳势', value: '12', align: 'center' },
-  { text: '负荷碳流率', value: '13', align: 'center' },
+  { text: '节点类型', value: 'type', align: 'center' },
+  { text: '节点并联电导', value: 'gs', align: 'center' },
+  { text: '节点并联电纳', value: 'bs', align: 'center' },
+  { text: '母线断面号', value: 'area', align: 'center' },
+  { text: '节点电压初始幅值', value: 'vm', align: 'center' },
+  { text: '节点电压初始相位角', value: 'va', align: 'center' },
+  { text: '母线省损耗区域', value: 'zone', align: 'center' },
+  { text: '节点最大电压', value: 'vmax', align: 'center' },
+  { text: '节点最小电压', value: 'vmin', align: 'center' },
+  { text: '负荷有功功率', value: 'pd', align: 'center' },
+  { text: '负荷无功功率', value: 'qd', align: 'center' },
+  { text: '节点碳势', value: 'en', align: 'center' },
+  { text: '负荷碳流率', value: 'flowRate', align: 'center' },
 ]) // 表格
 const total = ref<number>(0)
 const list = ref<any[]>([])
 // 获取数据列表
 const fetchDataList = () => {
-  // loadingTable.value = true
-  // getMonitorStation(searchQuery).then((res) => {
-  //   list.value = res.data.rows
-  //   total.value = res.data.total
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      1: '类型1',
-      2: '1',
-      3: '1',
-      4: '1',
-      5: '100',
-      6: '90',
-      7: 'C',
-      8: '220',
-      9: '110',
-      10: '1100',
-      11: '1100',
-      12: '低',
-      13: '1',
-    },
-  ]
-  total.value = list.value.length
-  loadingTable.value = false
+  loadingTable.value = true
+  electricityNode(props.id).then((res) => {
+    list.value = res.data
+    total.value = res.data.length
+    loadingTable.value = false
+  })
 }
 // 搜索
 const search = () => {
diff --git a/src/views/data/electricity/index.vue b/src/views/data/electricity/index.vue
index 881f988..f37ba02 100644
--- a/src/views/data/electricity/index.vue
+++ b/src/views/data/electricity/index.vue
@@ -15,12 +15,8 @@
   },
   {
     id: '1',
-    title: '设备监测',
+    title: '设备监测数据',
   },
-  // {
-  //   id: '2',
-  //   title: '电动汽车及储能',
-  // },
 ])
 const select = ref('')
 const confirm = (selectp: string) => {
@@ -41,7 +37,7 @@
     <!-- 分布式光伏 -->
     <page v-if="select === '分布式光伏'" :station-type="type" />
     <!-- 设备监测 -->
-    <device v-if="select === '设备监测'" />
+    <device v-if="select === '设备监测数据'" />
   </div>
 </template>
 
diff --git a/src/views/data/electricity/network.vue b/src/views/data/electricity/network.vue
index d95d2cd..b79c34b 100644
--- a/src/views/data/electricity/network.vue
+++ b/src/views/data/electricity/network.vue
@@ -34,59 +34,28 @@
 const loadingTable = ref(true)
 // table列表
 const columns = ref([
-  // { text: '配电网名称', value: 'electricityName', align: 'center' },
+  { text: '配电网名称', value: 'electricityName', align: 'center' },
   // { text: '配电网区域', value: 'electricityArea', align: 'center' },
   // { text: '上传人', value: 'uploaderName', align: 'center' },
   // { text: '上传时间', value: 'uploadTime', align: 'center' },
-  { text: '基准功率', value: 'w', align: 'center' },
-  { text: '系统节点数', value: 'x', align: 'center' },
-  { text: '发电机数', value: 'f', align: 'center' },
-  { text: '系统负荷数', value: 'xt', align: 'center' },
-  { text: '节点之间支路数', value: 'j', align: 'center' },
+  { text: '基准功率', value: 'basePower', align: 'center' },
+  { text: '系统节点数', value: 'codeNum', align: 'center' },
+  { text: '发电机数', value: 'genNum', align: 'center' },
+  { text: '系统负荷数', value: 'loadNum', align: 'center' },
+  { text: '节点之间支路数', value: 'branchNum', align: 'center' },
 ])
 const total = ref<number>(0)
 // table列表数据
 const list = ref<any[]>([])
 // 获取数据列表
 const fetchDataList = () => {
-  // loadingTable.value = true
-  // getElectricityList(searchQuery).then((res) => {
-  //   list.value = res.data.rows
-  //   total.value = res.data.total
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      w: 1000,
-      x: 33,
-      f: 5,
-      xt: 32,
-      j: 37,
-    },
-    {
-      w: 1200,
-      x: 133,
-      f: 15,
-      xt: 132,
-      j: 327,
-    },
-    {
-      w: 1100,
-      x: 22,
-      f: 35,
-      xt: 322,
-      j: 39,
-    },
-    {
-      w: 1000,
-      x: 66,
-      f: 12,
-      xt: 62,
-      j: 47,
-    },
-  ]
-  total.value = list.value.length
-  loadingTable.value = false
+  loadingTable.value = true
+  getElectricityList(searchQuery).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+    console.log(res.data, '配电网管理')
+    loadingTable.value = false
+  })
 }
 // 搜索
 const search = () => {
@@ -138,15 +107,16 @@
 const detailRef = ref()
 // 查看详情
 const detail = (row: any) => {
-  if (row.electricityDetail) {
-    detailRef.value.initDialog(row)
-  }
-  else {
-    ElMessage({
-      type: 'info',
-      message: '暂无内容',
-    })
-  }
+  // if (row.electricityDetail) {
+  //   detailRef.value.initDialog(row)
+  // }
+  // else {
+  //   ElMessage({
+  //     type: 'info',
+  //     message: '暂无内容',
+  //   })
+  // }
+  editRef.value.initDialog('detail', row)
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -167,15 +137,26 @@
 onMounted(() => {
   search()
 })
+// 母线参数
+const networdId = ref('')
+const bushbar = (row: any) => {
+  showTable.value = 2
+  networdId.value = row.id
+}
+// 之路参数
+const branch = (row: any) => {
+  showTable.value = 3
+  networdId.value = row.id
+}
 </script>
 
 <template>
   <!-- 配电网分支参数 -->
-  <network-branch v-show="showTable === 3" ref="branchRef" :bak="changeShow" />
+  <network-branch v-if="showTable === 3" :id="networdId" ref="branchRef" :bak="changeShow" />
   <!-- 配电网母线参数 -->
-  <network-busbar v-show="showTable === 2" ref="busbarRef" :bak="changeShow" />
+  <network-busbar v-if="showTable === 2" :id="networdId" ref="busbarRef" :bak="changeShow" />
   <!-- 配电网 -->
-  <div v-show="showTable === 1">
+  <div v-if="showTable === 1">
     <edit-list ref="editRef" @refresh="search" />
     <detail-dialog ref="detailRef" />
     <!-- 筛选条件 -->
@@ -219,7 +200,7 @@
                 size="small"
                 type="primary"
                 link
-                @click="() => { showTable = 2;(row) }"
+                @click="bushbar(row)"
               >
                 母线参数
               </el-button>
@@ -231,7 +212,7 @@
                 size="small"
                 type="primary"
                 link
-                @click="() => { showTable = 3;(row) }"
+                @click="branch(row)"
               >
                 支线参数
               </el-button>
diff --git a/src/views/data/electricity/networkAdd.vue b/src/views/data/electricity/networkAdd.vue
index 159e7dd..d3b1a76 100644
--- a/src/views/data/electricity/networkAdd.vue
+++ b/src/views/data/electricity/networkAdd.vue
@@ -12,23 +12,25 @@
 const isEditMode = ref(true)
 const areaForm = ref({
   electricityName: '', // 配电网名称
-  electricityArea: '', // 配电网区域
-  uploaderName: '', // 上传人
-  uploader: '',
-  uploadTime: '', // 上传时间
-  electricityDetail: '', // 详情图片
+  basePower: '', // 基准功率
+  codeNum: '', // 系统节点数
+  genNum: '', // 发电机数
+  loadNum: '', // 系统负荷数
+  branchNum: '', // 节点之间支路数
 }) // 表单
 const textMap: { [key: string]: string } = {
   update: '编辑',
   create: '新增',
+  detail: '详情',
 } // 表头显示标题
 const btnLoading = ref(false) // 保存按钮的加载中状态
 const rules: FormRules = {
   electricityName: [{ required: true, message: '请输入配电网名称', trigger: ['blur', 'change'] }],
-  electricityArea: [{ required: true, message: '请输入配电网区域', trigger: ['blur', 'change'] }],
-  uploader: [{ required: true, message: '请选择上传人', trigger: ['blur', 'change'] }],
-  uploadTime: [{ required: true, message: '请选择上传时间', trigger: ['blur', 'change'] }],
-  electricityDetail: [{ required: true, message: '请上传附件', trigger: ['blur', 'change'] }],
+  basePower: [{ required: true, message: '请输入基准功率', trigger: ['blur', 'change'] }],
+  codeNum: [{ required: true, message: '请输入系统节点数', trigger: ['blur', 'change'] }],
+  genNum: [{ required: true, message: '请输入发电机数', trigger: ['blur', 'change'] }],
+  loadNum: [{ required: true, message: '请输入系统负荷数', trigger: ['blur', 'change'] }],
+  branchNum: [{ required: true, message: '请输入节点之间支路数', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 // 获取用户列表
 const userList = ref<any[]>([])
@@ -45,11 +47,11 @@
 const resetForm = () => {
   areaForm.value = {
     electricityName: '', // 配电网名称
-    electricityArea: '', // 配电网区域
-    uploaderName: '', // 上传人+
-    uploader: '',
-    uploadTime: '', // 上传时间
-    electricityDetail: '',
+    basePower: '', // 基准功率
+    codeNum: '', // 系统节点数
+    genNum: '', // 发电机数
+    loadNum: '', // 系统负荷数
+    branchNum: '', // 节点之间支路数
   }
 }
 const deviceTypeList = ref([])
@@ -69,6 +71,10 @@
     areaForm.value = row
     isEditMode.value = true
   }
+  else if (dialogStatus.value === 'detail') {
+    areaForm.value = row
+    isEditMode.value = false
+  }
 }
 defineExpose({
   initDialog,
@@ -78,7 +84,7 @@
 const createData = () => {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
-      areaForm.value.uploadTime = dayjs().format('YYYY-MM-DD')
+      // areaForm.value.uploadTime = dayjs().format('YYYY-MM-DD')
       btnLoading.value = true
       addElectricityList(areaForm.value).then((response) => {
         if (response.code === 200) {
@@ -104,7 +110,7 @@
 const updateData = () => {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
-      areaForm.value.uploadTime = dayjs().format('YYYY-MM-DD')
+      // areaForm.value.uploadTime = dayjs().format('YYYY-MM-DD')
       btnLoading.value = true
       updateElectricityList(areaForm.value).then((response) => {
         if (response.code === 200) {
@@ -167,36 +173,43 @@
     <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="140px">
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="基准功率:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '基准功率' : ''" />
+          <el-form-item label="配电网名称:" prop="electricityName">
+            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '配电网名称' : ''" :disabled="dialogStatus === 'detail'" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="系统节点数:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '系统节点数' : ''" />
+          <el-form-item label="基准功率:" prop="basePower">
+            <el-input v-model="areaForm.basePower" :placeholder="dialogStatus === 'create' ? '基准功率' : ''" :disabled="dialogStatus === 'detail'" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="发电机数:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '发电机数' : ''" />
+          <el-form-item label="系统节点数:" prop="codeNum">
+            <el-input v-model="areaForm.codeNum" :placeholder="dialogStatus === 'create' ? '系统节点数' : ''" :disabled="dialogStatus === 'detail'" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="系统负荷数:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '系统负荷数' : ''" />
+          <el-form-item label="发电机数:" prop="genNum">
+            <el-input v-model="areaForm.genNum" :placeholder="dialogStatus === 'create' ? '发电机数' : ''" :disabled="dialogStatus === 'detail'" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点之间支路数:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '节点之间支路数' : ''" />
+          <el-form-item label="系统负荷数:" prop="loadNum">
+            <el-input v-model="areaForm.loadNum" :placeholder="dialogStatus === 'create' ? '系统负荷数' : ''" :disabled="dialogStatus === 'detail'" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="20">
+          <el-form-item label="节点之间支路数:" prop="branchNum">
+            <el-input v-model="areaForm.branchNum" :placeholder="dialogStatus === 'create' ? '节点之间支路数' : ''" :disabled="dialogStatus === 'detail'" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -240,7 +253,7 @@
         </el-col>
       </el-row> -->
     </el-form>
-    <template #footer>
+    <template v-if="dialogStatus !== 'detail'" #footer>
       <div class="dialog-footer">
         <el-button :loading="btnLoading" type="primary" @click="saveData">
           保存
@@ -250,6 +263,13 @@
         </el-button>
       </div>
     </template>
+    <template v-else #footer>
+      <div class="dialog-footer">
+        <el-button :loading="btnLoading" type="primary" @click="dialogFormVisible = false">
+          确认
+        </el-button>
+      </div>
+    </template>
   </el-dialog>
 </template>
 
diff --git a/src/views/data/electricity/page.vue b/src/views/data/electricity/page.vue
index 2ed4f87..d1b96b9 100644
--- a/src/views/data/electricity/page.vue
+++ b/src/views/data/electricity/page.vue
@@ -30,77 +30,29 @@
 }, { deep: true })
 const loadingTable = ref(true)
 const columns = ref([
-  // { text: '设备类型', value: 'deviceTypeName', align: 'center' },
-  // { text: '设备编号', value: 'deviceNo', align: 'center' },
-  // { text: '安装位置', value: 'installLocaltion', align: 'center' },
-  // { text: '电量/V', value: 'electricalVoltage', align: 'center' },
-  // { text: '功率/W', value: 'power', align: 'center' },
-  // { text: '上传时间', value: 'uploadTime', align: 'center' },
-  { text: '发电机组对应节点数', value: '1', align: 'center' },
-  { text: '发电机有功/MW', value: '2', align: 'center' },
-  { text: '发电机无功', value: '3', align: 'center' },
-  { text: '最大无功', value: '4', align: 'center' },
-  { text: '最小无功', value: '5', align: 'center' },
-  { text: '节点电压', value: '6', align: 'center' },
-  { text: '发电机容量', value: '7', align: 'center' },
-  { text: '运行状态', value: '8', align: 'center' },
-  { text: '最大有功', value: '9', align: 'center' },
-  { text: '最小有功', value: '10', align: 'center' },
-  { text: '碳排强度', value: '11', align: 'center' },
+  { text: '发电机组对应节点数', value: 'nodeId', align: 'center' },
+  { text: '发电机有功/MW', value: 'pg', align: 'center' },
+  { text: '发电机无功', value: 'qg', align: 'center' },
+  { text: '最大无功', value: 'qmax', align: 'center' },
+  { text: '最小无功', value: 'qmin', align: 'center' },
+  { text: '节点电压', value: 'vg', align: 'center' },
+  { text: '发电机容量', value: 'mbase', align: 'center' },
+  { text: '运行状态', value: 'status', align: 'center' },
+  { text: '最大有功', value: 'pmax', align: 'center' },
+  { text: '最小有功', value: 'pmin', align: 'center' },
+  { text: '碳排强度', value: 'strength', align: 'center' },
 ]) // 表格
 const total = ref<number>(0)
 const list = ref<any[]>([])
 // 获取数据列表
 const fetchDataList = () => {
-  // loadingTable.value = true
-  // getMonitorStation(searchQuery).then((res) => {
-  //   list.value = res.data.rows
-  //   total.value = res.data.total
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      1: 33,
-      2: 1000,
-      3: 10,
-      4: 1100,
-      5: 1000,
-      6: 220,
-      7: 3600,
-      8: '正常',
-      9: 1100,
-      10: 1000,
-      11: '弱',
-    },
-    {
-      1: 133,
-      2: 900,
-      3: 10,
-      4: 1100,
-      5: 1000,
-      6: 220,
-      7: 3600,
-      8: '异常',
-      9: 1000,
-      10: 1000,
-      11: '强',
-    },
-    {
-      1: 22,
-      2: 1000,
-      3: 10,
-      4: 1100,
-      5: 1000,
-      6: 220,
-      7: 3600,
-      8: '离线',
-      9: 1000,
-      10: 1000,
-      11: '弱',
-    },
-  ]
-  total.value = list.value.length
-  loadingTable.value = false
+  loadingTable.value = true
+  getMonitorStation(searchQuery).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+    console.log(res.data, '分布式光伏')
+    loadingTable.value = false
+  })
 }
 // 搜索
 const search = () => {

diff --git a/src/api/api/index.ts b/src/api/api/index.ts
index 4a6cf27..0af6bf9 100644
--- a/src/api/api/index.ts
+++ b/src/api/api/index.ts
@@ -110,13 +110,43 @@
     method: 'post',
   })
 }
-// 配电网节点查询
+// 配电网节点查询 / 母线参数
 export function electricityNode(id: any) {
   return request({
     url: `/electricityNode/list?electricityId=${id}`,
     method: 'get',
   })
 }
+// 母线参数新增
+export function electricityNodeAdd(data: object) {
+  return request({
+    url: '/electricityNode/add',
+    method: 'post',
+    data,
+  })
+}
+// 母线参数修改
+export function electricityNodeUpdate(data: object) {
+  return request({
+    url: '/electricityNode/update',
+    method: 'post',
+    data,
+  })
+}
+// 母线参数删除
+export function electricityNodeDelete(id: string) {
+  return request({
+    url: `/electricityNode/delete?id=${id}`,
+    method: 'post',
+  })
+}
+// 配电网支路查询
+export function electricityBranch(id: any) {
+  return request({
+    url: `/branchNodeInfo/branchList?electricityId=${id}`,
+    method: 'get',
+  })
+}
 // 光伏/楼宇/电动车管理列表
 export function getMonitorStation(params: any) {
   return request({
@@ -125,6 +155,13 @@
     params,
   })
 }
+// 光伏列表 - 不分页
+export function getMonitorStationList() {
+  return request({
+    url: '/monitorStation/list',
+    method: 'get',
+  })
+}
 // 添加 光伏/楼宇/电动车管
 export function addMonitorStation(data: any) {
   return request({
diff --git a/src/components.d.ts b/src/components.d.ts
index 1bd3d1b..5c3eb2a 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -40,6 +40,8 @@
     ImagePreview: typeof import('./components/ImagePreview/index.vue')['default']
     ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default']
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
+    InfoWindow: typeof import('./components/map/infoWindow.vue')['default']
+    InfoWindow2: typeof import('./components/map/infoWindow2.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     Map: typeof import('./components/map/index.vue')['default']
     MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index a5c8ec3..00994da 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -5,7 +5,9 @@
  -->
 <script lang="ts" setup name="GuadMap">
 import AMapLoader from '@amap/amap-jsapi-loader'
-import { electricityNode, getElectricityListAll } from '@/api/api/index'
+import infoDetail from './infoWindow.vue'
+import infoDetail2 from './infoWindow2.vue'
+import { electricityBranch, electricityNode, getElectricityListAll, getMonitorStationList } from '@/api/api/index'
 // 设置安全密钥
 window._AMapSecurityConfig = {
   securityJsCode: '56bf9671d4b3517d294caec4751889a1', // 后期需替换
@@ -24,10 +26,19 @@
   [111.739906, 40.83686],
   [111.739906, 40.83386],
 ])
-// 区域点数组
+// 电网节点数组
 const markerArr = ref([
 ])
+// 光伏数组
+const markerArr1 = ref([
+])
+// 信息窗体
+const infoWindow = ref()
+const infoWindow2 = ref()
+const windowInfoRef = ref()
+const windowInfoRef2 = ref()
 const markerArrInfo = ref()
+const markerArrInfo1 = ref()
 // 折现节点坐标
 const lineArr = ref([])
 // 初始化地图
@@ -35,14 +46,15 @@
   AMapLoader.load({
     key: '40849e82b4e33f5255b17372520c954d', // 后期需替换
     version: '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
-    plugins: ['AMap.Scale', 'AMap.MouseTool'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
+    plugins: ['AMap.Scale', 'AMap.MouseTool', 'AMap.ToolBar'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
   })
     .then((AMap) => {
       // 初始化地图
       map.value = new AMap.Map('map', {
-        viewMode: '2D', //  是否为3D地图模式
+        viewMode: '3D', //  是否为3D地图模式
         zoom: 17, // 初始化地图级别
-        center: markerArr.value[0],
+        // center: markerArr.value[0],
+        center: [116.26755900, 39.91547100],
         resizeEnable: true,
       })
       // 用来画区域的
@@ -78,7 +90,7 @@
       //   }
       //   console.log(arr)// 121.540994,29.870174;121.55138,29.858116;121.55756,29.874193;
       // })
-      // 标记点绘制
+      // 电网支路标记点绘制
       for (let i = 0; i < markerArr.value.length; i++) {
         const icon = new AMap.Icon({
           size: new AMap.Size(36, 36), // 图标尺寸
@@ -87,58 +99,213 @@
           imageSize: new AMap.Size(24, 30), // 根据所设置的大小拉伸或压缩图片
           imageOffset: new AMap.Pixel(0, 0), // 图像相对展示区域的偏移量，适于雪碧图等
         })
-        // const content = '<div>111</div>'
         const marker = new AMap.Marker({
           position: markerArr.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
           map: map.value,
           title: '测试坐标',
           icon,
-          offset: new AMap.Pixel(-20, -20),
+          offset: new AMap.Pixel(3, -30),
+        })
+        // 支路点详细信息// 信息窗体
+        infoWindow.value = new AMap.InfoWindow({
+          isCustom: true, // 自定义信息窗体
+          content: windowInfoRef.value.$el, // 窗体内容(vue组件)
+          offset: new AMap.Pixel(9, -5), // 偏移
+        })
+        marker.on('click', (e) => {
+          // 打开信息窗口
+          // infoWindow.value.setContent(e.target.content)
+          infoWindow.value.open(map.value, e.lnglat)
+          // 初始化信息窗口
+          windowInfoRef.value.initialize({
+            overlay: e.target,
+            infoWindow: infoWindow.value,
+            info: markerArrInfo.value[i],
+          })
         })
         marker.setLabel({
           offset: new AMap.Pixel(-10, -2), // 设置文本标注偏移量
-          content: `<div>${markerArrInfo.value[i].busId}</div>`, // 设置文本标注内容
+          content: `<div>${markerArrInfo.value[i].nodeName}</div>`, // 设置文本标注内容
           direction: 'right', // 设置文本标注方位
         })
         map.value.add([marker])
-        // 标记点文本
-        // 自动适应显示想显示的范围区域
-        // map.value.setFitView()
       }
-      // 折现(
-      // 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)
+      // 光伏标记点及光伏绘制
+      for (let i = 0; i < markerArr1.value.length; i++) {
+        const icon = new AMap.Icon({
+          size: new AMap.Size(36, 36), // 图标尺寸
+          image: 'http://111.198.10.15:11404/imgs/2.png', // Icon的图像
+          imageSize: new AMap.Size(24, 30), // 根据所设置的大小拉伸或压缩图片
+          imageOffset: new AMap.Pixel(0, 0), // 图像相对展示区域的偏移量，适于雪碧图等
+        })
+        // const content = '<div>111</div>'
+        const marker = new AMap.Marker({
+          position: markerArr1.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+          map: map.value,
+          title: '测试坐标',
+          icon,
+          offset: new AMap.Pixel(-20, -20),
+        })
+        // 信息窗体
+        infoWindow2.value = new AMap.InfoWindow({
+          isCustom: true, // 自定义信息窗体
+          content: windowInfoRef2.value.$el, // 窗体内容(vue组件)
+          offset: new AMap.Pixel(9, -5), // 偏移
+        })
+        marker.on('click', (e) => {
+          // 打开信息窗口
+          infoWindow2.value.open(map.value, e.lnglat)
+          // infoWindow2.value.setContent(e.target)
+          // 初始化信息窗口
+          windowInfoRef2.value.initialize({
+            overlay: e.target,
+            infoWindow: infoWindow2.value,
+            info: markerArrInfo1.value[i],
+          })
+        })
+        marker.setLabel({
+          offset: new AMap.Pixel(-10, -2), // 设置文本标注偏移量
+          content: `<div>${markerArrInfo1.value[i].stationName}</div>`, // 设置文本标注内容
+          direction: 'right', // 设置文本标注方位
+        })
+        map.value.add([marker])
+        // 绘制电网和节点连线
+        const path = markerArrInfo1.value.map((item) => {
+          return [[Number(item.lng), Number(item.lat)], [Number(item.nodeLng), Number(item.nodeLat)]]
+        })
+        const polyline = new AMap.Polyline({
+          path,
+          strokeColor: '#03A382',
+          strokeStyle: 'dashed',
+          strokeDasharray: [10, 3],
+          lineJoin: 'round',
+          lineCap: 'round',
+          zIndex: 50,
+          zooms: [16, 20],
+        })
+        polyline.setMap(map.value)
+        map.value.add(polyline)
+      }
+      // 电网支路折线绘制
+      for (let i = 0; i < lineArr.value.length; i++) {
+        // console.log(lineArr.value[i])
+        const path = lineArr.value.map(item => item.branchNodeInfos)
+        const line = path.map(item => (
+          item.map((child) => {
+            return ([[child.flng, child.flat], [child.tlng, child.tlat], child.status2])
+          })
+        ))
+        line.forEach((item) => {
+          item.forEach((child) => {
+            const path = [child[0], child[1]]
+            const polyline = new AMap.Polyline({
+              path,
+              // isOutline: true,
+              strokeColor: child[2] === 1 ? '#008d68' : '#000',
+              // strokeOpacity: 1,
+              strokeWeight: 3,
+              // 折线样式还支持 'dashed'
+              strokeStyle: child[2] !== 1 ? 'dashed' : 'dashed ',
+              // strokeStyle是dashed时有效
+              strokeDasharray: [10, 3],
+              lineJoin: 'round',
+              showDir: child[2] === 1,
+              // lineCap: 'square',
+              lineCap: 'round',
+              zIndex: 50,
+              zooms: [16, 20],
+
+            })
+            polyline.setMap(map.value)
+            map.value.add(polyline)
+          })
+        })
+        // 添加支路折线文本
+        // 创建纯文本标记
+        const textArr = path.map(item => (
+          item.map((child) => {
+            return ([[(Number(child.flng) + Number(child.tlng)) / 2, (Number(child.flat) + Number(child.tlat)) / 2], child.flowRate])
+          })
+        ))
+        textArr.forEach((item) => {
+          // console.log(item, 'item')
+          item.forEach((child) => {
+            const icon = new AMap.Icon({
+              size: new AMap.Size(36, 36), // 图标尺寸
+              // image: '', // Icon的图像
+              imageSize: new AMap.Size(24, 30), // 根据所设置的大小拉伸或压缩图片
+              imageOffset: new AMap.Pixel(0, 0), // 图像相对展示区域的偏移量，适于雪碧图等
+            })
+            // const content = '<div>111</div>'
+            const marker = new AMap.Marker({
+              position: child[0], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+              map: map.value,
+              content: '<span></span>',
+              offset: new AMap.Pixel(-20, -20),
+            })
+            marker.setLabel({
+              offset: new AMap.Pixel(-10, -2), // 设置文本标注偏移量
+              content: `<div>${`${child[1]}kgCO2/h`}</div>`, // 设置文本标注内容
+              direction: 'right', // 设置文本标注方位
+            })
+            map.value.add([marker])
+          })
+        })
+      }
     })
     .catch((e) => {
       console.log(e)
     })
 }
-onMounted(() => {
-  getElectricityListAll().then((res) => {
+onMounted(async () => {
+  // 获取电网列表
+  try {
+    const list = await getElectricityListAll()
     // 电网列表
-    electricityList.value = res.data
-    // 默认选中第一个查询节点
+    electricityList.value = list.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()
-      })
+      const res = await electricityNode(electricityList.value[0].id)
+      markerArr.value = res.data.map(item => ([Number(item.lng), Number(item.lat)]))
+      markerArrInfo.value = res.data
+      // 获取支路信息(折线)
+      const res1 = await electricityBranch(electricityList.value[0].id)
+      lineArr.value = res1.data
     }
-  })
+    // 获取光伏列表
+    const list1 = await getMonitorStationList()
+    markerArr1.value = list1.data.map(item => ([Number(item.lng), Number(item.lat)]))
+    markerArrInfo1.value = list1.data
+    // 初始化地图
+    initMap()
+  }
+  catch (error) {
+    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
+  //       // 获取支路
+  //       electricityBranch(electricityList.value[0].id).then(res => {
+  //         lineArr.value = res.data
+  //         // console.log(res.data)
+  //         initMap()
+  //       })
+  //     })
+  //   }
+  // })
 })
 </script>
 
 <template>
   <div id="map" />
+  <info-detail ref="windowInfoRef" />
+  <info-detail2 ref="windowInfoRef2" />
 </template>
 
 <style scoped>
diff --git a/src/components/map/infoWindow.vue b/src/components/map/infoWindow.vue
new file mode 100644
index 0000000..1df9061
--- /dev/null
+++ b/src/components/map/infoWindow.vue
@@ -0,0 +1,83 @@
+<!--
+  Description: 高德地图信息窗体 - 支路节点
+  Author: 李亚光
+  Date: 2023-05-10
+ -->
+<script lang="ts" setup name="infoWindow">
+const overlay = ref()
+const infoWindow = ref()
+const info = ref()
+// 初始化
+const initialize = (e) => {
+  overlay.value = e.overlay
+  infoWindow.value = e.infoWindow
+  info.value = e.info
+}
+defineExpose({ initialize })
+// 关闭
+const close = () => {
+  infoWindow.value.close()
+}
+</script>
+
+<template>
+  <div class="container">
+    <div class="title">
+      <div class="text">
+        {{ info?.nodeName }}
+      </div>
+      <div class="close" @click="close">
+        x
+      </div>
+    </div>
+    <div class="item">
+      节点编号 : {{ info?.busId }}
+    </div>
+    <div class="item">
+      <span>负荷有功功率 : {{ info?.pd }}</span>  <span>负荷无功功率 : {{ info?.qd }}</span>
+    </div>
+    <div class="item">
+      <span>节点碳势 : {{ info?.en }}</span>  <span>节点负荷碳流率 : {{ info?.flowRate }}</span>
+    </div>
+    <!-- // <div class="item">设备信息 : {{ device.produceCode }}</div>
+    // <div class="item">设备ID : {{ device.deviceId }}</div>
+    // <div class="item">IP地址 : {{ device.deviceIp }}</div>
+    // <div class="item">地址 : {{ device.deviceAddress }}</div> -->
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  width: 340px;
+  height: 140px;
+  padding: 10px;
+  background-color: #fff;
+  border: 1px solid #6d9ece;
+
+  .title {
+    font-size: 16px;
+    font-weight: 700;
+    padding: 0 10px;
+    display: flex;
+    justify-content: space-between;
+
+    .close {
+      color: #ccc;
+
+      &:hover {
+        cursor: pointer;
+      }
+    }
+  }
+
+  .item {
+    padding: 0 5px;
+    color: #111213;
+    font-size: 14px;
+    margin: 10px;
+    border-bottom: 1px solid #ccc;
+    display: flex;
+    justify-content: space-between;
+  }
+}
+</style>
diff --git a/src/components/map/infoWindow2.vue b/src/components/map/infoWindow2.vue
new file mode 100644
index 0000000..407e288
--- /dev/null
+++ b/src/components/map/infoWindow2.vue
@@ -0,0 +1,80 @@
+<!--
+  Description: 高德地图信息窗体 - 光伏节点
+  Author: 李亚光
+  Date: 2023-05-10
+ -->
+<script lang="ts" setup name="infoWindow">
+const overlay = ref()
+const infoWindow = ref()
+const info = ref()
+// 初始化
+const initialize = (e) => {
+  overlay.value = e.overlay
+  infoWindow.value = e.infoWindow
+  info.value = e.info
+  console.log(e, '123')
+}
+defineExpose({ initialize })
+// 关闭
+const close = () => {
+  infoWindow.value.close()
+}
+</script>
+
+<template>
+  <div class="container">
+    <div class="title">
+      <div class="text">
+        {{ info?.stationName }}
+      </div>
+      <div class="close" @click="close">
+        x
+      </div>
+    </div>
+    <div class="item">
+      光伏挂载节点 : {{ info?.nodeId }}
+    </div>
+    <div class="item">
+      <span>发电机组有功 : {{ info?.pg }}</span>  <span>发电机组无功 : {{ info?.qg }}</span>
+    </div>
+    <div class="item">
+      碳排强度 : {{ info?.strength }}
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  width: 340px;
+  height: 140px;
+  padding: 10px;
+  background-color: #fff;
+  border: 1px solid #6d9ece;
+
+  .title {
+    font-size: 16px;
+    font-weight: 700;
+    padding: 0 10px;
+    display: flex;
+    justify-content: space-between;
+
+    .close {
+      color: #ccc;
+
+      &:hover {
+        cursor: pointer;
+      }
+    }
+  }
+
+  .item {
+    padding: 0 5px;
+    color: #111213;
+    font-size: 14px;
+    margin: 10px;
+    border-bottom: 1px solid #ccc;
+    display: flex;
+    justify-content: space-between;
+  }
+}
+</style>
diff --git a/src/static/1.png b/src/static/1.png
new file mode 100644
index 0000000..9dca264
--- /dev/null
+++ b/src/static/1.png
Binary files differ
diff --git a/src/static/2.png b/src/static/2.png
new file mode 100644
index 0000000..0eb5760
--- /dev/null
+++ b/src/static/2.png
Binary files differ
diff --git a/src/views/data/electricity/components/busbarAdd.vue b/src/views/data/electricity/components/busbarAdd.vue
index 7f81ed6..fa5ccb8 100644
--- a/src/views/data/electricity/components/busbarAdd.vue
+++ b/src/views/data/electricity/components/busbarAdd.vue
@@ -7,8 +7,7 @@
 import type { FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
-import showPhoto from './showPhoto.vue'
-import { addElectricityList, updateElectricityList, uploadApi } from '@/api/api/index'
+import { electricityNodeAdd, electricityNodeUpdate } from '@/api/api/index'
 import { getUserList } from '@/api/system/user'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
@@ -16,12 +15,19 @@
 const dialogStatus = ref('') // 对话框类型：create,update
 const isEditMode = ref(true)
 const areaForm = ref({
-  electricityName: '', // 配电网名称
-  electricityArea: '', // 配电网区域
-  uploaderName: '', // 上传人
-  uploader: '',
-  uploadTime: '', // 上传时间
-  electricityDetail: '', // 详情图片
+  type: '', // 节点类型
+  gs: '', // 节点并联电导
+  bs: '', // 节点并联电纳
+  area: '', // 母线断面号
+  vm: '', // 节点电压初始幅值
+  va: '', // 节点电压初始相位角
+  zone: '', // 母线省损耗区域
+  vmax: '', // 节点最大电压
+  vmin: '', // 节点最小电压
+  pd: '', // 负荷有功功率
+  qd: '', // 负荷无功功率
+  // qd: '', // 负荷无功功率
+  // qd: '', // 负荷无功功率
 }) // 表单
 const textMap: { [key: string]: string } = {
   update: '编辑',
@@ -29,11 +35,17 @@
 } // 表头显示标题
 const btnLoading = ref(false) // 保存按钮的加载中状态
 const rules: FormRules = {
-  electricityName: [{ required: true, message: '请输入配电网名称', trigger: ['blur', 'change'] }],
-  electricityArea: [{ required: true, message: '请输入配电网区域', trigger: ['blur', 'change'] }],
-  uploader: [{ required: true, message: '请选择上传人', trigger: ['blur', 'change'] }],
-  uploadTime: [{ required: true, message: '请选择上传时间', trigger: ['blur', 'change'] }],
-  electricityDetail: [{ required: true, message: '请上传附件', trigger: ['blur', 'change'] }],
+  type: [{ required: true, message: '请选择节点类型', trigger: ['blur', 'change'] }],
+  gs: [{ required: true, message: '节点并联电导', trigger: ['blur', 'change'] }],
+  bs: [{ required: true, message: '节点并联电纳', trigger: ['blur', 'change'] }],
+  area: [{ required: true, message: '母线断面号', trigger: ['blur', 'change'] }],
+  vm: [{ required: true, message: '节点电压初始幅值', trigger: ['blur', 'change'] }],
+  va: [{ required: true, message: '节点电压初始相位角', trigger: ['blur', 'change'] }],
+  zone: [{ required: true, message: '母线省损耗区域', trigger: ['blur', 'change'] }],
+  vmax: [{ required: true, message: '节点最大电压', trigger: ['blur', 'change'] }],
+  vmin: [{ required: true, message: '节点最小电压', trigger: ['blur', 'change'] }],
+  pd: [{ required: true, message: '负荷有功功率', trigger: ['blur', 'change'] }],
+  qd: [{ required: true, message: '负荷无功功率', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 // 获取用户列表
 const userList = ref<any[]>([])
@@ -46,12 +58,17 @@
 // 重置表单
 const resetForm = () => {
   areaForm.value = {
-    electricityName: '', // 配电网名称
-    electricityArea: '', // 配电网区域
-    uploaderName: '', // 上传人+
-    uploader: '',
-    uploadTime: '', // 上传时间
-    electricityDetail: '',
+    type: '', // 节点类型
+    gs: '', // 节点并联电导
+    bs: '', // 节点并联电纳
+    area: '', // 母线断面号
+    vm: '', // 节点电压初始幅值
+    va: '', // 节点电压初始相位角
+    zone: '', // 母线省损耗区域
+    vmax: '', // 节点最大电压
+    vmin: '', // 节点最小电压
+    pd: '', // 负荷有功功率
+    qd: '', // 负荷无功功率
   }
 }
 const deviceTypeList = ref([])
@@ -80,9 +97,8 @@
 const createData = () => {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
-      areaForm.value.uploadTime = dayjs().format('YYYY-MM-DD')
       btnLoading.value = true
-      addElectricityList(areaForm.value).then((response) => {
+      electricityNodeAdd(areaForm.value).then((response) => {
         if (response.code === 200) {
           btnLoading.value = false
           // 通知父组件刷新状态
@@ -106,9 +122,8 @@
 const updateData = () => {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
-      areaForm.value.uploadTime = dayjs().format('YYYY-MM-DD')
       btnLoading.value = true
-      updateElectricityList(areaForm.value).then((response) => {
+      electricityNodeUpdate(areaForm.value).then((response) => {
         if (response.code === 200) {
           ElMessage({
             message: '修改成功',
@@ -168,91 +183,89 @@
   <el-dialog v-model="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
     <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="160px">
       <el-col :span="20">
-        <el-form-item label="节点类型" prop="deviceId">
-          <el-select v-model="areaForm.electricityName" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择节点类型' : ''" style="width: 100%;">
-            <el-option
-              v-for="item in []"
-              :key="item.id"
-              :label="item.deviceName"
-              :value="item.id"
-            />
+        <el-form-item label="节点类型">
+          <el-select
+            v-model="areaForm.type" class="m-2"
+            :placeholder="dialogStatus === 'create' ? '请选择节点类型' : ''" style="width: 100%;"
+          >
+            <el-option v-for="item in []" :key="item.id" :label="item.deviceName" :value="item.id" />
           </el-select>
         </el-form-item>
       </el-col>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点并联电导:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入节点并联电导' : ''" />
+          <el-form-item label="节点并联电导:" prop="gs">
+            <el-input v-model="areaForm.gs" :placeholder="dialogStatus === 'create' ? '请输入节点并联电导' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点并联电纳:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入节点并联电纳' : ''" />
+          <el-form-item label="节点并联电纳:" prop="bs">
+            <el-input v-model="areaForm.bs" :placeholder="dialogStatus === 'create' ? '请输入节点并联电纳' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="母线断面号:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入母线断面号' : ''" />
+          <el-form-item label="母线断面号:" prop="area">
+            <el-input v-model="areaForm.area" :placeholder="dialogStatus === 'create' ? '请输入母线断面号' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点电压初始幅值:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入节点电压初始幅值' : ''" />
+          <el-form-item label="节点电压初始幅值:" prop="vm">
+            <el-input v-model="areaForm.vm" :placeholder="dialogStatus === 'create' ? '请输入节点电压初始幅值' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点电压初始相位角:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入节点电压初始相位角' : ''" />
+          <el-form-item label="节点电压初始相位角:" prop="va">
+            <el-input v-model="areaForm.va" :placeholder="dialogStatus === 'create' ? '请输入节点电压初始相位角' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="母线省损耗区域:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入母线省损耗区域' : ''" />
+          <el-form-item label="母线省损耗区域:" prop="zone">
+            <el-input v-model="areaForm.zone" :placeholder="dialogStatus === 'create' ? '请输入母线省损耗区域' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点最大电压:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入节点最大电压' : ''" />
+          <el-form-item label="节点最大电压:" prop="vmax">
+            <el-input v-model="areaForm.vmax" :placeholder="dialogStatus === 'create' ? '请输入节点最大电压' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点最小电压:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入节点最小电压' : ''" />
+          <el-form-item label="节点最小电压:" prop="vmin">
+            <el-input v-model="areaForm.vmin" :placeholder="dialogStatus === 'create' ? '请输入节点最小电压' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="负荷有功功率:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入负荷有功功率' : ''" />
+          <el-form-item label="负荷有功功率:" prop="pd">
+            <el-input v-model="areaForm.pd" :placeholder="dialogStatus === 'create' ? '请输入负荷有功功率' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="负荷无功功率:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入负荷无功功率' : ''" />
+          <el-form-item label="负荷无功功率:" prop="qd">
+            <el-input v-model="areaForm.qd" :placeholder="dialogStatus === 'create' ? '请输入负荷无功功率' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
+      <!-- <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点碳势:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入节点碳势' : ''" />
+          <el-form-item label="节点碳势:" prop="qd">
+            <el-input v-model="areaForm.qd" :placeholder="dialogStatus === 'create' ? '请输入节点碳势' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -262,7 +275,7 @@
             <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入负荷碳流率' : ''" />
           </el-form-item>
         </el-col>
-      </el-row>
+      </el-row> -->
     </el-form>
     <template #footer>
       <div class="dialog-footer">
diff --git a/src/views/data/electricity/components/networkBranch.vue b/src/views/data/electricity/components/networkBranch.vue
index 8d137c0..c1eced0 100644
--- a/src/views/data/electricity/components/networkBranch.vue
+++ b/src/views/data/electricity/components/networkBranch.vue
@@ -6,11 +6,16 @@
 <script lang="ts" setup name="networkBranch">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import editList from './branchAdd.vue'
+import { electricityBranch } from '@/api/api/index'
 const props = defineProps({
   bak: {
     type: Function,
     required: true,
   },
+  id: {
+    type: String,
+    required: true,
+  },
 })
 const bak = () => {
   props.bak(1)
@@ -27,55 +32,31 @@
 const TimeRanges = ref()
 const loadingTable = ref(true)
 const columns = ref([
-  // { text: '设备类型', value: 'deviceTypeName', align: 'center' },
-  // { text: '设备编号', value: 'deviceNo', align: 'center' },
-  // { text: '安装位置', value: 'installLocaltion', align: 'center' },
-  // { text: '电量/V', value: 'electricalVoltage', align: 'center' },
-  // { text: '功率/W', value: 'power', align: 'center' },
-  // { text: '上传时间', value: 'uploadTime', align: 'center' },
-  { text: '支路首端节点', value: '1', align: 'center' },
-  { text: '支路末端节点', value: '2', align: 'center' },
-  { text: '支路电阻标幺值', value: '3', align: 'center' },
-  { text: '支路电纳标幺值', value: '4', align: 'center' },
-  { text: '长距离输电容量', value: '5', align: 'center' },
-  { text: '短距离输电容量', value: '7', align: 'center' },
-  { text: '紧急距离输电容量', value: '8', align: 'center' },
-  { text: '支路变比', value: '9', align: 'center' },
-  { text: '角度', value: '10', align: 'center' },
-  { text: '支路是否运行', value: '11', align: 'center' },
-  { text: '支路最小相位角', value: '12', align: 'center' },
-  { text: '支路碳流率', value: '13', align: 'center' },
+  { text: '支路首端节点', value: 'fbusId', align: 'center' },
+  { text: '支路末端节点', value: 'tbusId', align: 'center' },
+  { text: '支路电阻标幺值', value: 'r', align: 'center' },
+  { text: '支路电纳标幺值', value: 'b', align: 'center' },
+  { text: '长距离输电容量', value: 'ratea', align: 'center' },
+  { text: '短距离输电容量', value: 'rateb', align: 'center' },
+  { text: '紧急距离输电容量', value: 'ratec', align: 'center' },
+  { text: '支路变比', value: 'ratio', align: 'center' },
+  { text: '角度', value: 'angle', align: 'center' },
+  { text: '支路是否运行', value: 'status2', align: 'center' },
+  { text: '支路最小相位角', value: 'angmin', align: 'center' },
+  { text: '支路碳流率', value: 'angmax', align: 'center' },
 ]) // 表格
 const total = ref<number>(0)
 const list = ref<any[]>([])
 // 获取数据列表
 const fetchDataList = () => {
-  // loadingTable.value = true
-  // getMonitorStation(searchQuery).then((res) => {
-  //   list.value = res.data.rows
-  //   total.value = res.data.total
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      1: 22,
-      2: '23',
-      3: 100,
-      4: 100,
-      5: '220',
-      7: 220,
-      8: 110,
-      9: 1,
-      10: 90,
-      11: '是',
-      12: 10,
-      13: '12%',
-    },
-
-  ]
-  total.value = list.value.length
-  loadingTable.value = false
+  loadingTable.value = true
+  electricityBranch(props.id).then((res) => {
+    list.value = res.data.map(item => item.branchNodeInfos[0])
+    total.value = res.data.length
+    loadingTable.value = false
+  })
 }
+fetchDataList()
 // 搜索
 const search = () => {
   fetchDataList()
@@ -128,9 +109,6 @@
 const multiSelect = (row: any[]) => {
   selectList.value = row
 }
-onMounted(() => {
-  search()
-})
 </script>
 
 <template>
diff --git a/src/views/data/electricity/components/networkBusbar.vue b/src/views/data/electricity/components/networkBusbar.vue
index 5386ea1..c1eb19d 100644
--- a/src/views/data/electricity/components/networkBusbar.vue
+++ b/src/views/data/electricity/components/networkBusbar.vue
@@ -6,10 +6,15 @@
 <script lang="ts" setup name="networkBusbar">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import editList from './busbarAdd.vue'
+import { electricityNode, electricityNodeDelete } from '@/api/api/index'
 const props = defineProps({
   bak: {
     type: Function,
-    default: () => {},
+    default: () => { },
+  },
+  id: {
+    type: String,
+    required: true,
   },
 })
 const bak = () => {
@@ -27,55 +32,30 @@
 const TimeRanges = ref()
 const loadingTable = ref(true)
 const columns = ref([
-  // { text: '设备类型', value: 'deviceTypeName', align: 'center' },
-  // { text: '设备编号', value: 'deviceNo', align: 'center' },
-  // { text: '安装位置', value: 'installLocaltion', align: 'center' },
-  // { text: '电量/V', value: 'electricalVoltage', align: 'center' },
-  // { text: '功率/W', value: 'power', align: 'center' },
-  // { text: '上传时间', value: 'uploadTime', align: 'center' },
-  { text: '节点类型', value: '1', align: 'center' },
-  { text: '节点并联电导', value: '2', align: 'center' },
-  { text: '节点并联电纳', value: '3', align: 'center' },
-  { text: '母线断面号', value: '4', align: 'center' },
-  { text: '节点电压初始幅值', value: '5', align: 'center' },
-  { text: '节点电压初始相位角', value: '6', align: 'center' },
-  { text: '母线省损耗区域', value: '7', align: 'center' },
-  { text: '节点最大电压', value: '8', align: 'center' },
-  { text: '节点最小电压', value: '9', align: 'center' },
-  { text: '负荷有功功率', value: '10', align: 'center' },
-  { text: '负荷无功功率', value: '11', align: 'center' },
-  { text: '节点碳势', value: '12', align: 'center' },
-  { text: '负荷碳流率', value: '13', align: 'center' },
+  { text: '节点类型', value: 'type', align: 'center' },
+  { text: '节点并联电导', value: 'gs', align: 'center' },
+  { text: '节点并联电纳', value: 'bs', align: 'center' },
+  { text: '母线断面号', value: 'area', align: 'center' },
+  { text: '节点电压初始幅值', value: 'vm', align: 'center' },
+  { text: '节点电压初始相位角', value: 'va', align: 'center' },
+  { text: '母线省损耗区域', value: 'zone', align: 'center' },
+  { text: '节点最大电压', value: 'vmax', align: 'center' },
+  { text: '节点最小电压', value: 'vmin', align: 'center' },
+  { text: '负荷有功功率', value: 'pd', align: 'center' },
+  { text: '负荷无功功率', value: 'qd', align: 'center' },
+  { text: '节点碳势', value: 'en', align: 'center' },
+  { text: '负荷碳流率', value: 'flowRate', align: 'center' },
 ]) // 表格
 const total = ref<number>(0)
 const list = ref<any[]>([])
 // 获取数据列表
 const fetchDataList = () => {
-  // loadingTable.value = true
-  // getMonitorStation(searchQuery).then((res) => {
-  //   list.value = res.data.rows
-  //   total.value = res.data.total
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      1: '类型1',
-      2: '1',
-      3: '1',
-      4: '1',
-      5: '100',
-      6: '90',
-      7: 'C',
-      8: '220',
-      9: '110',
-      10: '1100',
-      11: '1100',
-      12: '低',
-      13: '1',
-    },
-  ]
-  total.value = list.value.length
-  loadingTable.value = false
+  loadingTable.value = true
+  electricityNode(props.id).then((res) => {
+    list.value = res.data
+    total.value = res.data.length
+    loadingTable.value = false
+  })
 }
 // 搜索
 const search = () => {
diff --git a/src/views/data/electricity/index.vue b/src/views/data/electricity/index.vue
index 881f988..f37ba02 100644
--- a/src/views/data/electricity/index.vue
+++ b/src/views/data/electricity/index.vue
@@ -15,12 +15,8 @@
   },
   {
     id: '1',
-    title: '设备监测',
+    title: '设备监测数据',
   },
-  // {
-  //   id: '2',
-  //   title: '电动汽车及储能',
-  // },
 ])
 const select = ref('')
 const confirm = (selectp: string) => {
@@ -41,7 +37,7 @@
     <!-- 分布式光伏 -->
     <page v-if="select === '分布式光伏'" :station-type="type" />
     <!-- 设备监测 -->
-    <device v-if="select === '设备监测'" />
+    <device v-if="select === '设备监测数据'" />
   </div>
 </template>
 
diff --git a/src/views/data/electricity/network.vue b/src/views/data/electricity/network.vue
index d95d2cd..b79c34b 100644
--- a/src/views/data/electricity/network.vue
+++ b/src/views/data/electricity/network.vue
@@ -34,59 +34,28 @@
 const loadingTable = ref(true)
 // table列表
 const columns = ref([
-  // { text: '配电网名称', value: 'electricityName', align: 'center' },
+  { text: '配电网名称', value: 'electricityName', align: 'center' },
   // { text: '配电网区域', value: 'electricityArea', align: 'center' },
   // { text: '上传人', value: 'uploaderName', align: 'center' },
   // { text: '上传时间', value: 'uploadTime', align: 'center' },
-  { text: '基准功率', value: 'w', align: 'center' },
-  { text: '系统节点数', value: 'x', align: 'center' },
-  { text: '发电机数', value: 'f', align: 'center' },
-  { text: '系统负荷数', value: 'xt', align: 'center' },
-  { text: '节点之间支路数', value: 'j', align: 'center' },
+  { text: '基准功率', value: 'basePower', align: 'center' },
+  { text: '系统节点数', value: 'codeNum', align: 'center' },
+  { text: '发电机数', value: 'genNum', align: 'center' },
+  { text: '系统负荷数', value: 'loadNum', align: 'center' },
+  { text: '节点之间支路数', value: 'branchNum', align: 'center' },
 ])
 const total = ref<number>(0)
 // table列表数据
 const list = ref<any[]>([])
 // 获取数据列表
 const fetchDataList = () => {
-  // loadingTable.value = true
-  // getElectricityList(searchQuery).then((res) => {
-  //   list.value = res.data.rows
-  //   total.value = res.data.total
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      w: 1000,
-      x: 33,
-      f: 5,
-      xt: 32,
-      j: 37,
-    },
-    {
-      w: 1200,
-      x: 133,
-      f: 15,
-      xt: 132,
-      j: 327,
-    },
-    {
-      w: 1100,
-      x: 22,
-      f: 35,
-      xt: 322,
-      j: 39,
-    },
-    {
-      w: 1000,
-      x: 66,
-      f: 12,
-      xt: 62,
-      j: 47,
-    },
-  ]
-  total.value = list.value.length
-  loadingTable.value = false
+  loadingTable.value = true
+  getElectricityList(searchQuery).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+    console.log(res.data, '配电网管理')
+    loadingTable.value = false
+  })
 }
 // 搜索
 const search = () => {
@@ -138,15 +107,16 @@
 const detailRef = ref()
 // 查看详情
 const detail = (row: any) => {
-  if (row.electricityDetail) {
-    detailRef.value.initDialog(row)
-  }
-  else {
-    ElMessage({
-      type: 'info',
-      message: '暂无内容',
-    })
-  }
+  // if (row.electricityDetail) {
+  //   detailRef.value.initDialog(row)
+  // }
+  // else {
+  //   ElMessage({
+  //     type: 'info',
+  //     message: '暂无内容',
+  //   })
+  // }
+  editRef.value.initDialog('detail', row)
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -167,15 +137,26 @@
 onMounted(() => {
   search()
 })
+// 母线参数
+const networdId = ref('')
+const bushbar = (row: any) => {
+  showTable.value = 2
+  networdId.value = row.id
+}
+// 之路参数
+const branch = (row: any) => {
+  showTable.value = 3
+  networdId.value = row.id
+}
 </script>
 
 <template>
   <!-- 配电网分支参数 -->
-  <network-branch v-show="showTable === 3" ref="branchRef" :bak="changeShow" />
+  <network-branch v-if="showTable === 3" :id="networdId" ref="branchRef" :bak="changeShow" />
   <!-- 配电网母线参数 -->
-  <network-busbar v-show="showTable === 2" ref="busbarRef" :bak="changeShow" />
+  <network-busbar v-if="showTable === 2" :id="networdId" ref="busbarRef" :bak="changeShow" />
   <!-- 配电网 -->
-  <div v-show="showTable === 1">
+  <div v-if="showTable === 1">
     <edit-list ref="editRef" @refresh="search" />
     <detail-dialog ref="detailRef" />
     <!-- 筛选条件 -->
@@ -219,7 +200,7 @@
                 size="small"
                 type="primary"
                 link
-                @click="() => { showTable = 2;(row) }"
+                @click="bushbar(row)"
               >
                 母线参数
               </el-button>
@@ -231,7 +212,7 @@
                 size="small"
                 type="primary"
                 link
-                @click="() => { showTable = 3;(row) }"
+                @click="branch(row)"
               >
                 支线参数
               </el-button>
diff --git a/src/views/data/electricity/networkAdd.vue b/src/views/data/electricity/networkAdd.vue
index 159e7dd..d3b1a76 100644
--- a/src/views/data/electricity/networkAdd.vue
+++ b/src/views/data/electricity/networkAdd.vue
@@ -12,23 +12,25 @@
 const isEditMode = ref(true)
 const areaForm = ref({
   electricityName: '', // 配电网名称
-  electricityArea: '', // 配电网区域
-  uploaderName: '', // 上传人
-  uploader: '',
-  uploadTime: '', // 上传时间
-  electricityDetail: '', // 详情图片
+  basePower: '', // 基准功率
+  codeNum: '', // 系统节点数
+  genNum: '', // 发电机数
+  loadNum: '', // 系统负荷数
+  branchNum: '', // 节点之间支路数
 }) // 表单
 const textMap: { [key: string]: string } = {
   update: '编辑',
   create: '新增',
+  detail: '详情',
 } // 表头显示标题
 const btnLoading = ref(false) // 保存按钮的加载中状态
 const rules: FormRules = {
   electricityName: [{ required: true, message: '请输入配电网名称', trigger: ['blur', 'change'] }],
-  electricityArea: [{ required: true, message: '请输入配电网区域', trigger: ['blur', 'change'] }],
-  uploader: [{ required: true, message: '请选择上传人', trigger: ['blur', 'change'] }],
-  uploadTime: [{ required: true, message: '请选择上传时间', trigger: ['blur', 'change'] }],
-  electricityDetail: [{ required: true, message: '请上传附件', trigger: ['blur', 'change'] }],
+  basePower: [{ required: true, message: '请输入基准功率', trigger: ['blur', 'change'] }],
+  codeNum: [{ required: true, message: '请输入系统节点数', trigger: ['blur', 'change'] }],
+  genNum: [{ required: true, message: '请输入发电机数', trigger: ['blur', 'change'] }],
+  loadNum: [{ required: true, message: '请输入系统负荷数', trigger: ['blur', 'change'] }],
+  branchNum: [{ required: true, message: '请输入节点之间支路数', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 // 获取用户列表
 const userList = ref<any[]>([])
@@ -45,11 +47,11 @@
 const resetForm = () => {
   areaForm.value = {
     electricityName: '', // 配电网名称
-    electricityArea: '', // 配电网区域
-    uploaderName: '', // 上传人+
-    uploader: '',
-    uploadTime: '', // 上传时间
-    electricityDetail: '',
+    basePower: '', // 基准功率
+    codeNum: '', // 系统节点数
+    genNum: '', // 发电机数
+    loadNum: '', // 系统负荷数
+    branchNum: '', // 节点之间支路数
   }
 }
 const deviceTypeList = ref([])
@@ -69,6 +71,10 @@
     areaForm.value = row
     isEditMode.value = true
   }
+  else if (dialogStatus.value === 'detail') {
+    areaForm.value = row
+    isEditMode.value = false
+  }
 }
 defineExpose({
   initDialog,
@@ -78,7 +84,7 @@
 const createData = () => {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
-      areaForm.value.uploadTime = dayjs().format('YYYY-MM-DD')
+      // areaForm.value.uploadTime = dayjs().format('YYYY-MM-DD')
       btnLoading.value = true
       addElectricityList(areaForm.value).then((response) => {
         if (response.code === 200) {
@@ -104,7 +110,7 @@
 const updateData = () => {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
-      areaForm.value.uploadTime = dayjs().format('YYYY-MM-DD')
+      // areaForm.value.uploadTime = dayjs().format('YYYY-MM-DD')
       btnLoading.value = true
       updateElectricityList(areaForm.value).then((response) => {
         if (response.code === 200) {
@@ -167,36 +173,43 @@
     <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="140px">
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="基准功率:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '基准功率' : ''" />
+          <el-form-item label="配电网名称:" prop="electricityName">
+            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '配电网名称' : ''" :disabled="dialogStatus === 'detail'" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="系统节点数:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '系统节点数' : ''" />
+          <el-form-item label="基准功率:" prop="basePower">
+            <el-input v-model="areaForm.basePower" :placeholder="dialogStatus === 'create' ? '基准功率' : ''" :disabled="dialogStatus === 'detail'" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="发电机数:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '发电机数' : ''" />
+          <el-form-item label="系统节点数:" prop="codeNum">
+            <el-input v-model="areaForm.codeNum" :placeholder="dialogStatus === 'create' ? '系统节点数' : ''" :disabled="dialogStatus === 'detail'" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="系统负荷数:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '系统负荷数' : ''" />
+          <el-form-item label="发电机数:" prop="genNum">
+            <el-input v-model="areaForm.genNum" :placeholder="dialogStatus === 'create' ? '发电机数' : ''" :disabled="dialogStatus === 'detail'" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点之间支路数:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '节点之间支路数' : ''" />
+          <el-form-item label="系统负荷数:" prop="loadNum">
+            <el-input v-model="areaForm.loadNum" :placeholder="dialogStatus === 'create' ? '系统负荷数' : ''" :disabled="dialogStatus === 'detail'" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="20">
+          <el-form-item label="节点之间支路数:" prop="branchNum">
+            <el-input v-model="areaForm.branchNum" :placeholder="dialogStatus === 'create' ? '节点之间支路数' : ''" :disabled="dialogStatus === 'detail'" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -240,7 +253,7 @@
         </el-col>
       </el-row> -->
     </el-form>
-    <template #footer>
+    <template v-if="dialogStatus !== 'detail'" #footer>
       <div class="dialog-footer">
         <el-button :loading="btnLoading" type="primary" @click="saveData">
           保存
@@ -250,6 +263,13 @@
         </el-button>
       </div>
     </template>
+    <template v-else #footer>
+      <div class="dialog-footer">
+        <el-button :loading="btnLoading" type="primary" @click="dialogFormVisible = false">
+          确认
+        </el-button>
+      </div>
+    </template>
   </el-dialog>
 </template>
 
diff --git a/src/views/data/electricity/page.vue b/src/views/data/electricity/page.vue
index 2ed4f87..d1b96b9 100644
--- a/src/views/data/electricity/page.vue
+++ b/src/views/data/electricity/page.vue
@@ -30,77 +30,29 @@
 }, { deep: true })
 const loadingTable = ref(true)
 const columns = ref([
-  // { text: '设备类型', value: 'deviceTypeName', align: 'center' },
-  // { text: '设备编号', value: 'deviceNo', align: 'center' },
-  // { text: '安装位置', value: 'installLocaltion', align: 'center' },
-  // { text: '电量/V', value: 'electricalVoltage', align: 'center' },
-  // { text: '功率/W', value: 'power', align: 'center' },
-  // { text: '上传时间', value: 'uploadTime', align: 'center' },
-  { text: '发电机组对应节点数', value: '1', align: 'center' },
-  { text: '发电机有功/MW', value: '2', align: 'center' },
-  { text: '发电机无功', value: '3', align: 'center' },
-  { text: '最大无功', value: '4', align: 'center' },
-  { text: '最小无功', value: '5', align: 'center' },
-  { text: '节点电压', value: '6', align: 'center' },
-  { text: '发电机容量', value: '7', align: 'center' },
-  { text: '运行状态', value: '8', align: 'center' },
-  { text: '最大有功', value: '9', align: 'center' },
-  { text: '最小有功', value: '10', align: 'center' },
-  { text: '碳排强度', value: '11', align: 'center' },
+  { text: '发电机组对应节点数', value: 'nodeId', align: 'center' },
+  { text: '发电机有功/MW', value: 'pg', align: 'center' },
+  { text: '发电机无功', value: 'qg', align: 'center' },
+  { text: '最大无功', value: 'qmax', align: 'center' },
+  { text: '最小无功', value: 'qmin', align: 'center' },
+  { text: '节点电压', value: 'vg', align: 'center' },
+  { text: '发电机容量', value: 'mbase', align: 'center' },
+  { text: '运行状态', value: 'status', align: 'center' },
+  { text: '最大有功', value: 'pmax', align: 'center' },
+  { text: '最小有功', value: 'pmin', align: 'center' },
+  { text: '碳排强度', value: 'strength', align: 'center' },
 ]) // 表格
 const total = ref<number>(0)
 const list = ref<any[]>([])
 // 获取数据列表
 const fetchDataList = () => {
-  // loadingTable.value = true
-  // getMonitorStation(searchQuery).then((res) => {
-  //   list.value = res.data.rows
-  //   total.value = res.data.total
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      1: 33,
-      2: 1000,
-      3: 10,
-      4: 1100,
-      5: 1000,
-      6: 220,
-      7: 3600,
-      8: '正常',
-      9: 1100,
-      10: 1000,
-      11: '弱',
-    },
-    {
-      1: 133,
-      2: 900,
-      3: 10,
-      4: 1100,
-      5: 1000,
-      6: 220,
-      7: 3600,
-      8: '异常',
-      9: 1000,
-      10: 1000,
-      11: '强',
-    },
-    {
-      1: 22,
-      2: 1000,
-      3: 10,
-      4: 1100,
-      5: 1000,
-      6: 220,
-      7: 3600,
-      8: '离线',
-      9: 1000,
-      10: 1000,
-      11: '弱',
-    },
-  ]
-  total.value = list.value.length
-  loadingTable.value = false
+  loadingTable.value = true
+  getMonitorStation(searchQuery).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+    console.log(res.data, '分布式光伏')
+    loadingTable.value = false
+  })
 }
 // 搜索
 const search = () => {
diff --git a/src/views/data/electricity/pageAdd.vue b/src/views/data/electricity/pageAdd.vue
index f38ce05..223a07d 100644
--- a/src/views/data/electricity/pageAdd.vue
+++ b/src/views/data/electricity/pageAdd.vue
@@ -10,11 +10,17 @@
 const dialogStatus = ref('') // 对话框类型：create,update
 const isEditMode = ref(true)
 const areaForm = ref({
-  deviceId: '',
-  electricalVoltage: '', // 电量
-  power: '', // 功率
-  stationType: '',
-  uploadTime: '',
+  nodeId: '', // 发电机组对应节点数
+  pg: '', // 发电机有功/MW
+  qg: '', // 发电机无功
+  qmax: '', // 最大无功
+  qmin: '', // 最小无功
+  vg: '', // 节点电压
+  mbase: '', // 发电机容量
+  status: '', // 运行状态
+  pmax: '', // 最大有功
+  pmin: '', // 最小有功
+  strength: '', // 碳排强度
 }) // 表单
 const textMap: { [key: string]: string } = {
   update: '编辑',
@@ -22,22 +28,33 @@
 } // 表头显示标题
 const btnLoading = ref(false) // 保存按钮的加载中状态
 const rules: FormRules = {
-  deviceType: [{ required: true, message: '设备类型不能为空', trigger: ['blur', 'change'] }],
-  deviceNo: [{ required: true, message: '设备编号', trigger: ['blur', 'change'] }],
-  installLocaltion: [{ required: true, message: '安装位置', trigger: ['blur', 'change'] }],
-  electricalVoltage: [{ required: true, message: '电量', trigger: ['blur', 'change'] }],
-  power: [{ required: true, message: '功率', trigger: ['blur', 'change'] }],
-  uploadTime: [{ required: true, message: '上传时间', trigger: ['blur', 'change'] }],
+  nodeId: [{ required: true, message: '发电机组对应节点数不能为空', trigger: ['blur', 'change'] }],
+  pg: [{ required: true, message: '发电机有功不能为空', trigger: ['blur', 'change'] }],
+  qg: [{ required: true, message: '发电机无功不能为空', trigger: ['blur', 'change'] }],
+  qmax: [{ required: true, message: '最大无功不能为空', trigger: ['blur', 'change'] }],
+  qmin: [{ required: true, message: '最小无功不能为空', trigger: ['blur', 'change'] }],
+  vg: [{ required: true, message: '节点电压不能为空', trigger: ['blur', 'change'] }],
+  mbase: [{ required: true, message: '发电机容量不能为空', trigger: ['blur', 'change'] }],
+  status: [{ required: true, message: '运行状态不能为空', trigger: ['blur', 'change'] }],
+  pmax: [{ required: true, message: '最大有功不能为空', trigger: ['blur', 'change'] }],
+  pmin: [{ required: true, message: '最小有功不能为空', trigger: ['blur', 'change'] }],
+  strength: [{ required: true, message: '碳排强度不能为空', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 // 重置表单
 const resetForm = () => {
   areaForm.value = {
-    electricalVoltage: '', // 电量
-    power: '', // 功率
-    stationType: '',
-    deviceId: '',
-    uploadTime: '',
+    nodeId: '', // 发电机组对应节点数
+    pg: '', // 发电机有功/MW
+    qg: '', // 发电机无功
+    qmax: '', // 最大无功
+    qmin: '', // 最小无功
+    vg: '', // 节点电压
+    mbase: '', // 发电机容量
+    status: '', // 运行状态
+    pmax: '', // 最大有功
+    pmin: '', // 最小有功
+    strength: '', // 碳排强度
   }
 }
 const deviceTypeList = ref([])
@@ -149,78 +166,84 @@
     <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="160px">
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="发电机组对应节点数:" prop="electricalVoltage">
-            <el-input v-model="areaForm.electricalVoltage" :placeholder="dialogStatus === 'create' ? '请输入发电机组对应节点数' : ''" />
+          <el-form-item label="发电机组对应节点数:" prop="nodeId">
+            <el-input
+              v-model="areaForm.nodeId"
+              :placeholder="dialogStatus === 'create' ? '请输入发电机组对应节点数' : ''"
+            />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="发电机有功/MW:" prop="electricalVoltage">
-            <el-input v-model="areaForm.electricalVoltage" :placeholder="dialogStatus === 'create' ? '请输入发电机有功/MW' : ''" />
+          <el-form-item label="发电机有功/MW:" prop="pg">
+            <el-input
+              v-model="areaForm.pg"
+              :placeholder="dialogStatus === 'create' ? '请输入发电机有功/MW' : ''"
+            />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="发电机无功:" prop="electricalVoltage">
-            <el-input v-model="areaForm.electricalVoltage" :placeholder="dialogStatus === 'create' ? '请输入发电机无功' : ''" />
+          <el-form-item label="发电机无功:" prop="qg">
+            <el-input v-model="areaForm.qg" :placeholder="dialogStatus === 'create' ? '请输入发电机无功' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="最大无功:" prop="electricalVoltage">
-            <el-input v-model="areaForm.electricalVoltage" :placeholder="dialogStatus === 'create' ? '请输入最大无功' : ''" />
+          <el-form-item label="最大无功:" prop="qmax">
+            <el-input v-model="areaForm.qmax" :placeholder="dialogStatus === 'create' ? '请输入最大无功' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="最小无功:" prop="electricalVoltage">
-            <el-input v-model="areaForm.electricalVoltage" :placeholder="dialogStatus === 'create' ? '请输入最小无功' : ''" />
+          <el-form-item label="最小无功:" prop="qmin">
+            <el-input v-model="areaForm.qmin" :placeholder="dialogStatus === 'create' ? '请输入最小无功' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点电压:" prop="electricalVoltage">
-            <el-input v-model="areaForm.electricalVoltage" :placeholder="dialogStatus === 'create' ? '请输入节点电压' : ''" />
+          <el-form-item label="节点电压:" prop="vg">
+            <el-input v-model="areaForm.vg" :placeholder="dialogStatus === 'create' ? '请输入节点电压' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="发电机容量:" prop="electricalVoltage">
-            <el-input v-model="areaForm.electricalVoltage" :placeholder="dialogStatus === 'create' ? '请输入发电机容量' : ''" />
+          <el-form-item label="发电机容量:" prop="mbase">
+            <el-input v-model="areaForm.mbase" :placeholder="dialogStatus === 'create' ? '请输入发电机容量' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="运行状态:" prop="electricalVoltage">
-            <el-input v-model="areaForm.electricalVoltage" :placeholder="dialogStatus === 'create' ? '请输入运行状态' : ''" />
+          <el-form-item label="运行状态:" prop="status">
+            <el-input v-model="areaForm.status" :placeholder="dialogStatus === 'create' ? '请输入运行状态' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="最大有功:" prop="electricalVoltage">
-            <el-input v-model="areaForm.electricalVoltage" :placeholder="dialogStatus === 'create' ? '请输入最大有功' : ''" />
+          <el-form-item label="最大有功:" prop="pmax">
+            <el-input v-model="areaForm.pmax" :placeholder="dialogStatus === 'create' ? '请输入最大有功' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="最小有功:" prop="electricalVoltage">
-            <el-input v-model="areaForm.electricalVoltage" :placeholder="dialogStatus === 'create' ? '请输入最小有功' : ''" />
+          <el-form-item label="最小有功:" prop="pmin">
+            <el-input v-model="areaForm.pmin" :placeholder="dialogStatus === 'create' ? '请输入最小有功' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="碳排强度:" prop="electricalVoltage">
-            <el-input v-model="areaForm.electricalVoltage" :placeholder="dialogStatus === 'create' ? '请输入碳排强度' : ''" />
+          <el-form-item label="碳排强度:" prop="strength">
+            <el-input v-model="areaForm.strength" :placeholder="dialogStatus === 'create' ? '请输入碳排强度' : ''" />
           </el-form-item>
         </el-col>
       </el-row>

diff --git a/src/api/api/index.ts b/src/api/api/index.ts
index 4a6cf27..0af6bf9 100644
--- a/src/api/api/index.ts
+++ b/src/api/api/index.ts
@@ -110,13 +110,43 @@
     method: 'post',
   })
 }
-// 配电网节点查询
+// 配电网节点查询 / 母线参数
 export function electricityNode(id: any) {
   return request({
     url: `/electricityNode/list?electricityId=${id}`,
     method: 'get',
   })
 }
+// 母线参数新增
+export function electricityNodeAdd(data: object) {
+  return request({
+    url: '/electricityNode/add',
+    method: 'post',
+    data,
+  })
+}
+// 母线参数修改
+export function electricityNodeUpdate(data: object) {
+  return request({
+    url: '/electricityNode/update',
+    method: 'post',
+    data,
+  })
+}
+// 母线参数删除
+export function electricityNodeDelete(id: string) {
+  return request({
+    url: `/electricityNode/delete?id=${id}`,
+    method: 'post',
+  })
+}
+// 配电网支路查询
+export function electricityBranch(id: any) {
+  return request({
+    url: `/branchNodeInfo/branchList?electricityId=${id}`,
+    method: 'get',
+  })
+}
 // 光伏/楼宇/电动车管理列表
 export function getMonitorStation(params: any) {
   return request({
@@ -125,6 +155,13 @@
     params,
   })
 }
+// 光伏列表 - 不分页
+export function getMonitorStationList() {
+  return request({
+    url: '/monitorStation/list',
+    method: 'get',
+  })
+}
 // 添加 光伏/楼宇/电动车管
 export function addMonitorStation(data: any) {
   return request({
diff --git a/src/components.d.ts b/src/components.d.ts
index 1bd3d1b..5c3eb2a 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -40,6 +40,8 @@
     ImagePreview: typeof import('./components/ImagePreview/index.vue')['default']
     ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default']
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
+    InfoWindow: typeof import('./components/map/infoWindow.vue')['default']
+    InfoWindow2: typeof import('./components/map/infoWindow2.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     Map: typeof import('./components/map/index.vue')['default']
     MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index a5c8ec3..00994da 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -5,7 +5,9 @@
  -->
 <script lang="ts" setup name="GuadMap">
 import AMapLoader from '@amap/amap-jsapi-loader'
-import { electricityNode, getElectricityListAll } from '@/api/api/index'
+import infoDetail from './infoWindow.vue'
+import infoDetail2 from './infoWindow2.vue'
+import { electricityBranch, electricityNode, getElectricityListAll, getMonitorStationList } from '@/api/api/index'
 // 设置安全密钥
 window._AMapSecurityConfig = {
   securityJsCode: '56bf9671d4b3517d294caec4751889a1', // 后期需替换
@@ -24,10 +26,19 @@
   [111.739906, 40.83686],
   [111.739906, 40.83386],
 ])
-// 区域点数组
+// 电网节点数组
 const markerArr = ref([
 ])
+// 光伏数组
+const markerArr1 = ref([
+])
+// 信息窗体
+const infoWindow = ref()
+const infoWindow2 = ref()
+const windowInfoRef = ref()
+const windowInfoRef2 = ref()
 const markerArrInfo = ref()
+const markerArrInfo1 = ref()
 // 折现节点坐标
 const lineArr = ref([])
 // 初始化地图
@@ -35,14 +46,15 @@
   AMapLoader.load({
     key: '40849e82b4e33f5255b17372520c954d', // 后期需替换
     version: '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
-    plugins: ['AMap.Scale', 'AMap.MouseTool'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
+    plugins: ['AMap.Scale', 'AMap.MouseTool', 'AMap.ToolBar'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
   })
     .then((AMap) => {
       // 初始化地图
       map.value = new AMap.Map('map', {
-        viewMode: '2D', //  是否为3D地图模式
+        viewMode: '3D', //  是否为3D地图模式
         zoom: 17, // 初始化地图级别
-        center: markerArr.value[0],
+        // center: markerArr.value[0],
+        center: [116.26755900, 39.91547100],
         resizeEnable: true,
       })
       // 用来画区域的
@@ -78,7 +90,7 @@
       //   }
       //   console.log(arr)// 121.540994,29.870174;121.55138,29.858116;121.55756,29.874193;
       // })
-      // 标记点绘制
+      // 电网支路标记点绘制
       for (let i = 0; i < markerArr.value.length; i++) {
         const icon = new AMap.Icon({
           size: new AMap.Size(36, 36), // 图标尺寸
@@ -87,58 +99,213 @@
           imageSize: new AMap.Size(24, 30), // 根据所设置的大小拉伸或压缩图片
           imageOffset: new AMap.Pixel(0, 0), // 图像相对展示区域的偏移量，适于雪碧图等
         })
-        // const content = '<div>111</div>'
         const marker = new AMap.Marker({
           position: markerArr.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
           map: map.value,
           title: '测试坐标',
           icon,
-          offset: new AMap.Pixel(-20, -20),
+          offset: new AMap.Pixel(3, -30),
+        })
+        // 支路点详细信息// 信息窗体
+        infoWindow.value = new AMap.InfoWindow({
+          isCustom: true, // 自定义信息窗体
+          content: windowInfoRef.value.$el, // 窗体内容(vue组件)
+          offset: new AMap.Pixel(9, -5), // 偏移
+        })
+        marker.on('click', (e) => {
+          // 打开信息窗口
+          // infoWindow.value.setContent(e.target.content)
+          infoWindow.value.open(map.value, e.lnglat)
+          // 初始化信息窗口
+          windowInfoRef.value.initialize({
+            overlay: e.target,
+            infoWindow: infoWindow.value,
+            info: markerArrInfo.value[i],
+          })
         })
         marker.setLabel({
           offset: new AMap.Pixel(-10, -2), // 设置文本标注偏移量
-          content: `<div>${markerArrInfo.value[i].busId}</div>`, // 设置文本标注内容
+          content: `<div>${markerArrInfo.value[i].nodeName}</div>`, // 设置文本标注内容
           direction: 'right', // 设置文本标注方位
         })
         map.value.add([marker])
-        // 标记点文本
-        // 自动适应显示想显示的范围区域
-        // map.value.setFitView()
       }
-      // 折现(
-      // 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)
+      // 光伏标记点及光伏绘制
+      for (let i = 0; i < markerArr1.value.length; i++) {
+        const icon = new AMap.Icon({
+          size: new AMap.Size(36, 36), // 图标尺寸
+          image: 'http://111.198.10.15:11404/imgs/2.png', // Icon的图像
+          imageSize: new AMap.Size(24, 30), // 根据所设置的大小拉伸或压缩图片
+          imageOffset: new AMap.Pixel(0, 0), // 图像相对展示区域的偏移量，适于雪碧图等
+        })
+        // const content = '<div>111</div>'
+        const marker = new AMap.Marker({
+          position: markerArr1.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+          map: map.value,
+          title: '测试坐标',
+          icon,
+          offset: new AMap.Pixel(-20, -20),
+        })
+        // 信息窗体
+        infoWindow2.value = new AMap.InfoWindow({
+          isCustom: true, // 自定义信息窗体
+          content: windowInfoRef2.value.$el, // 窗体内容(vue组件)
+          offset: new AMap.Pixel(9, -5), // 偏移
+        })
+        marker.on('click', (e) => {
+          // 打开信息窗口
+          infoWindow2.value.open(map.value, e.lnglat)
+          // infoWindow2.value.setContent(e.target)
+          // 初始化信息窗口
+          windowInfoRef2.value.initialize({
+            overlay: e.target,
+            infoWindow: infoWindow2.value,
+            info: markerArrInfo1.value[i],
+          })
+        })
+        marker.setLabel({
+          offset: new AMap.Pixel(-10, -2), // 设置文本标注偏移量
+          content: `<div>${markerArrInfo1.value[i].stationName}</div>`, // 设置文本标注内容
+          direction: 'right', // 设置文本标注方位
+        })
+        map.value.add([marker])
+        // 绘制电网和节点连线
+        const path = markerArrInfo1.value.map((item) => {
+          return [[Number(item.lng), Number(item.lat)], [Number(item.nodeLng), Number(item.nodeLat)]]
+        })
+        const polyline = new AMap.Polyline({
+          path,
+          strokeColor: '#03A382',
+          strokeStyle: 'dashed',
+          strokeDasharray: [10, 3],
+          lineJoin: 'round',
+          lineCap: 'round',
+          zIndex: 50,
+          zooms: [16, 20],
+        })
+        polyline.setMap(map.value)
+        map.value.add(polyline)
+      }
+      // 电网支路折线绘制
+      for (let i = 0; i < lineArr.value.length; i++) {
+        // console.log(lineArr.value[i])
+        const path = lineArr.value.map(item => item.branchNodeInfos)
+        const line = path.map(item => (
+          item.map((child) => {
+            return ([[child.flng, child.flat], [child.tlng, child.tlat], child.status2])
+          })
+        ))
+        line.forEach((item) => {
+          item.forEach((child) => {
+            const path = [child[0], child[1]]
+            const polyline = new AMap.Polyline({
+              path,
+              // isOutline: true,
+              strokeColor: child[2] === 1 ? '#008d68' : '#000',
+              // strokeOpacity: 1,
+              strokeWeight: 3,
+              // 折线样式还支持 'dashed'
+              strokeStyle: child[2] !== 1 ? 'dashed' : 'dashed ',
+              // strokeStyle是dashed时有效
+              strokeDasharray: [10, 3],
+              lineJoin: 'round',
+              showDir: child[2] === 1,
+              // lineCap: 'square',
+              lineCap: 'round',
+              zIndex: 50,
+              zooms: [16, 20],
+
+            })
+            polyline.setMap(map.value)
+            map.value.add(polyline)
+          })
+        })
+        // 添加支路折线文本
+        // 创建纯文本标记
+        const textArr = path.map(item => (
+          item.map((child) => {
+            return ([[(Number(child.flng) + Number(child.tlng)) / 2, (Number(child.flat) + Number(child.tlat)) / 2], child.flowRate])
+          })
+        ))
+        textArr.forEach((item) => {
+          // console.log(item, 'item')
+          item.forEach((child) => {
+            const icon = new AMap.Icon({
+              size: new AMap.Size(36, 36), // 图标尺寸
+              // image: '', // Icon的图像
+              imageSize: new AMap.Size(24, 30), // 根据所设置的大小拉伸或压缩图片
+              imageOffset: new AMap.Pixel(0, 0), // 图像相对展示区域的偏移量，适于雪碧图等
+            })
+            // const content = '<div>111</div>'
+            const marker = new AMap.Marker({
+              position: child[0], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+              map: map.value,
+              content: '<span></span>',
+              offset: new AMap.Pixel(-20, -20),
+            })
+            marker.setLabel({
+              offset: new AMap.Pixel(-10, -2), // 设置文本标注偏移量
+              content: `<div>${`${child[1]}kgCO2/h`}</div>`, // 设置文本标注内容
+              direction: 'right', // 设置文本标注方位
+            })
+            map.value.add([marker])
+          })
+        })
+      }
     })
     .catch((e) => {
       console.log(e)
     })
 }
-onMounted(() => {
-  getElectricityListAll().then((res) => {
+onMounted(async () => {
+  // 获取电网列表
+  try {
+    const list = await getElectricityListAll()
     // 电网列表
-    electricityList.value = res.data
-    // 默认选中第一个查询节点
+    electricityList.value = list.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()
-      })
+      const res = await electricityNode(electricityList.value[0].id)
+      markerArr.value = res.data.map(item => ([Number(item.lng), Number(item.lat)]))
+      markerArrInfo.value = res.data
+      // 获取支路信息(折线)
+      const res1 = await electricityBranch(electricityList.value[0].id)
+      lineArr.value = res1.data
     }
-  })
+    // 获取光伏列表
+    const list1 = await getMonitorStationList()
+    markerArr1.value = list1.data.map(item => ([Number(item.lng), Number(item.lat)]))
+    markerArrInfo1.value = list1.data
+    // 初始化地图
+    initMap()
+  }
+  catch (error) {
+    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
+  //       // 获取支路
+  //       electricityBranch(electricityList.value[0].id).then(res => {
+  //         lineArr.value = res.data
+  //         // console.log(res.data)
+  //         initMap()
+  //       })
+  //     })
+  //   }
+  // })
 })
 </script>
 
 <template>
   <div id="map" />
+  <info-detail ref="windowInfoRef" />
+  <info-detail2 ref="windowInfoRef2" />
 </template>
 
 <style scoped>
diff --git a/src/components/map/infoWindow.vue b/src/components/map/infoWindow.vue
new file mode 100644
index 0000000..1df9061
--- /dev/null
+++ b/src/components/map/infoWindow.vue
@@ -0,0 +1,83 @@
+<!--
+  Description: 高德地图信息窗体 - 支路节点
+  Author: 李亚光
+  Date: 2023-05-10
+ -->
+<script lang="ts" setup name="infoWindow">
+const overlay = ref()
+const infoWindow = ref()
+const info = ref()
+// 初始化
+const initialize = (e) => {
+  overlay.value = e.overlay
+  infoWindow.value = e.infoWindow
+  info.value = e.info
+}
+defineExpose({ initialize })
+// 关闭
+const close = () => {
+  infoWindow.value.close()
+}
+</script>
+
+<template>
+  <div class="container">
+    <div class="title">
+      <div class="text">
+        {{ info?.nodeName }}
+      </div>
+      <div class="close" @click="close">
+        x
+      </div>
+    </div>
+    <div class="item">
+      节点编号 : {{ info?.busId }}
+    </div>
+    <div class="item">
+      <span>负荷有功功率 : {{ info?.pd }}</span>  <span>负荷无功功率 : {{ info?.qd }}</span>
+    </div>
+    <div class="item">
+      <span>节点碳势 : {{ info?.en }}</span>  <span>节点负荷碳流率 : {{ info?.flowRate }}</span>
+    </div>
+    <!-- // <div class="item">设备信息 : {{ device.produceCode }}</div>
+    // <div class="item">设备ID : {{ device.deviceId }}</div>
+    // <div class="item">IP地址 : {{ device.deviceIp }}</div>
+    // <div class="item">地址 : {{ device.deviceAddress }}</div> -->
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  width: 340px;
+  height: 140px;
+  padding: 10px;
+  background-color: #fff;
+  border: 1px solid #6d9ece;
+
+  .title {
+    font-size: 16px;
+    font-weight: 700;
+    padding: 0 10px;
+    display: flex;
+    justify-content: space-between;
+
+    .close {
+      color: #ccc;
+
+      &:hover {
+        cursor: pointer;
+      }
+    }
+  }
+
+  .item {
+    padding: 0 5px;
+    color: #111213;
+    font-size: 14px;
+    margin: 10px;
+    border-bottom: 1px solid #ccc;
+    display: flex;
+    justify-content: space-between;
+  }
+}
+</style>
diff --git a/src/components/map/infoWindow2.vue b/src/components/map/infoWindow2.vue
new file mode 100644
index 0000000..407e288
--- /dev/null
+++ b/src/components/map/infoWindow2.vue
@@ -0,0 +1,80 @@
+<!--
+  Description: 高德地图信息窗体 - 光伏节点
+  Author: 李亚光
+  Date: 2023-05-10
+ -->
+<script lang="ts" setup name="infoWindow">
+const overlay = ref()
+const infoWindow = ref()
+const info = ref()
+// 初始化
+const initialize = (e) => {
+  overlay.value = e.overlay
+  infoWindow.value = e.infoWindow
+  info.value = e.info
+  console.log(e, '123')
+}
+defineExpose({ initialize })
+// 关闭
+const close = () => {
+  infoWindow.value.close()
+}
+</script>
+
+<template>
+  <div class="container">
+    <div class="title">
+      <div class="text">
+        {{ info?.stationName }}
+      </div>
+      <div class="close" @click="close">
+        x
+      </div>
+    </div>
+    <div class="item">
+      光伏挂载节点 : {{ info?.nodeId }}
+    </div>
+    <div class="item">
+      <span>发电机组有功 : {{ info?.pg }}</span>  <span>发电机组无功 : {{ info?.qg }}</span>
+    </div>
+    <div class="item">
+      碳排强度 : {{ info?.strength }}
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  width: 340px;
+  height: 140px;
+  padding: 10px;
+  background-color: #fff;
+  border: 1px solid #6d9ece;
+
+  .title {
+    font-size: 16px;
+    font-weight: 700;
+    padding: 0 10px;
+    display: flex;
+    justify-content: space-between;
+
+    .close {
+      color: #ccc;
+
+      &:hover {
+        cursor: pointer;
+      }
+    }
+  }
+
+  .item {
+    padding: 0 5px;
+    color: #111213;
+    font-size: 14px;
+    margin: 10px;
+    border-bottom: 1px solid #ccc;
+    display: flex;
+    justify-content: space-between;
+  }
+}
+</style>
diff --git a/src/static/1.png b/src/static/1.png
new file mode 100644
index 0000000..9dca264
--- /dev/null
+++ b/src/static/1.png
Binary files differ
diff --git a/src/static/2.png b/src/static/2.png
new file mode 100644
index 0000000..0eb5760
--- /dev/null
+++ b/src/static/2.png
Binary files differ
diff --git a/src/views/data/electricity/components/busbarAdd.vue b/src/views/data/electricity/components/busbarAdd.vue
index 7f81ed6..fa5ccb8 100644
--- a/src/views/data/electricity/components/busbarAdd.vue
+++ b/src/views/data/electricity/components/busbarAdd.vue
@@ -7,8 +7,7 @@
 import type { FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
-import showPhoto from './showPhoto.vue'
-import { addElectricityList, updateElectricityList, uploadApi } from '@/api/api/index'
+import { electricityNodeAdd, electricityNodeUpdate } from '@/api/api/index'
 import { getUserList } from '@/api/system/user'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
@@ -16,12 +15,19 @@
 const dialogStatus = ref('') // 对话框类型：create,update
 const isEditMode = ref(true)
 const areaForm = ref({
-  electricityName: '', // 配电网名称
-  electricityArea: '', // 配电网区域
-  uploaderName: '', // 上传人
-  uploader: '',
-  uploadTime: '', // 上传时间
-  electricityDetail: '', // 详情图片
+  type: '', // 节点类型
+  gs: '', // 节点并联电导
+  bs: '', // 节点并联电纳
+  area: '', // 母线断面号
+  vm: '', // 节点电压初始幅值
+  va: '', // 节点电压初始相位角
+  zone: '', // 母线省损耗区域
+  vmax: '', // 节点最大电压
+  vmin: '', // 节点最小电压
+  pd: '', // 负荷有功功率
+  qd: '', // 负荷无功功率
+  // qd: '', // 负荷无功功率
+  // qd: '', // 负荷无功功率
 }) // 表单
 const textMap: { [key: string]: string } = {
   update: '编辑',
@@ -29,11 +35,17 @@
 } // 表头显示标题
 const btnLoading = ref(false) // 保存按钮的加载中状态
 const rules: FormRules = {
-  electricityName: [{ required: true, message: '请输入配电网名称', trigger: ['blur', 'change'] }],
-  electricityArea: [{ required: true, message: '请输入配电网区域', trigger: ['blur', 'change'] }],
-  uploader: [{ required: true, message: '请选择上传人', trigger: ['blur', 'change'] }],
-  uploadTime: [{ required: true, message: '请选择上传时间', trigger: ['blur', 'change'] }],
-  electricityDetail: [{ required: true, message: '请上传附件', trigger: ['blur', 'change'] }],
+  type: [{ required: true, message: '请选择节点类型', trigger: ['blur', 'change'] }],
+  gs: [{ required: true, message: '节点并联电导', trigger: ['blur', 'change'] }],
+  bs: [{ required: true, message: '节点并联电纳', trigger: ['blur', 'change'] }],
+  area: [{ required: true, message: '母线断面号', trigger: ['blur', 'change'] }],
+  vm: [{ required: true, message: '节点电压初始幅值', trigger: ['blur', 'change'] }],
+  va: [{ required: true, message: '节点电压初始相位角', trigger: ['blur', 'change'] }],
+  zone: [{ required: true, message: '母线省损耗区域', trigger: ['blur', 'change'] }],
+  vmax: [{ required: true, message: '节点最大电压', trigger: ['blur', 'change'] }],
+  vmin: [{ required: true, message: '节点最小电压', trigger: ['blur', 'change'] }],
+  pd: [{ required: true, message: '负荷有功功率', trigger: ['blur', 'change'] }],
+  qd: [{ required: true, message: '负荷无功功率', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 // 获取用户列表
 const userList = ref<any[]>([])
@@ -46,12 +58,17 @@
 // 重置表单
 const resetForm = () => {
   areaForm.value = {
-    electricityName: '', // 配电网名称
-    electricityArea: '', // 配电网区域
-    uploaderName: '', // 上传人+
-    uploader: '',
-    uploadTime: '', // 上传时间
-    electricityDetail: '',
+    type: '', // 节点类型
+    gs: '', // 节点并联电导
+    bs: '', // 节点并联电纳
+    area: '', // 母线断面号
+    vm: '', // 节点电压初始幅值
+    va: '', // 节点电压初始相位角
+    zone: '', // 母线省损耗区域
+    vmax: '', // 节点最大电压
+    vmin: '', // 节点最小电压
+    pd: '', // 负荷有功功率
+    qd: '', // 负荷无功功率
   }
 }
 const deviceTypeList = ref([])
@@ -80,9 +97,8 @@
 const createData = () => {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
-      areaForm.value.uploadTime = dayjs().format('YYYY-MM-DD')
       btnLoading.value = true
-      addElectricityList(areaForm.value).then((response) => {
+      electricityNodeAdd(areaForm.value).then((response) => {
         if (response.code === 200) {
           btnLoading.value = false
           // 通知父组件刷新状态
@@ -106,9 +122,8 @@
 const updateData = () => {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
-      areaForm.value.uploadTime = dayjs().format('YYYY-MM-DD')
       btnLoading.value = true
-      updateElectricityList(areaForm.value).then((response) => {
+      electricityNodeUpdate(areaForm.value).then((response) => {
         if (response.code === 200) {
           ElMessage({
             message: '修改成功',
@@ -168,91 +183,89 @@
   <el-dialog v-model="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
     <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="160px">
       <el-col :span="20">
-        <el-form-item label="节点类型" prop="deviceId">
-          <el-select v-model="areaForm.electricityName" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择节点类型' : ''" style="width: 100%;">
-            <el-option
-              v-for="item in []"
-              :key="item.id"
-              :label="item.deviceName"
-              :value="item.id"
-            />
+        <el-form-item label="节点类型">
+          <el-select
+            v-model="areaForm.type" class="m-2"
+            :placeholder="dialogStatus === 'create' ? '请选择节点类型' : ''" style="width: 100%;"
+          >
+            <el-option v-for="item in []" :key="item.id" :label="item.deviceName" :value="item.id" />
           </el-select>
         </el-form-item>
       </el-col>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点并联电导:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入节点并联电导' : ''" />
+          <el-form-item label="节点并联电导:" prop="gs">
+            <el-input v-model="areaForm.gs" :placeholder="dialogStatus === 'create' ? '请输入节点并联电导' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点并联电纳:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入节点并联电纳' : ''" />
+          <el-form-item label="节点并联电纳:" prop="bs">
+            <el-input v-model="areaForm.bs" :placeholder="dialogStatus === 'create' ? '请输入节点并联电纳' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="母线断面号:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入母线断面号' : ''" />
+          <el-form-item label="母线断面号:" prop="area">
+            <el-input v-model="areaForm.area" :placeholder="dialogStatus === 'create' ? '请输入母线断面号' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点电压初始幅值:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入节点电压初始幅值' : ''" />
+          <el-form-item label="节点电压初始幅值:" prop="vm">
+            <el-input v-model="areaForm.vm" :placeholder="dialogStatus === 'create' ? '请输入节点电压初始幅值' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点电压初始相位角:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入节点电压初始相位角' : ''" />
+          <el-form-item label="节点电压初始相位角:" prop="va">
+            <el-input v-model="areaForm.va" :placeholder="dialogStatus === 'create' ? '请输入节点电压初始相位角' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="母线省损耗区域:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入母线省损耗区域' : ''" />
+          <el-form-item label="母线省损耗区域:" prop="zone">
+            <el-input v-model="areaForm.zone" :placeholder="dialogStatus === 'create' ? '请输入母线省损耗区域' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点最大电压:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入节点最大电压' : ''" />
+          <el-form-item label="节点最大电压:" prop="vmax">
+            <el-input v-model="areaForm.vmax" :placeholder="dialogStatus === 'create' ? '请输入节点最大电压' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点最小电压:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入节点最小电压' : ''" />
+          <el-form-item label="节点最小电压:" prop="vmin">
+            <el-input v-model="areaForm.vmin" :placeholder="dialogStatus === 'create' ? '请输入节点最小电压' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="负荷有功功率:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入负荷有功功率' : ''" />
+          <el-form-item label="负荷有功功率:" prop="pd">
+            <el-input v-model="areaForm.pd" :placeholder="dialogStatus === 'create' ? '请输入负荷有功功率' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="负荷无功功率:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入负荷无功功率' : ''" />
+          <el-form-item label="负荷无功功率:" prop="qd">
+            <el-input v-model="areaForm.qd" :placeholder="dialogStatus === 'create' ? '请输入负荷无功功率' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
+      <!-- <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点碳势:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入节点碳势' : ''" />
+          <el-form-item label="节点碳势:" prop="qd">
+            <el-input v-model="areaForm.qd" :placeholder="dialogStatus === 'create' ? '请输入节点碳势' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -262,7 +275,7 @@
             <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入负荷碳流率' : ''" />
           </el-form-item>
         </el-col>
-      </el-row>
+      </el-row> -->
     </el-form>
     <template #footer>
       <div class="dialog-footer">
diff --git a/src/views/data/electricity/components/networkBranch.vue b/src/views/data/electricity/components/networkBranch.vue
index 8d137c0..c1eced0 100644
--- a/src/views/data/electricity/components/networkBranch.vue
+++ b/src/views/data/electricity/components/networkBranch.vue
@@ -6,11 +6,16 @@
 <script lang="ts" setup name="networkBranch">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import editList from './branchAdd.vue'
+import { electricityBranch } from '@/api/api/index'
 const props = defineProps({
   bak: {
     type: Function,
     required: true,
   },
+  id: {
+    type: String,
+    required: true,
+  },
 })
 const bak = () => {
   props.bak(1)
@@ -27,55 +32,31 @@
 const TimeRanges = ref()
 const loadingTable = ref(true)
 const columns = ref([
-  // { text: '设备类型', value: 'deviceTypeName', align: 'center' },
-  // { text: '设备编号', value: 'deviceNo', align: 'center' },
-  // { text: '安装位置', value: 'installLocaltion', align: 'center' },
-  // { text: '电量/V', value: 'electricalVoltage', align: 'center' },
-  // { text: '功率/W', value: 'power', align: 'center' },
-  // { text: '上传时间', value: 'uploadTime', align: 'center' },
-  { text: '支路首端节点', value: '1', align: 'center' },
-  { text: '支路末端节点', value: '2', align: 'center' },
-  { text: '支路电阻标幺值', value: '3', align: 'center' },
-  { text: '支路电纳标幺值', value: '4', align: 'center' },
-  { text: '长距离输电容量', value: '5', align: 'center' },
-  { text: '短距离输电容量', value: '7', align: 'center' },
-  { text: '紧急距离输电容量', value: '8', align: 'center' },
-  { text: '支路变比', value: '9', align: 'center' },
-  { text: '角度', value: '10', align: 'center' },
-  { text: '支路是否运行', value: '11', align: 'center' },
-  { text: '支路最小相位角', value: '12', align: 'center' },
-  { text: '支路碳流率', value: '13', align: 'center' },
+  { text: '支路首端节点', value: 'fbusId', align: 'center' },
+  { text: '支路末端节点', value: 'tbusId', align: 'center' },
+  { text: '支路电阻标幺值', value: 'r', align: 'center' },
+  { text: '支路电纳标幺值', value: 'b', align: 'center' },
+  { text: '长距离输电容量', value: 'ratea', align: 'center' },
+  { text: '短距离输电容量', value: 'rateb', align: 'center' },
+  { text: '紧急距离输电容量', value: 'ratec', align: 'center' },
+  { text: '支路变比', value: 'ratio', align: 'center' },
+  { text: '角度', value: 'angle', align: 'center' },
+  { text: '支路是否运行', value: 'status2', align: 'center' },
+  { text: '支路最小相位角', value: 'angmin', align: 'center' },
+  { text: '支路碳流率', value: 'angmax', align: 'center' },
 ]) // 表格
 const total = ref<number>(0)
 const list = ref<any[]>([])
 // 获取数据列表
 const fetchDataList = () => {
-  // loadingTable.value = true
-  // getMonitorStation(searchQuery).then((res) => {
-  //   list.value = res.data.rows
-  //   total.value = res.data.total
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      1: 22,
-      2: '23',
-      3: 100,
-      4: 100,
-      5: '220',
-      7: 220,
-      8: 110,
-      9: 1,
-      10: 90,
-      11: '是',
-      12: 10,
-      13: '12%',
-    },
-
-  ]
-  total.value = list.value.length
-  loadingTable.value = false
+  loadingTable.value = true
+  electricityBranch(props.id).then((res) => {
+    list.value = res.data.map(item => item.branchNodeInfos[0])
+    total.value = res.data.length
+    loadingTable.value = false
+  })
 }
+fetchDataList()
 // 搜索
 const search = () => {
   fetchDataList()
@@ -128,9 +109,6 @@
 const multiSelect = (row: any[]) => {
   selectList.value = row
 }
-onMounted(() => {
-  search()
-})
 </script>
 
 <template>
diff --git a/src/views/data/electricity/components/networkBusbar.vue b/src/views/data/electricity/components/networkBusbar.vue
index 5386ea1..c1eb19d 100644
--- a/src/views/data/electricity/components/networkBusbar.vue
+++ b/src/views/data/electricity/components/networkBusbar.vue
@@ -6,10 +6,15 @@
 <script lang="ts" setup name="networkBusbar">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import editList from './busbarAdd.vue'
+import { electricityNode, electricityNodeDelete } from '@/api/api/index'
 const props = defineProps({
   bak: {
     type: Function,
-    default: () => {},
+    default: () => { },
+  },
+  id: {
+    type: String,
+    required: true,
   },
 })
 const bak = () => {
@@ -27,55 +32,30 @@
 const TimeRanges = ref()
 const loadingTable = ref(true)
 const columns = ref([
-  // { text: '设备类型', value: 'deviceTypeName', align: 'center' },
-  // { text: '设备编号', value: 'deviceNo', align: 'center' },
-  // { text: '安装位置', value: 'installLocaltion', align: 'center' },
-  // { text: '电量/V', value: 'electricalVoltage', align: 'center' },
-  // { text: '功率/W', value: 'power', align: 'center' },
-  // { text: '上传时间', value: 'uploadTime', align: 'center' },
-  { text: '节点类型', value: '1', align: 'center' },
-  { text: '节点并联电导', value: '2', align: 'center' },
-  { text: '节点并联电纳', value: '3', align: 'center' },
-  { text: '母线断面号', value: '4', align: 'center' },
-  { text: '节点电压初始幅值', value: '5', align: 'center' },
-  { text: '节点电压初始相位角', value: '6', align: 'center' },
-  { text: '母线省损耗区域', value: '7', align: 'center' },
-  { text: '节点最大电压', value: '8', align: 'center' },
-  { text: '节点最小电压', value: '9', align: 'center' },
-  { text: '负荷有功功率', value: '10', align: 'center' },
-  { text: '负荷无功功率', value: '11', align: 'center' },
-  { text: '节点碳势', value: '12', align: 'center' },
-  { text: '负荷碳流率', value: '13', align: 'center' },
+  { text: '节点类型', value: 'type', align: 'center' },
+  { text: '节点并联电导', value: 'gs', align: 'center' },
+  { text: '节点并联电纳', value: 'bs', align: 'center' },
+  { text: '母线断面号', value: 'area', align: 'center' },
+  { text: '节点电压初始幅值', value: 'vm', align: 'center' },
+  { text: '节点电压初始相位角', value: 'va', align: 'center' },
+  { text: '母线省损耗区域', value: 'zone', align: 'center' },
+  { text: '节点最大电压', value: 'vmax', align: 'center' },
+  { text: '节点最小电压', value: 'vmin', align: 'center' },
+  { text: '负荷有功功率', value: 'pd', align: 'center' },
+  { text: '负荷无功功率', value: 'qd', align: 'center' },
+  { text: '节点碳势', value: 'en', align: 'center' },
+  { text: '负荷碳流率', value: 'flowRate', align: 'center' },
 ]) // 表格
 const total = ref<number>(0)
 const list = ref<any[]>([])
 // 获取数据列表
 const fetchDataList = () => {
-  // loadingTable.value = true
-  // getMonitorStation(searchQuery).then((res) => {
-  //   list.value = res.data.rows
-  //   total.value = res.data.total
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      1: '类型1',
-      2: '1',
-      3: '1',
-      4: '1',
-      5: '100',
-      6: '90',
-      7: 'C',
-      8: '220',
-      9: '110',
-      10: '1100',
-      11: '1100',
-      12: '低',
-      13: '1',
-    },
-  ]
-  total.value = list.value.length
-  loadingTable.value = false
+  loadingTable.value = true
+  electricityNode(props.id).then((res) => {
+    list.value = res.data
+    total.value = res.data.length
+    loadingTable.value = false
+  })
 }
 // 搜索
 const search = () => {
diff --git a/src/views/data/electricity/index.vue b/src/views/data/electricity/index.vue
index 881f988..f37ba02 100644
--- a/src/views/data/electricity/index.vue
+++ b/src/views/data/electricity/index.vue
@@ -15,12 +15,8 @@
   },
   {
     id: '1',
-    title: '设备监测',
+    title: '设备监测数据',
   },
-  // {
-  //   id: '2',
-  //   title: '电动汽车及储能',
-  // },
 ])
 const select = ref('')
 const confirm = (selectp: string) => {
@@ -41,7 +37,7 @@
     <!-- 分布式光伏 -->
     <page v-if="select === '分布式光伏'" :station-type="type" />
     <!-- 设备监测 -->
-    <device v-if="select === '设备监测'" />
+    <device v-if="select === '设备监测数据'" />
   </div>
 </template>
 
diff --git a/src/views/data/electricity/network.vue b/src/views/data/electricity/network.vue
index d95d2cd..b79c34b 100644
--- a/src/views/data/electricity/network.vue
+++ b/src/views/data/electricity/network.vue
@@ -34,59 +34,28 @@
 const loadingTable = ref(true)
 // table列表
 const columns = ref([
-  // { text: '配电网名称', value: 'electricityName', align: 'center' },
+  { text: '配电网名称', value: 'electricityName', align: 'center' },
   // { text: '配电网区域', value: 'electricityArea', align: 'center' },
   // { text: '上传人', value: 'uploaderName', align: 'center' },
   // { text: '上传时间', value: 'uploadTime', align: 'center' },
-  { text: '基准功率', value: 'w', align: 'center' },
-  { text: '系统节点数', value: 'x', align: 'center' },
-  { text: '发电机数', value: 'f', align: 'center' },
-  { text: '系统负荷数', value: 'xt', align: 'center' },
-  { text: '节点之间支路数', value: 'j', align: 'center' },
+  { text: '基准功率', value: 'basePower', align: 'center' },
+  { text: '系统节点数', value: 'codeNum', align: 'center' },
+  { text: '发电机数', value: 'genNum', align: 'center' },
+  { text: '系统负荷数', value: 'loadNum', align: 'center' },
+  { text: '节点之间支路数', value: 'branchNum', align: 'center' },
 ])
 const total = ref<number>(0)
 // table列表数据
 const list = ref<any[]>([])
 // 获取数据列表
 const fetchDataList = () => {
-  // loadingTable.value = true
-  // getElectricityList(searchQuery).then((res) => {
-  //   list.value = res.data.rows
-  //   total.value = res.data.total
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      w: 1000,
-      x: 33,
-      f: 5,
-      xt: 32,
-      j: 37,
-    },
-    {
-      w: 1200,
-      x: 133,
-      f: 15,
-      xt: 132,
-      j: 327,
-    },
-    {
-      w: 1100,
-      x: 22,
-      f: 35,
-      xt: 322,
-      j: 39,
-    },
-    {
-      w: 1000,
-      x: 66,
-      f: 12,
-      xt: 62,
-      j: 47,
-    },
-  ]
-  total.value = list.value.length
-  loadingTable.value = false
+  loadingTable.value = true
+  getElectricityList(searchQuery).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+    console.log(res.data, '配电网管理')
+    loadingTable.value = false
+  })
 }
 // 搜索
 const search = () => {
@@ -138,15 +107,16 @@
 const detailRef = ref()
 // 查看详情
 const detail = (row: any) => {
-  if (row.electricityDetail) {
-    detailRef.value.initDialog(row)
-  }
-  else {
-    ElMessage({
-      type: 'info',
-      message: '暂无内容',
-    })
-  }
+  // if (row.electricityDetail) {
+  //   detailRef.value.initDialog(row)
+  // }
+  // else {
+  //   ElMessage({
+  //     type: 'info',
+  //     message: '暂无内容',
+  //   })
+  // }
+  editRef.value.initDialog('detail', row)
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -167,15 +137,26 @@
 onMounted(() => {
   search()
 })
+// 母线参数
+const networdId = ref('')
+const bushbar = (row: any) => {
+  showTable.value = 2
+  networdId.value = row.id
+}
+// 之路参数
+const branch = (row: any) => {
+  showTable.value = 3
+  networdId.value = row.id
+}
 </script>
 
 <template>
   <!-- 配电网分支参数 -->
-  <network-branch v-show="showTable === 3" ref="branchRef" :bak="changeShow" />
+  <network-branch v-if="showTable === 3" :id="networdId" ref="branchRef" :bak="changeShow" />
   <!-- 配电网母线参数 -->
-  <network-busbar v-show="showTable === 2" ref="busbarRef" :bak="changeShow" />
+  <network-busbar v-if="showTable === 2" :id="networdId" ref="busbarRef" :bak="changeShow" />
   <!-- 配电网 -->
-  <div v-show="showTable === 1">
+  <div v-if="showTable === 1">
     <edit-list ref="editRef" @refresh="search" />
     <detail-dialog ref="detailRef" />
     <!-- 筛选条件 -->
@@ -219,7 +200,7 @@
                 size="small"
                 type="primary"
                 link
-                @click="() => { showTable = 2;(row) }"
+                @click="bushbar(row)"
               >
                 母线参数
               </el-button>
@@ -231,7 +212,7 @@
                 size="small"
                 type="primary"
                 link
-                @click="() => { showTable = 3;(row) }"
+                @click="branch(row)"
               >
                 支线参数
               </el-button>
diff --git a/src/views/data/electricity/networkAdd.vue b/src/views/data/electricity/networkAdd.vue
index 159e7dd..d3b1a76 100644
--- a/src/views/data/electricity/networkAdd.vue
+++ b/src/views/data/electricity/networkAdd.vue
@@ -12,23 +12,25 @@
 const isEditMode = ref(true)
 const areaForm = ref({
   electricityName: '', // 配电网名称
-  electricityArea: '', // 配电网区域
-  uploaderName: '', // 上传人
-  uploader: '',
-  uploadTime: '', // 上传时间
-  electricityDetail: '', // 详情图片
+  basePower: '', // 基准功率
+  codeNum: '', // 系统节点数
+  genNum: '', // 发电机数
+  loadNum: '', // 系统负荷数
+  branchNum: '', // 节点之间支路数
 }) // 表单
 const textMap: { [key: string]: string } = {
   update: '编辑',
   create: '新增',
+  detail: '详情',
 } // 表头显示标题
 const btnLoading = ref(false) // 保存按钮的加载中状态
 const rules: FormRules = {
   electricityName: [{ required: true, message: '请输入配电网名称', trigger: ['blur', 'change'] }],
-  electricityArea: [{ required: true, message: '请输入配电网区域', trigger: ['blur', 'change'] }],
-  uploader: [{ required: true, message: '请选择上传人', trigger: ['blur', 'change'] }],
-  uploadTime: [{ required: true, message: '请选择上传时间', trigger: ['blur', 'change'] }],
-  electricityDetail: [{ required: true, message: '请上传附件', trigger: ['blur', 'change'] }],
+  basePower: [{ required: true, message: '请输入基准功率', trigger: ['blur', 'change'] }],
+  codeNum: [{ required: true, message: '请输入系统节点数', trigger: ['blur', 'change'] }],
+  genNum: [{ required: true, message: '请输入发电机数', trigger: ['blur', 'change'] }],
+  loadNum: [{ required: true, message: '请输入系统负荷数', trigger: ['blur', 'change'] }],
+  branchNum: [{ required: true, message: '请输入节点之间支路数', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 // 获取用户列表
 const userList = ref<any[]>([])
@@ -45,11 +47,11 @@
 const resetForm = () => {
   areaForm.value = {
     electricityName: '', // 配电网名称
-    electricityArea: '', // 配电网区域
-    uploaderName: '', // 上传人+
-    uploader: '',
-    uploadTime: '', // 上传时间
-    electricityDetail: '',
+    basePower: '', // 基准功率
+    codeNum: '', // 系统节点数
+    genNum: '', // 发电机数
+    loadNum: '', // 系统负荷数
+    branchNum: '', // 节点之间支路数
   }
 }
 const deviceTypeList = ref([])
@@ -69,6 +71,10 @@
     areaForm.value = row
     isEditMode.value = true
   }
+  else if (dialogStatus.value === 'detail') {
+    areaForm.value = row
+    isEditMode.value = false
+  }
 }
 defineExpose({
   initDialog,
@@ -78,7 +84,7 @@
 const createData = () => {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
-      areaForm.value.uploadTime = dayjs().format('YYYY-MM-DD')
+      // areaForm.value.uploadTime = dayjs().format('YYYY-MM-DD')
       btnLoading.value = true
       addElectricityList(areaForm.value).then((response) => {
         if (response.code === 200) {
@@ -104,7 +110,7 @@
 const updateData = () => {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
-      areaForm.value.uploadTime = dayjs().format('YYYY-MM-DD')
+      // areaForm.value.uploadTime = dayjs().format('YYYY-MM-DD')
       btnLoading.value = true
       updateElectricityList(areaForm.value).then((response) => {
         if (response.code === 200) {
@@ -167,36 +173,43 @@
     <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="140px">
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="基准功率:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '基准功率' : ''" />
+          <el-form-item label="配电网名称:" prop="electricityName">
+            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '配电网名称' : ''" :disabled="dialogStatus === 'detail'" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="系统节点数:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '系统节点数' : ''" />
+          <el-form-item label="基准功率:" prop="basePower">
+            <el-input v-model="areaForm.basePower" :placeholder="dialogStatus === 'create' ? '基准功率' : ''" :disabled="dialogStatus === 'detail'" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="发电机数:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '发电机数' : ''" />
+          <el-form-item label="系统节点数:" prop="codeNum">
+            <el-input v-model="areaForm.codeNum" :placeholder="dialogStatus === 'create' ? '系统节点数' : ''" :disabled="dialogStatus === 'detail'" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="系统负荷数:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '系统负荷数' : ''" />
+          <el-form-item label="发电机数:" prop="genNum">
+            <el-input v-model="areaForm.genNum" :placeholder="dialogStatus === 'create' ? '发电机数' : ''" :disabled="dialogStatus === 'detail'" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点之间支路数:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '节点之间支路数' : ''" />
+          <el-form-item label="系统负荷数:" prop="loadNum">
+            <el-input v-model="areaForm.loadNum" :placeholder="dialogStatus === 'create' ? '系统负荷数' : ''" :disabled="dialogStatus === 'detail'" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="20">
+          <el-form-item label="节点之间支路数:" prop="branchNum">
+            <el-input v-model="areaForm.branchNum" :placeholder="dialogStatus === 'create' ? '节点之间支路数' : ''" :disabled="dialogStatus === 'detail'" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -240,7 +253,7 @@
         </el-col>
       </el-row> -->
     </el-form>
-    <template #footer>
+    <template v-if="dialogStatus !== 'detail'" #footer>
       <div class="dialog-footer">
         <el-button :loading="btnLoading" type="primary" @click="saveData">
           保存
@@ -250,6 +263,13 @@
         </el-button>
       </div>
     </template>
+    <template v-else #footer>
+      <div class="dialog-footer">
+        <el-button :loading="btnLoading" type="primary" @click="dialogFormVisible = false">
+          确认
+        </el-button>
+      </div>
+    </template>
   </el-dialog>
 </template>
 
diff --git a/src/views/data/electricity/page.vue b/src/views/data/electricity/page.vue
index 2ed4f87..d1b96b9 100644
--- a/src/views/data/electricity/page.vue
+++ b/src/views/data/electricity/page.vue
@@ -30,77 +30,29 @@
 }, { deep: true })
 const loadingTable = ref(true)
 const columns = ref([
-  // { text: '设备类型', value: 'deviceTypeName', align: 'center' },
-  // { text: '设备编号', value: 'deviceNo', align: 'center' },
-  // { text: '安装位置', value: 'installLocaltion', align: 'center' },
-  // { text: '电量/V', value: 'electricalVoltage', align: 'center' },
-  // { text: '功率/W', value: 'power', align: 'center' },
-  // { text: '上传时间', value: 'uploadTime', align: 'center' },
-  { text: '发电机组对应节点数', value: '1', align: 'center' },
-  { text: '发电机有功/MW', value: '2', align: 'center' },
-  { text: '发电机无功', value: '3', align: 'center' },
-  { text: '最大无功', value: '4', align: 'center' },
-  { text: '最小无功', value: '5', align: 'center' },
-  { text: '节点电压', value: '6', align: 'center' },
-  { text: '发电机容量', value: '7', align: 'center' },
-  { text: '运行状态', value: '8', align: 'center' },
-  { text: '最大有功', value: '9', align: 'center' },
-  { text: '最小有功', value: '10', align: 'center' },
-  { text: '碳排强度', value: '11', align: 'center' },
+  { text: '发电机组对应节点数', value: 'nodeId', align: 'center' },
+  { text: '发电机有功/MW', value: 'pg', align: 'center' },
+  { text: '发电机无功', value: 'qg', align: 'center' },
+  { text: '最大无功', value: 'qmax', align: 'center' },
+  { text: '最小无功', value: 'qmin', align: 'center' },
+  { text: '节点电压', value: 'vg', align: 'center' },
+  { text: '发电机容量', value: 'mbase', align: 'center' },
+  { text: '运行状态', value: 'status', align: 'center' },
+  { text: '最大有功', value: 'pmax', align: 'center' },
+  { text: '最小有功', value: 'pmin', align: 'center' },
+  { text: '碳排强度', value: 'strength', align: 'center' },
 ]) // 表格
 const total = ref<number>(0)
 const list = ref<any[]>([])
 // 获取数据列表
 const fetchDataList = () => {
-  // loadingTable.value = true
-  // getMonitorStation(searchQuery).then((res) => {
-  //   list.value = res.data.rows
-  //   total.value = res.data.total
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      1: 33,
-      2: 1000,
-      3: 10,
-      4: 1100,
-      5: 1000,
-      6: 220,
-      7: 3600,
-      8: '正常',
-      9: 1100,
-      10: 1000,
-      11: '弱',
-    },
-    {
-      1: 133,
-      2: 900,
-      3: 10,
-      4: 1100,
-      5: 1000,
-      6: 220,
-      7: 3600,
-      8: '异常',
-      9: 1000,
-      10: 1000,
-      11: '强',
-    },
-    {
-      1: 22,
-      2: 1000,
-      3: 10,
-      4: 1100,
-      5: 1000,
-      6: 220,
-      7: 3600,
-      8: '离线',
-      9: 1000,
-      10: 1000,
-      11: '弱',
-    },
-  ]
-  total.value = list.value.length
-  loadingTable.value = false
+  loadingTable.value = true
+  getMonitorStation(searchQuery).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+    console.log(res.data, '分布式光伏')
+    loadingTable.value = false
+  })
 }
 // 搜索
 const search = () => {
diff --git a/src/views/data/electricity/pageAdd.vue b/src/views/data/electricity/pageAdd.vue
index f38ce05..223a07d 100644
--- a/src/views/data/electricity/pageAdd.vue
+++ b/src/views/data/electricity/pageAdd.vue
@@ -10,11 +10,17 @@
 const dialogStatus = ref('') // 对话框类型：create,update
 const isEditMode = ref(true)
 const areaForm = ref({
-  deviceId: '',
-  electricalVoltage: '', // 电量
-  power: '', // 功率
-  stationType: '',
-  uploadTime: '',
+  nodeId: '', // 发电机组对应节点数
+  pg: '', // 发电机有功/MW
+  qg: '', // 发电机无功
+  qmax: '', // 最大无功
+  qmin: '', // 最小无功
+  vg: '', // 节点电压
+  mbase: '', // 发电机容量
+  status: '', // 运行状态
+  pmax: '', // 最大有功
+  pmin: '', // 最小有功
+  strength: '', // 碳排强度
 }) // 表单
 const textMap: { [key: string]: string } = {
   update: '编辑',
@@ -22,22 +28,33 @@
 } // 表头显示标题
 const btnLoading = ref(false) // 保存按钮的加载中状态
 const rules: FormRules = {
-  deviceType: [{ required: true, message: '设备类型不能为空', trigger: ['blur', 'change'] }],
-  deviceNo: [{ required: true, message: '设备编号', trigger: ['blur', 'change'] }],
-  installLocaltion: [{ required: true, message: '安装位置', trigger: ['blur', 'change'] }],
-  electricalVoltage: [{ required: true, message: '电量', trigger: ['blur', 'change'] }],
-  power: [{ required: true, message: '功率', trigger: ['blur', 'change'] }],
-  uploadTime: [{ required: true, message: '上传时间', trigger: ['blur', 'change'] }],
+  nodeId: [{ required: true, message: '发电机组对应节点数不能为空', trigger: ['blur', 'change'] }],
+  pg: [{ required: true, message: '发电机有功不能为空', trigger: ['blur', 'change'] }],
+  qg: [{ required: true, message: '发电机无功不能为空', trigger: ['blur', 'change'] }],
+  qmax: [{ required: true, message: '最大无功不能为空', trigger: ['blur', 'change'] }],
+  qmin: [{ required: true, message: '最小无功不能为空', trigger: ['blur', 'change'] }],
+  vg: [{ required: true, message: '节点电压不能为空', trigger: ['blur', 'change'] }],
+  mbase: [{ required: true, message: '发电机容量不能为空', trigger: ['blur', 'change'] }],
+  status: [{ required: true, message: '运行状态不能为空', trigger: ['blur', 'change'] }],
+  pmax: [{ required: true, message: '最大有功不能为空', trigger: ['blur', 'change'] }],
+  pmin: [{ required: true, message: '最小有功不能为空', trigger: ['blur', 'change'] }],
+  strength: [{ required: true, message: '碳排强度不能为空', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 // 重置表单
 const resetForm = () => {
   areaForm.value = {
-    electricalVoltage: '', // 电量
-    power: '', // 功率
-    stationType: '',
-    deviceId: '',
-    uploadTime: '',
+    nodeId: '', // 发电机组对应节点数
+    pg: '', // 发电机有功/MW
+    qg: '', // 发电机无功
+    qmax: '', // 最大无功
+    qmin: '', // 最小无功
+    vg: '', // 节点电压
+    mbase: '', // 发电机容量
+    status: '', // 运行状态
+    pmax: '', // 最大有功
+    pmin: '', // 最小有功
+    strength: '', // 碳排强度
   }
 }
 const deviceTypeList = ref([])
@@ -149,78 +166,84 @@
     <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="160px">
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="发电机组对应节点数:" prop="electricalVoltage">
-            <el-input v-model="areaForm.electricalVoltage" :placeholder="dialogStatus === 'create' ? '请输入发电机组对应节点数' : ''" />
+          <el-form-item label="发电机组对应节点数:" prop="nodeId">
+            <el-input
+              v-model="areaForm.nodeId"
+              :placeholder="dialogStatus === 'create' ? '请输入发电机组对应节点数' : ''"
+            />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="发电机有功/MW:" prop="electricalVoltage">
-            <el-input v-model="areaForm.electricalVoltage" :placeholder="dialogStatus === 'create' ? '请输入发电机有功/MW' : ''" />
+          <el-form-item label="发电机有功/MW:" prop="pg">
+            <el-input
+              v-model="areaForm.pg"
+              :placeholder="dialogStatus === 'create' ? '请输入发电机有功/MW' : ''"
+            />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="发电机无功:" prop="electricalVoltage">
-            <el-input v-model="areaForm.electricalVoltage" :placeholder="dialogStatus === 'create' ? '请输入发电机无功' : ''" />
+          <el-form-item label="发电机无功:" prop="qg">
+            <el-input v-model="areaForm.qg" :placeholder="dialogStatus === 'create' ? '请输入发电机无功' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="最大无功:" prop="electricalVoltage">
-            <el-input v-model="areaForm.electricalVoltage" :placeholder="dialogStatus === 'create' ? '请输入最大无功' : ''" />
+          <el-form-item label="最大无功:" prop="qmax">
+            <el-input v-model="areaForm.qmax" :placeholder="dialogStatus === 'create' ? '请输入最大无功' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="最小无功:" prop="electricalVoltage">
-            <el-input v-model="areaForm.electricalVoltage" :placeholder="dialogStatus === 'create' ? '请输入最小无功' : ''" />
+          <el-form-item label="最小无功:" prop="qmin">
+            <el-input v-model="areaForm.qmin" :placeholder="dialogStatus === 'create' ? '请输入最小无功' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="节点电压:" prop="electricalVoltage">
-            <el-input v-model="areaForm.electricalVoltage" :placeholder="dialogStatus === 'create' ? '请输入节点电压' : ''" />
+          <el-form-item label="节点电压:" prop="vg">
+            <el-input v-model="areaForm.vg" :placeholder="dialogStatus === 'create' ? '请输入节点电压' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="发电机容量:" prop="electricalVoltage">
-            <el-input v-model="areaForm.electricalVoltage" :placeholder="dialogStatus === 'create' ? '请输入发电机容量' : ''" />
+          <el-form-item label="发电机容量:" prop="mbase">
+            <el-input v-model="areaForm.mbase" :placeholder="dialogStatus === 'create' ? '请输入发电机容量' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="运行状态:" prop="electricalVoltage">
-            <el-input v-model="areaForm.electricalVoltage" :placeholder="dialogStatus === 'create' ? '请输入运行状态' : ''" />
+          <el-form-item label="运行状态:" prop="status">
+            <el-input v-model="areaForm.status" :placeholder="dialogStatus === 'create' ? '请输入运行状态' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="最大有功:" prop="electricalVoltage">
-            <el-input v-model="areaForm.electricalVoltage" :placeholder="dialogStatus === 'create' ? '请输入最大有功' : ''" />
+          <el-form-item label="最大有功:" prop="pmax">
+            <el-input v-model="areaForm.pmax" :placeholder="dialogStatus === 'create' ? '请输入最大有功' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="最小有功:" prop="electricalVoltage">
-            <el-input v-model="areaForm.electricalVoltage" :placeholder="dialogStatus === 'create' ? '请输入最小有功' : ''" />
+          <el-form-item label="最小有功:" prop="pmin">
+            <el-input v-model="areaForm.pmin" :placeholder="dialogStatus === 'create' ? '请输入最小有功' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="碳排强度:" prop="electricalVoltage">
-            <el-input v-model="areaForm.electricalVoltage" :placeholder="dialogStatus === 'create' ? '请输入碳排强度' : ''" />
+          <el-form-item label="碳排强度:" prop="strength">
+            <el-input v-model="areaForm.strength" :placeholder="dialogStatus === 'create' ? '请输入碳排强度' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/evaluate/page.vue b/src/views/evaluate/page.vue
index e97e18a..56d7a46 100644
--- a/src/views/evaluate/page.vue
+++ b/src/views/evaluate/page.vue
@@ -10,15 +10,15 @@
   [
     {
       name: '碳足迹监测',
-      url: 'https://share.shanhaibi.com/641c0c42b4d7e/',
+      url: 'https://share.shanhaibi.com/645b6b3674e29/',
     },
     {
       name: '碳足迹评价',
-      url: 'https://share.shanhaibi.com/641c0c7ca29db/',
+      url: 'https://share.shanhaibi.com/645b6ba377610/',
     },
     {
       name: '碳足迹预警',
-      url: 'https://share.shanhaibi.com/641c0cacce6ed/',
+      url: 'https://share.shanhaibi.com/645b6c6749576/',
     },
   ],
 )
@@ -29,7 +29,8 @@
 current()
 onMounted(() => {
   window.open(current().url, '_blank')
-  $router.push({ path: '/dashboard/index' })
+  // $router.push({ path: '/dashboard/index' })
+  $router.go(-1)
 })
 </script>