diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 00994da..f48e375 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -222,35 +222,35 @@
         })
         // 添加支路折线文本
         // 创建纯文本标记
-        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])
-          })
-        })
+        // 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) => {

diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 00994da..f48e375 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -222,35 +222,35 @@
         })
         // 添加支路折线文本
         // 创建纯文本标记
-        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])
-          })
-        })
+        // 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) => {
diff --git a/src/views/data/electricity/components/busbarAdd.vue b/src/views/data/electricity/components/busbarAdd.vue
index fa5ccb8..535fa65 100644
--- a/src/views/data/electricity/components/busbarAdd.vue
+++ b/src/views/data/electricity/components/busbarAdd.vue
@@ -6,9 +6,14 @@
 <script lang="ts" setup name="deviceAdd">
 import type { FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import dayjs from 'dayjs'
-import { electricityNodeAdd, electricityNodeUpdate } from '@/api/api/index'
-import { getUserList } from '@/api/system/user'
+import { electricityNode, electricityNodeAdd, electricityNodeUpdate } from '@/api/api/index'
+import { getDictByCode } from '@/api/system/dict'
+const props = defineProps({
+  id: {
+    type: String,
+    required: true,
+  },
+})
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
 const dialogFormVisible = ref(false) // 对话框是否显示
@@ -26,16 +31,36 @@
   vmin: '', // 节点最小电压
   pd: '', // 负荷有功功率
   qd: '', // 负荷无功功率
-  // qd: '', // 负荷无功功率
-  // qd: '', // 负荷无功功率
+  id: '',
+  busId: '',
 }) // 表单
 const textMap: { [key: string]: string } = {
   update: '编辑',
   create: '新增',
 } // 表头显示标题
 const btnLoading = ref(false) // 保存按钮的加载中状态
+// 获取所有节点
+const NodeListAll = ref()
+const fetchDataList = () => {
+  electricityNode(props.id).then((res) => {
+    NodeListAll.value = res.data.map(item => item.busId.toString())
+  })
+}
+// 节点编号验证规则
+const validateBusId = (rule: any, value: any, callback: any) => {
+  if (value && dialogStatus.value === 'update') {
+    callback()
+  }
+  // if () {
+  //   callback()
+  // }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
 const rules: FormRules = {
   type: [{ required: true, message: '请选择节点类型', trigger: ['blur', 'change'] }],
+  busId: [{ required: true, message: '节点编号重复或为空', trigger: 'blur', validator: validateBusId }],
   gs: [{ required: true, message: '节点并联电导', trigger: ['blur', 'change'] }],
   bs: [{ required: true, message: '节点并联电纳', trigger: ['blur', 'change'] }],
   area: [{ required: true, message: '母线断面号', trigger: ['blur', 'change'] }],
@@ -47,14 +72,6 @@
   pd: [{ required: true, message: '负荷有功功率', trigger: ['blur', 'change'] }],
   qd: [{ required: true, message: '负荷无功功率', trigger: ['blur', 'change'] }],
 } // 前端校验规则
-// 获取用户列表
-const userList = ref<any[]>([])
-const fetchUserList = () => {
-  getUserList({ limit: 9999, offset: 1 }).then((res) => {
-    userList.value = res.data.rows
-  })
-}
-fetchUserList()
 // 重置表单
 const resetForm = () => {
   areaForm.value = {
@@ -69,9 +86,20 @@
     vmin: '', // 节点最小电压
     pd: '', // 负荷有功功率
     qd: '', // 负荷无功功率
+    id: '',
+    busId: '',
   }
 }
-const deviceTypeList = ref([])
+const nodeTypeList = ref([])
+// 获取设备类型列表
+const fetchNodeType = () => {
+  getDictByCode('node_type').then((res) => {
+    nodeTypeList.value = res.data
+  })
+}
+fetchNodeType()
+
+fetchDataList()
 // 初始化对话框
 const initDialog = (dialogStatusValue: string, row: any) => {
   dialogStatus.value = dialogStatusValue
@@ -86,6 +114,8 @@
   }
   else if (dialogStatus.value === 'update') { // 如果是修改，将row中数据填写到输入框中
     areaForm.value = row
+    areaForm.value.type = row.type.toString()
+    console.log(areaForm.value)
     isEditMode.value = true
   }
 }
