diff --git a/Script/FileData.py b/Script/FileData.py
index 4c2c8dc..ef6cbd3 100644
--- a/Script/FileData.py
+++ b/Script/FileData.py
@@ -119,7 +119,12 @@ class MergeReconfigFile:  # 合并重构用文件
         indGround = 1
         addNum = 1
         # offsetNodeNum = {}  #记录每个一个文件在新文件里节点的偏移量
+        count=1
         for f in fileList:
+            # if count>10:
+            #     print(f)
+            #     break
+            count+=1
             ipsodata = iPsoData(f)
             #节点数   可重构支路数
             self.__basicInfo[0][0] += len(ipsodata.GetNodePower())
@@ -156,7 +161,7 @@ class MergeReconfigFile:  # 合并重构用文件
             addNum += len(ipsodata.GetNodePower())
         #用一个总的头节点把之前所有线路的头节点连接起来
         for b in self.__balanceNodeOffset:
-            self.__mergedIpsoLine.append ([indLine, 1 , b, 0.01, 0.01, 0, 0])
+            self.__mergedIpsoLine.append ([indLine, 1 , b, 0.0001, 0.01, 0, 0])
             self.__basicInfo[0][1]+=1
             indLine+=1
         self.__mergedIpsoLoad.insert(0,[1, n[1], 1,n[3], 0, 0, 0, 0, 0, 0])
@@ -191,7 +196,7 @@ class MergeReconfigFile:  # 合并重构用文件
             f.write('0\n')
             f.write('0\n')
             for g in self.__mergedIpsoGround:
-                f.write('%d %d %f %f\n' % (g[0], g[1], b[2],b[3]))
+                f.write('%d %d %f %f\n' % (g[0], g[1], g[2],g[3]))
             f.write('0\n')
             f.write('0\n')
             f.write('0\n')
diff --git a/testHasttable/cimexporter.cpp b/testHasttable/cimexporter.cpp
index 79b7960..7059fe9 100644
--- a/testHasttable/cimexporter.cpp
+++ b/testHasttable/cimexporter.cpp
@@ -286,7 +286,7 @@ void CIMExporter::exportTo(const QString& path,const QString &rootID)
             ite++)
         {
             //保存到节点注入功率中
-            nodePQ.push_back(CIMExporter::NodePQ(ite->toNum,-ite->dg->capacity,-ite->dg->capacity) );
+            nodePQ.push_back(CIMExporter::NodePQ(ite->toNum,-ite->dg->capacity/100000,-ite->dg->capacity/100000) );
 //            writer<<ite->fromNum<<"\t";
 //            writer<<ite->toNum<<"\t";
 //            writer<<ite->dg->capacity<<"\r\n";
diff --git a/testHasttable/element/dg.cpp b/testHasttable/element/dg.cpp
index 6b01639..501f51b 100644
--- a/testHasttable/element/dg.cpp
+++ b/testHasttable/element/dg.cpp
@@ -15,7 +15,7 @@ void DG::extract()
 {
     //单位阻抗
     double r0=0;
-    double x0=0.001;
+    double x0=0.0001;
     double g0=0;
     double b0=0;
     this->r=r0;
diff --git a/testHasttable/element/line.cpp b/testHasttable/element/line.cpp
index b07a849..fced7c6 100644
--- a/testHasttable/element/line.cpp
+++ b/testHasttable/element/line.cpp
@@ -24,10 +24,10 @@ void Line::extract()
 //        std::cout<<"line length zeros "<<ac->getID().toStdString()<<std::endl;
 //    }
     //单位阻抗
-    double rn0=0.0958;//单位电阻有名值
+    double rn0=0.0958;//单位电阻有名值 欧姆/千米
     double xn0=0.0881;//单位电抗有名值
-    double r0=rn0/(10.5*10.5/1000);//电压10.5kV,基准容量1MVA
-    double x0=xn0/(10.5*10.5/1000);
+    double r0=rn0/(10.5*10.5/1);//电压10.5kV,基准容量1MVA
+    double x0=xn0/(10.5*10.5/1);
     double g0=0;
     double b0=0;
     this->r=r0*length/1000;//length的单位是米