@@ -144,6 +174,7 @@
 
 // 保存数据
 const saveData = () => {
+  console.log(dialogStatus.value)
   if (dialogStatus.value === 'update') {
     updateData()
   }
@@ -154,46 +185,30 @@
 const cancel = () => {
   dialogFormVisible.value = false
 }
-const fileRef = ref() // 文件上传input
-const onFileChange = (event: any) => {
-  // 原生上传
-  // console.log(event.target.files)
-  if (event.target.files?.length !== 0) {
-    // 创建formdata对象
-    const fd = new FormData()
-    fd.append('file', event.target.files[0])
-    uploadApi(fd).then((res) => {
-      if (res.code === 200) {
-        dataFormRef.value?.clearValidate('electricityDetail')
-        areaForm.value.electricityDetail = res.data
-        ElMessage.success('上传成功')
-      }
-      else {
-        ElMessage.error(res.message)
-      }
-    })
-  }
-}
-const upload = () => {
-  fileRef.value.click()
-}
 </script>
 
 <template>
   <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="节点类型">
+        <el-form-item label="节点类型:" prop="type">
           <el-select
-            v-model="areaForm.type" class="m-2"
-            :placeholder="dialogStatus === 'create' ? '请选择节点类型' : ''" style="width: 100%;"
+            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-option v-for="item in nodeTypeList" :key="item.id" :label="item.name" :value="item.value" />
           </el-select>
         </el-form-item>
       </el-col>
       <el-row :gutter="20">
         <el-col :span="20">
+          <el-form-item label="节点编号:" prop="busId">
+            <el-input v-model="areaForm.busId" :placeholder="dialogStatus === 'create' ? '请输入节点编号' : ''" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="20">
           <el-form-item label="节点并联电导:" prop="gs">
             <el-input v-model="areaForm.gs" :placeholder="dialogStatus === 'create' ? '请输入节点并联电导' : ''" />
           </el-form-item>
@@ -262,20 +277,6 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <!-- <el-row :gutter="20">
-        <el-col :span="20">
-          <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-col :span="20">
-          <el-form-item label="负荷碳流率:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入负荷碳流率' : ''" />
-          </el-form-item>
-        </el-col>
-      </el-row> -->
     </el-form>
     <template #footer>
       <div class="dialog-footer">

diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 00994da..f48e375 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -222,35 +222,35 @@
         })
         // 添加支路折线文本
         // 创建纯文本标记
-        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])
-          })
-        })
+        // 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) => {
diff --git a/src/views/data/electricity/components/busbarAdd.vue b/src/views/data/electricity/components/busbarAdd.vue
index fa5ccb8..535fa65 100644
--- a/src/views/data/electricity/components/busbarAdd.vue
+++ b/src/views/data/electricity/components/busbarAdd.vue
@@ -6,9 +6,14 @@
 <script lang="ts" setup name="deviceAdd">
 import type { FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import dayjs from 'dayjs'
-import { electricityNodeAdd, electricityNodeUpdate } from '@/api/api/index'
-import { getUserList } from '@/api/system/user'
+import { electricityNode, electricityNodeAdd, electricityNodeUpdate } from '@/api/api/index'
+import { getDictByCode } from '@/api/system/dict'
+const props = defineProps({
+  id: {
+    type: String,
+    required: true,
+  },
+})
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
 const dialogFormVisible = ref(false) // 对话框是否显示
@@ -26,16 +31,36 @@
   vmin: '', // 节点最小电压
   pd: '', // 负荷有功功率
   qd: '', // 负荷无功功率
-  // qd: '', // 负荷无功功率
-  // qd: '', // 负荷无功功率
+  id: '',
+  busId: '',
 }) // 表单
 const textMap: { [key: string]: string } = {
   update: '编辑',
   create: '新增',
 } // 表头显示标题
 const btnLoading = ref(false) // 保存按钮的加载中状态
+// 获取所有节点
+const NodeListAll = ref()
+const fetchDataList = () => {
+  electricityNode(props.id).then((res) => {
+    NodeListAll.value = res.data.map(item => item.busId.toString())
+  })
+}
+// 节点编号验证规则
+const validateBusId = (rule: any, value: any, callback: any) => {
+  if (value && dialogStatus.value === 'update') {
+    callback()
+  }
+  // if () {
+  //   callback()
+  // }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
 const rules: FormRules = {
   type: [{ required: true, message: '请选择节点类型', trigger: ['blur', 'change'] }],
+  busId: [{ required: true, message: '节点编号重复或为空', trigger: 'blur', validator: validateBusId }],
   gs: [{ required: true, message: '节点并联电导', trigger: ['blur', 'change'] }],
   bs: [{ required: true, message: '节点并联电纳', trigger: ['blur', 'change'] }],
   area: [{ required: true, message: '母线断面号', trigger: ['blur', 'change'] }],
@@ -47,14 +72,6 @@
   pd: [{ required: true, message: '负荷有功功率', trigger: ['blur', 'change'] }],
   qd: [{ required: true, message: '负荷无功功率', trigger: ['blur', 'change'] }],
 } // 前端校验规则
-// 获取用户列表
-const userList = ref<any[]>([])
-const fetchUserList = () => {
-  getUserList({ limit: 9999, offset: 1 }).then((res) => {
-    userList.value = res.data.rows
-  })
-}
-fetchUserList()
 // 重置表单
 const resetForm = () => {
   areaForm.value = {
@@ -69,9 +86,20 @@
     vmin: '', // 节点最小电压
     pd: '', // 负荷有功功率
     qd: '', // 负荷无功功率
+    id: '',
+    busId: '',
   }
 }
-const deviceTypeList = ref([])
+const nodeTypeList = ref([])
+// 获取设备类型列表
+const fetchNodeType = () => {
+  getDictByCode('node_type').then((res) => {
+    nodeTypeList.value = res.data
+  })
+}
+fetchNodeType()
+
+fetchDataList()
 // 初始化对话框
 const initDialog = (dialogStatusValue: string, row: any) => {
   dialogStatus.value = dialogStatusValue
@@ -86,6 +114,8 @@
   }
   else if (dialogStatus.value === 'update') { // 如果是修改，将row中数据填写到输入框中
     areaForm.value = row
+    areaForm.value.type = row.type.toString()
+    console.log(areaForm.value)
     isEditMode.value = true
   }
 }
@@ -144,6 +174,7 @@
 
 // 保存数据
 const saveData = () => {
+  console.log(dialogStatus.value)
   if (dialogStatus.value === 'update') {
     updateData()
   }
@@ -154,46 +185,30 @@
 const cancel = () => {
   dialogFormVisible.value = false
 }
-const fileRef = ref() // 文件上传input
-const onFileChange = (event: any) => {
-  // 原生上传
-  // console.log(event.target.files)
-  if (event.target.files?.length !== 0) {
-    // 创建formdata对象
-    const fd = new FormData()
-    fd.append('file', event.target.files[0])
-    uploadApi(fd).then((res) => {
-      if (res.code === 200) {
-        dataFormRef.value?.clearValidate('electricityDetail')
-        areaForm.value.electricityDetail = res.data
-        ElMessage.success('上传成功')
-      }
-      else {
-        ElMessage.error(res.message)
-      }
-    })
-  }
-}
-const upload = () => {
-  fileRef.value.click()
-}
 </script>
 
 <template>
   <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="节点类型">
+        <el-form-item label="节点类型:" prop="type">
           <el-select
-            v-model="areaForm.type" class="m-2"
-            :placeholder="dialogStatus === 'create' ? '请选择节点类型' : ''" style="width: 100%;"
+            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-option v-for="item in nodeTypeList" :key="item.id" :label="item.name" :value="item.value" />
           </el-select>
         </el-form-item>
       </el-col>
       <el-row :gutter="20">
         <el-col :span="20">
+          <el-form-item label="节点编号:" prop="busId">
+            <el-input v-model="areaForm.busId" :placeholder="dialogStatus === 'create' ? '请输入节点编号' : ''" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="20">
           <el-form-item label="节点并联电导:" prop="gs">
             <el-input v-model="areaForm.gs" :placeholder="dialogStatus === 'create' ? '请输入节点并联电导' : ''" />
           </el-form-item>
@@ -262,20 +277,6 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <!-- <el-row :gutter="20">
-        <el-col :span="20">
-          <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-col :span="20">
-          <el-form-item label="负荷碳流率:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入负荷碳流率' : ''" />
-          </el-form-item>
-        </el-col>
-      </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 c1eced0..d4245ed 100644
--- a/src/views/data/electricity/components/networkBranch.vue
+++ b/src/views/data/electricity/components/networkBranch.vue
@@ -71,7 +71,7 @@
 const editRef = ref()
 // 新增
 const add = () => {
-  editRef.value.initDialog('add', { })
+  editRef.value.initDialog('create', { })
 }
 // 编辑
 const edit = (row: any) => {

diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 00994da..f48e375 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -222,35 +222,35 @@
         })
         // 添加支路折线文本
         // 创建纯文本标记
-        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])
-          })
-        })
+        // 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) => {
diff --git a/src/views/data/electricity/components/busbarAdd.vue b/src/views/data/electricity/components/busbarAdd.vue
index fa5ccb8..535fa65 100644
--- a/src/views/data/electricity/components/busbarAdd.vue
+++ b/src/views/data/electricity/components/busbarAdd.vue
@@ -6,9 +6,14 @@
 <script lang="ts" setup name="deviceAdd">
 import type { FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import dayjs from 'dayjs'
-import { electricityNodeAdd, electricityNodeUpdate } from '@/api/api/index'
-import { getUserList } from '@/api/system/user'
+import { electricityNode, electricityNodeAdd, electricityNodeUpdate } from '@/api/api/index'
+import { getDictByCode } from '@/api/system/dict'
+const props = defineProps({
+  id: {
+    type: String,
+    required: true,
+  },
+})
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
 const dialogFormVisible = ref(false) // 对话框是否显示
@@ -26,16 +31,36 @@
   vmin: '', // 节点最小电压
   pd: '', // 负荷有功功率
   qd: '', // 负荷无功功率
-  // qd: '', // 负荷无功功率
-  // qd: '', // 负荷无功功率
+  id: '',
+  busId: '',
 }) // 表单
 const textMap: { [key: string]: string } = {
   update: '编辑',
   create: '新增',
 } // 表头显示标题
 const btnLoading = ref(false) // 保存按钮的加载中状态
+// 获取所有节点
+const NodeListAll = ref()
+const fetchDataList = () => {
+  electricityNode(props.id).then((res) => {
+    NodeListAll.value = res.data.map(item => item.busId.toString())
+  })
+}
+// 节点编号验证规则
+const validateBusId = (rule: any, value: any, callback: any) => {
+  if (value && dialogStatus.value === 'update') {
+    callback()
+  }
+  // if () {
+  //   callback()
+  // }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
 const rules: FormRules = {
   type: [{ required: true, message: '请选择节点类型', trigger: ['blur', 'change'] }],
+  busId: [{ required: true, message: '节点编号重复或为空', trigger: 'blur', validator: validateBusId }],
   gs: [{ required: true, message: '节点并联电导', trigger: ['blur', 'change'] }],
   bs: [{ required: true, message: '节点并联电纳', trigger: ['blur', 'change'] }],
   area: [{ required: true, message: '母线断面号', trigger: ['blur', 'change'] }],
@@ -47,14 +72,6 @@
   pd: [{ required: true, message: '负荷有功功率', trigger: ['blur', 'change'] }],
   qd: [{ required: true, message: '负荷无功功率', trigger: ['blur', 'change'] }],
 } // 前端校验规则
-// 获取用户列表
-const userList = ref<any[]>([])
-const fetchUserList = () => {
-  getUserList({ limit: 9999, offset: 1 }).then((res) => {
-    userList.value = res.data.rows
-  })
-}
-fetchUserList()
 // 重置表单
 const resetForm = () => {
   areaForm.value = {
@@ -69,9 +86,20 @@
     vmin: '', // 节点最小电压
     pd: '', // 负荷有功功率
     qd: '', // 负荷无功功率
+    id: '',
+    busId: '',
   }
 }
-const deviceTypeList = ref([])
+const nodeTypeList = ref([])
+// 获取设备类型列表
+const fetchNodeType = () => {
+  getDictByCode('node_type').then((res) => {
+    nodeTypeList.value = res.data
+  })
+}
+fetchNodeType()
+
+fetchDataList()
 // 初始化对话框
 const initDialog = (dialogStatusValue: string, row: any) => {
   dialogStatus.value = dialogStatusValue
@@ -86,6 +114,8 @@
   }
   else if (dialogStatus.value === 'update') { // 如果是修改，将row中数据填写到输入框中
     areaForm.value = row
+    areaForm.value.type = row.type.toString()
+    console.log(areaForm.value)
     isEditMode.value = true
   }
 }
@@ -144,6 +174,7 @@
 
 // 保存数据
 const saveData = () => {
+  console.log(dialogStatus.value)
   if (dialogStatus.value === 'update') {
     updateData()
   }
@@ -154,46 +185,30 @@
 const cancel = () => {
   dialogFormVisible.value = false
 }
-const fileRef = ref() // 文件上传input
-const onFileChange = (event: any) => {
-  // 原生上传
-  // console.log(event.target.files)
-  if (event.target.files?.length !== 0) {
-    // 创建formdata对象
-    const fd = new FormData()
-    fd.append('file', event.target.files[0])
-    uploadApi(fd).then((res) => {
-      if (res.code === 200) {
-        dataFormRef.value?.clearValidate('electricityDetail')
-        areaForm.value.electricityDetail = res.data
-        ElMessage.success('上传成功')
-      }
-      else {
-        ElMessage.error(res.message)
-      }
-    })
-  }
-}
-const upload = () => {
-  fileRef.value.click()
-}
 </script>
 
 <template>
   <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="节点类型">
+        <el-form-item label="节点类型:" prop="type">
           <el-select
-            v-model="areaForm.type" class="m-2"
-            :placeholder="dialogStatus === 'create' ? '请选择节点类型' : ''" style="width: 100%;"
+            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-option v-for="item in nodeTypeList" :key="item.id" :label="item.name" :value="item.value" />
           </el-select>
         </el-form-item>
       </el-col>
       <el-row :gutter="20">
         <el-col :span="20">
+          <el-form-item label="节点编号:" prop="busId">
+            <el-input v-model="areaForm.busId" :placeholder="dialogStatus === 'create' ? '请输入节点编号' : ''" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="20">
           <el-form-item label="节点并联电导:" prop="gs">
             <el-input v-model="areaForm.gs" :placeholder="dialogStatus === 'create' ? '请输入节点并联电导' : ''" />
           </el-form-item>
@@ -262,20 +277,6 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <!-- <el-row :gutter="20">
-        <el-col :span="20">
-          <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-col :span="20">
-          <el-form-item label="负荷碳流率:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入负荷碳流率' : ''" />
-          </el-form-item>
-        </el-col>
-      </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 c1eced0..d4245ed 100644
--- a/src/views/data/electricity/components/networkBranch.vue
+++ b/src/views/data/electricity/components/networkBranch.vue
@@ -71,7 +71,7 @@
 const editRef = ref()
 // 新增
 const add = () => {
-  editRef.value.initDialog('add', { })
+  editRef.value.initDialog('create', { })
 }
 // 编辑
 const edit = (row: any) => {
diff --git a/src/views/data/electricity/components/networkBusbar.vue b/src/views/data/electricity/components/networkBusbar.vue
index c1eb19d..98d4cc2 100644
--- a/src/views/data/electricity/components/networkBusbar.vue
+++ b/src/views/data/electricity/components/networkBusbar.vue
@@ -28,8 +28,6 @@
   startTime: '',
   endTime: '',
 })
-// 查询时间段范围
-const TimeRanges = ref()
 const loadingTable = ref(true)
 const columns = ref([
   { text: '节点类型', value: 'type', align: 'center' },
@@ -61,21 +59,14 @@
 const search = () => {
   fetchDataList()
 }
-// 重置搜索条件
-const reset = () => {
-  searchQuery.deviceNo = ''
-  searchQuery.startTime = ''
-  searchQuery.endTime = ''
-  search()
-}
 const editRef = ref()
 // 新增
 const add = () => {
-  editRef.value.initDialog('add', {})
+  editRef.value.initDialog('create', {})
 }
 // 编辑
 const edit = (row: any) => {
-  editRef.value.initDialog('update', {})
+  editRef.value.initDialog('update', row)
 }
 // 删除
 const del = (row: any) => {
@@ -117,24 +108,7 @@
 <template>
   <div>
     <!-- 添加或编辑 -->
-    <edit-list ref="editRef" @refresh="search" />
-    <!-- 筛选条件 -->
-    <!-- <search-area :need-clear="true" @search="search" @clear="reset">
-      <search-item>
-        <el-input v-model="searchQuery.deviceNo" placeholder="设备编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="TimeRanges"
-          type="datetimerange"
-          format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
-          range-separator="至"
-          start-placeholder="上传开始时间"
-          end-placeholder="上传结束时间"
-          clearable
-        />
-      </search-item>
-    </search-area> -->
+    <edit-list :id="id" ref="editRef" @refresh="search" />
     <table-container>
       <template #btns-right>
         <el-button type="primary" @click="bak">

diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 00994da..f48e375 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -222,35 +222,35 @@
         })
         // 添加支路折线文本
         // 创建纯文本标记
-        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])
-          })
-        })
+        // 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) => {
diff --git a/src/views/data/electricity/components/busbarAdd.vue b/src/views/data/electricity/components/busbarAdd.vue
index fa5ccb8..535fa65 100644
--- a/src/views/data/electricity/components/busbarAdd.vue
+++ b/src/views/data/electricity/components/busbarAdd.vue
@@ -6,9 +6,14 @@
 <script lang="ts" setup name="deviceAdd">
 import type { FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import dayjs from 'dayjs'
-import { electricityNodeAdd, electricityNodeUpdate } from '@/api/api/index'
-import { getUserList } from '@/api/system/user'
+import { electricityNode, electricityNodeAdd, electricityNodeUpdate } from '@/api/api/index'
+import { getDictByCode } from '@/api/system/dict'
+const props = defineProps({
+  id: {
+    type: String,
+    required: true,
+  },
+})
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
 const dialogFormVisible = ref(false) // 对话框是否显示
@@ -26,16 +31,36 @@
   vmin: '', // 节点最小电压
   pd: '', // 负荷有功功率
   qd: '', // 负荷无功功率
-  // qd: '', // 负荷无功功率
-  // qd: '', // 负荷无功功率
+  id: '',
+  busId: '',
 }) // 表单
 const textMap: { [key: string]: string } = {
   update: '编辑',
   create: '新增',
 } // 表头显示标题
 const btnLoading = ref(false) // 保存按钮的加载中状态
+// 获取所有节点
+const NodeListAll = ref()
+const fetchDataList = () => {
+  electricityNode(props.id).then((res) => {
+    NodeListAll.value = res.data.map(item => item.busId.toString())
+  })
+}
+// 节点编号验证规则
+const validateBusId = (rule: any, value: any, callback: any) => {
+  if (value && dialogStatus.value === 'update') {
+    callback()
+  }
+  // if () {
+  //   callback()
+  // }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
 const rules: FormRules = {
   type: [{ required: true, message: '请选择节点类型', trigger: ['blur', 'change'] }],
+  busId: [{ required: true, message: '节点编号重复或为空', trigger: 'blur', validator: validateBusId }],
   gs: [{ required: true, message: '节点并联电导', trigger: ['blur', 'change'] }],
   bs: [{ required: true, message: '节点并联电纳', trigger: ['blur', 'change'] }],
   area: [{ required: true, message: '母线断面号', trigger: ['blur', 'change'] }],
@@ -47,14 +72,6 @@
   pd: [{ required: true, message: '负荷有功功率', trigger: ['blur', 'change'] }],
   qd: [{ required: true, message: '负荷无功功率', trigger: ['blur', 'change'] }],
 } // 前端校验规则
-// 获取用户列表
-const userList = ref<any[]>([])
-const fetchUserList = () => {
-  getUserList({ limit: 9999, offset: 1 }).then((res) => {
-    userList.value = res.data.rows
-  })
-}
-fetchUserList()
 // 重置表单
 const resetForm = () => {
   areaForm.value = {
@@ -69,9 +86,20 @@
     vmin: '', // 节点最小电压
     pd: '', // 负荷有功功率
     qd: '', // 负荷无功功率
+    id: '',
+    busId: '',
   }
 }
-const deviceTypeList = ref([])
+const nodeTypeList = ref([])
+// 获取设备类型列表
+const fetchNodeType = () => {
+  getDictByCode('node_type').then((res) => {
+    nodeTypeList.value = res.data
+  })
+}
+fetchNodeType()
+
+fetchDataList()
 // 初始化对话框
 const initDialog = (dialogStatusValue: string, row: any) => {
   dialogStatus.value = dialogStatusValue
@@ -86,6 +114,8 @@
   }
   else if (dialogStatus.value === 'update') { // 如果是修改，将row中数据填写到输入框中
     areaForm.value = row
+    areaForm.value.type = row.type.toString()
+    console.log(areaForm.value)
     isEditMode.value = true
   }
 }
@@ -144,6 +174,7 @@
 
 // 保存数据
 const saveData = () => {
+  console.log(dialogStatus.value)
   if (dialogStatus.value === 'update') {
     updateData()
   }
@@ -154,46 +185,30 @@
 const cancel = () => {
   dialogFormVisible.value = false
 }
-const fileRef = ref() // 文件上传input
-const onFileChange = (event: any) => {
-  // 原生上传
-  // console.log(event.target.files)
-  if (event.target.files?.length !== 0) {
-    // 创建formdata对象
-    const fd = new FormData()
-    fd.append('file', event.target.files[0])
-    uploadApi(fd).then((res) => {
-      if (res.code === 200) {
-        dataFormRef.value?.clearValidate('electricityDetail')
-        areaForm.value.electricityDetail = res.data
-        ElMessage.success('上传成功')
-      }
-      else {
-        ElMessage.error(res.message)
-      }
-    })
-  }
-}
-const upload = () => {
-  fileRef.value.click()
-}
 </script>
 
 <template>
   <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="节点类型">
+        <el-form-item label="节点类型:" prop="type">
           <el-select
-            v-model="areaForm.type" class="m-2"
-            :placeholder="dialogStatus === 'create' ? '请选择节点类型' : ''" style="width: 100%;"
+            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-option v-for="item in nodeTypeList" :key="item.id" :label="item.name" :value="item.value" />
           </el-select>
         </el-form-item>
       </el-col>
       <el-row :gutter="20">
         <el-col :span="20">
+          <el-form-item label="节点编号:" prop="busId">
+            <el-input v-model="areaForm.busId" :placeholder="dialogStatus === 'create' ? '请输入节点编号' : ''" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="20">
           <el-form-item label="节点并联电导:" prop="gs">
             <el-input v-model="areaForm.gs" :placeholder="dialogStatus === 'create' ? '请输入节点并联电导' : ''" />
           </el-form-item>
@@ -262,20 +277,6 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <!-- <el-row :gutter="20">
-        <el-col :span="20">
-          <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-col :span="20">
-          <el-form-item label="负荷碳流率:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入负荷碳流率' : ''" />
-          </el-form-item>
-        </el-col>
-      </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 c1eced0..d4245ed 100644
--- a/src/views/data/electricity/components/networkBranch.vue
+++ b/src/views/data/electricity/components/networkBranch.vue
@@ -71,7 +71,7 @@
 const editRef = ref()
 // 新增
 const add = () => {
-  editRef.value.initDialog('add', { })
+  editRef.value.initDialog('create', { })
 }
 // 编辑
 const edit = (row: any) => {
diff --git a/src/views/data/electricity/components/networkBusbar.vue b/src/views/data/electricity/components/networkBusbar.vue
index c1eb19d..98d4cc2 100644
--- a/src/views/data/electricity/components/networkBusbar.vue
+++ b/src/views/data/electricity/components/networkBusbar.vue
@@ -28,8 +28,6 @@
   startTime: '',
   endTime: '',
 })
-// 查询时间段范围
-const TimeRanges = ref()
 const loadingTable = ref(true)
 const columns = ref([
   { text: '节点类型', value: 'type', align: 'center' },
@@ -61,21 +59,14 @@
 const search = () => {
   fetchDataList()
 }
-// 重置搜索条件
-const reset = () => {
-  searchQuery.deviceNo = ''
-  searchQuery.startTime = ''
-  searchQuery.endTime = ''
-  search()
-}
 const editRef = ref()
 // 新增
 const add = () => {
-  editRef.value.initDialog('add', {})
+  editRef.value.initDialog('create', {})
 }
 // 编辑
 const edit = (row: any) => {
-  editRef.value.initDialog('update', {})
+  editRef.value.initDialog('update', row)
 }
 // 删除
 const del = (row: any) => {
@@ -117,24 +108,7 @@
 <template>
   <div>
     <!-- 添加或编辑 -->
-    <edit-list ref="editRef" @refresh="search" />
-    <!-- 筛选条件 -->
-    <!-- <search-area :need-clear="true" @search="search" @clear="reset">
-      <search-item>
-        <el-input v-model="searchQuery.deviceNo" placeholder="设备编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="TimeRanges"
-          type="datetimerange"
-          format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
-          range-separator="至"
-          start-placeholder="上传开始时间"
-          end-placeholder="上传结束时间"
-          clearable
-        />
-      </search-item>
-    </search-area> -->
+    <edit-list :id="id" ref="editRef" @refresh="search" />
     <table-container>
       <template #btns-right>
         <el-button type="primary" @click="bak">
diff --git a/src/views/data/electricity/network.vue b/src/views/data/electricity/network.vue
index b79c34b..00dc8f8 100644
--- a/src/views/data/electricity/network.vue
+++ b/src/views/data/electricity/network.vue
@@ -103,6 +103,7 @@
   searchQuery.limit = 20
   searchQuery.startTime = ''
   searchQuery.endTime = ''
+  search()
 }
 const detailRef = ref()
 // 查看详情

diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 00994da..f48e375 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -222,35 +222,35 @@
         })
         // 添加支路折线文本
         // 创建纯文本标记
-        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])
-          })
-        })
+        // 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) => {
diff --git a/src/views/data/electricity/components/busbarAdd.vue b/src/views/data/electricity/components/busbarAdd.vue
index fa5ccb8..535fa65 100644
--- a/src/views/data/electricity/components/busbarAdd.vue
+++ b/src/views/data/electricity/components/busbarAdd.vue
@@ -6,9 +6,14 @@
 <script lang="ts" setup name="deviceAdd">
 import type { FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import dayjs from 'dayjs'
-import { electricityNodeAdd, electricityNodeUpdate } from '@/api/api/index'
-import { getUserList } from '@/api/system/user'
+import { electricityNode, electricityNodeAdd, electricityNodeUpdate } from '@/api/api/index'
+import { getDictByCode } from '@/api/system/dict'
+const props = defineProps({
+  id: {
+    type: String,
+    required: true,
+  },
+})
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
 const dialogFormVisible = ref(false) // 对话框是否显示
@@ -26,16 +31,36 @@
   vmin: '', // 节点最小电压
   pd: '', // 负荷有功功率
   qd: '', // 负荷无功功率
-  // qd: '', // 负荷无功功率
-  // qd: '', // 负荷无功功率
+  id: '',
+  busId: '',
 }) // 表单
 const textMap: { [key: string]: string } = {
   update: '编辑',
   create: '新增',
 } // 表头显示标题
 const btnLoading = ref(false) // 保存按钮的加载中状态
+// 获取所有节点
+const NodeListAll = ref()
+const fetchDataList = () => {
+  electricityNode(props.id).then((res) => {
+    NodeListAll.value = res.data.map(item => item.busId.toString())
+  })
+}
+// 节点编号验证规则
+const validateBusId = (rule: any, value: any, callback: any) => {
+  if (value && dialogStatus.value === 'update') {
+    callback()
+  }
+  // if () {
+  //   callback()
+  // }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
 const rules: FormRules = {
   type: [{ required: true, message: '请选择节点类型', trigger: ['blur', 'change'] }],
+  busId: [{ required: true, message: '节点编号重复或为空', trigger: 'blur', validator: validateBusId }],
   gs: [{ required: true, message: '节点并联电导', trigger: ['blur', 'change'] }],
   bs: [{ required: true, message: '节点并联电纳', trigger: ['blur', 'change'] }],
   area: [{ required: true, message: '母线断面号', trigger: ['blur', 'change'] }],
@@ -47,14 +72,6 @@
   pd: [{ required: true, message: '负荷有功功率', trigger: ['blur', 'change'] }],
   qd: [{ required: true, message: '负荷无功功率', trigger: ['blur', 'change'] }],
 } // 前端校验规则
-// 获取用户列表
-const userList = ref<any[]>([])
-const fetchUserList = () => {
-  getUserList({ limit: 9999, offset: 1 }).then((res) => {
-    userList.value = res.data.rows
-  })
-}
-fetchUserList()
 // 重置表单
 const resetForm = () => {
   areaForm.value = {
@@ -69,9 +86,20 @@
     vmin: '', // 节点最小电压
     pd: '', // 负荷有功功率
     qd: '', // 负荷无功功率
+    id: '',
+    busId: '',
   }
 }
-const deviceTypeList = ref([])
+const nodeTypeList = ref([])
+// 获取设备类型列表
+const fetchNodeType = () => {
+  getDictByCode('node_type').then((res) => {
+    nodeTypeList.value = res.data
+  })
+}
+fetchNodeType()
+
+fetchDataList()
 // 初始化对话框
 const initDialog = (dialogStatusValue: string, row: any) => {
   dialogStatus.value = dialogStatusValue
@@ -86,6 +114,8 @@
   }
   else if (dialogStatus.value === 'update') { // 如果是修改，将row中数据填写到输入框中
     areaForm.value = row
+    areaForm.value.type = row.type.toString()
+    console.log(areaForm.value)
     isEditMode.value = true
   }
 }
@@ -144,6 +174,7 @@
 
 // 保存数据
 const saveData = () => {
+  console.log(dialogStatus.value)
   if (dialogStatus.value === 'update') {
     updateData()
   }
@@ -154,46 +185,30 @@
 const cancel = () => {
   dialogFormVisible.value = false
 }
-const fileRef = ref() // 文件上传input
-const onFileChange = (event: any) => {
-  // 原生上传
-  // console.log(event.target.files)
-  if (event.target.files?.length !== 0) {
-    // 创建formdata对象
-    const fd = new FormData()
-    fd.append('file', event.target.files[0])
-    uploadApi(fd).then((res) => {
-      if (res.code === 200) {
-        dataFormRef.value?.clearValidate('electricityDetail')
-        areaForm.value.electricityDetail = res.data
-        ElMessage.success('上传成功')
-      }
-      else {
-        ElMessage.error(res.message)
-      }
-    })
-  }
-}
-const upload = () => {
-  fileRef.value.click()
-}
 </script>
 
 <template>
   <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="节点类型">
+        <el-form-item label="节点类型:" prop="type">
           <el-select
-            v-model="areaForm.type" class="m-2"
-            :placeholder="dialogStatus === 'create' ? '请选择节点类型' : ''" style="width: 100%;"
+            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-option v-for="item in nodeTypeList" :key="item.id" :label="item.name" :value="item.value" />
           </el-select>
         </el-form-item>
       </el-col>
       <el-row :gutter="20">
         <el-col :span="20">
+          <el-form-item label="节点编号:" prop="busId">
+            <el-input v-model="areaForm.busId" :placeholder="dialogStatus === 'create' ? '请输入节点编号' : ''" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="20">
           <el-form-item label="节点并联电导:" prop="gs">
             <el-input v-model="areaForm.gs" :placeholder="dialogStatus === 'create' ? '请输入节点并联电导' : ''" />
           </el-form-item>
@@ -262,20 +277,6 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <!-- <el-row :gutter="20">
-        <el-col :span="20">
-          <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-col :span="20">
-          <el-form-item label="负荷碳流率:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '请输入负荷碳流率' : ''" />
-          </el-form-item>
-        </el-col>
-      </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 c1eced0..d4245ed 100644
--- a/src/views/data/electricity/components/networkBranch.vue
+++ b/src/views/data/electricity/components/networkBranch.vue
@@ -71,7 +71,7 @@
 const editRef = ref()
 // 新增
 const add = () => {
-  editRef.value.initDialog('add', { })
+  editRef.value.initDialog('create', { })
 }
 // 编辑
 const edit = (row: any) => {
diff --git a/src/views/data/electricity/components/networkBusbar.vue b/src/views/data/electricity/components/networkBusbar.vue
index c1eb19d..98d4cc2 100644
--- a/src/views/data/electricity/components/networkBusbar.vue
+++ b/src/views/data/electricity/components/networkBusbar.vue
@@ -28,8 +28,6 @@
   startTime: '',
   endTime: '',
 })
-// 查询时间段范围
-const TimeRanges = ref()
 const loadingTable = ref(true)
 const columns = ref([
   { text: '节点类型', value: 'type', align: 'center' },
@@ -61,21 +59,14 @@
 const search = () => {
   fetchDataList()
 }
-// 重置搜索条件
-const reset = () => {
-  searchQuery.deviceNo = ''
-  searchQuery.startTime = ''
-  searchQuery.endTime = ''
-  search()
-}
 const editRef = ref()
 // 新增
 const add = () => {
-  editRef.value.initDialog('add', {})
+  editRef.value.initDialog('create', {})
 }
 // 编辑
 const edit = (row: any) => {
-  editRef.value.initDialog('update', {})
+  editRef.value.initDialog('update', row)
 }
 // 删除
 const del = (row: any) => {
@@ -117,24 +108,7 @@
 <template>
   <div>
     <!-- 添加或编辑 -->
-    <edit-list ref="editRef" @refresh="search" />
-    <!-- 筛选条件 -->
-    <!-- <search-area :need-clear="true" @search="search" @clear="reset">
-      <search-item>
-        <el-input v-model="searchQuery.deviceNo" placeholder="设备编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="TimeRanges"
-          type="datetimerange"
-          format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
-          range-separator="至"
-          start-placeholder="上传开始时间"
-          end-placeholder="上传结束时间"
-          clearable
-        />
-      </search-item>
-    </search-area> -->
+    <edit-list :id="id" ref="editRef" @refresh="search" />
     <table-container>
       <template #btns-right>
         <el-button type="primary" @click="bak">
diff --git a/src/views/data/electricity/network.vue b/src/views/data/electricity/network.vue
index b79c34b..00dc8f8 100644
--- a/src/views/data/electricity/network.vue
+++ b/src/views/data/electricity/network.vue
@@ -103,6 +103,7 @@
   searchQuery.limit = 20
   searchQuery.startTime = ''
   searchQuery.endTime = ''
+  search()
 }
 const detailRef = ref()
 // 查看详情
diff --git a/src/views/data/electricity/networkAdd.vue b/src/views/data/electricity/networkAdd.vue
index d3b1a76..f35cade 100644
--- a/src/views/data/electricity/networkAdd.vue
+++ b/src/views/data/electricity/networkAdd.vue
@@ -32,17 +32,6 @@
   loadNum: [{ required: true, message: '请输入系统负荷数', trigger: ['blur', 'change'] }],
   branchNum: [{ required: true, message: '请输入节点之间支路数', trigger: ['blur', 'change'] }],
 } // 前端校验规则
-// 获取用户列表
-const userList = ref<any[]>([])
-const fetchUserList = () => {
-  getUserList({ limit: 9999, offset: 1 }).then((res) => {
-    userList.value = res.data.rows
-  })
-}
-// watch(() => areaForm.value.uploader, (newVal) => {
-//   areaForm.value.uploaderName = userList.value.filter(item => item.id === newVal)[0].name
-// })
-fetchUserList()
 // 重置表单
 const resetForm = () => {
   areaForm.value = {