完善了GS,WD的文件导出，所有的文件导出路径，都是选择计算的文件所在的文件路径。

.gitignore

@@ -1,3 +1,5 @@
 __pycache__/
 .git/
-.pyc
+.pyc
+.idea/
+*.xml

Back/GC/GCExport.py

@@ -35,6 +35,9 @@ def main_function(ui, file_path, utf_en, db_path):
                 conn.close()
                 return
 
+        # 删除 TableName 列
+        if 'TableName' in df.columns:
+            df.drop(columns=['TableName'], inplace=True)
         # new HDiff 保留小数点后6位
         if 'New_HDiff' in df.columns:
             df['New_HDiff'] = df['New_HDiff'].round(6)
@@ -50,7 +53,6 @@ def main_function(ui, file_path, utf_en, db_path):
 
         # 重命名指定的列
         column_mapping = {
-            'TableName': '文件名',
             'New_ID': '序号',
             'New_ResultName': '结果期数',
             'New_SPName': '起点',
@@ -101,13 +103,15 @@ def main_function(ui, file_path, utf_en, db_path):
             if cell_value == '变形':
                 for col in range(1, ws.max_column + 1):
                     ws.cell(row=row, column=col).font = red_font
-
+        # 设置列宽
+        ws.column_dimensions['E'].width = 12
+        ws.column_dimensions['F'].width = 12
         # 保存 Excel 文件
         excel_filename = f"水准测段高差计算成果表{time.strftime('%Y%m%d_%H%M%S')}.xlsx"
         excel_filepath = os.path.join(export_folder, excel_filename)
         wb.save(excel_filepath)
 
-        QMessageBox.information(ui, '成功', f'数据库已成功导出到 {excel_filepath}')
+        QMessageBox.information(ui, '成功', f'成果文件已成功导出到 {export_folder}')
     except Exception as e:
         QMessageBox.critical(ui, '错误', f'导出过程中发生错误: {str(e)}')
     finally:

Back/GS/GSExport.py

@@ -1,14 +1,17 @@
 import openpyxl
 import sqlite3
 import os
+import time
 from openpyxl.styles import Alignment
+from PySide6.QtWidgets import QMessageBox
+
 
 def Arrange_Data1(list1):
-    #最终return的
+    # 最终return的
     list2 = []
     for data1 in list1:
-        #点名
-        #存每一行的数据
+        # 点名
+        # 存每一行的数据
         resultlist = []
         pn = data1[0].decode('utf-8')
         resultlist.append(pn)
@@ -17,10 +20,10 @@ def Arrange_Data1(list1):
         resultlist.append(data1[3])
         resultlist.append(data1[4])
         resultlist.append(data1[5])
-        #判定
+        # 判定
         an1 = data1[6].decode('utf-8')
         resultlist.append(an1)
-        #两个结果名字（旧新）
+        # 两个结果名字（旧新）
         name1 = data1[7].decode('utf-8')
         resultlist.append(name1)
         name2 = data1[8].decode('utf-8')
@@ -28,13 +31,14 @@ def Arrange_Data1(list1):
         list2.append(resultlist)
     return list2
 
-#复测成果表
+
+# 复测成果表
 def Arrange_Data2(list1):
-    #最终return的
+    # 最终return的
     list2 = []
     for data1 in list1:
-        #点名
-        #存每一行的数据
+        # 点名
+        # 存每一行的数据
         resultlist = []
         pn = data1[0].decode('utf-8')
         resultlist.append(pn)
@@ -45,21 +49,22 @@ def Arrange_Data2(list1):
         resultlist.append(data1[5])
         resultlist.append(data1[6])
         resultlist.append(data1[7])
-        #判定
+        # 判定
         an1 = data1[8].decode('utf-8')
         resultlist.append(an1)
-        #两个结果名字（旧新）
+        # 两个结果名字（旧新）
         name1 = data1[9].decode('utf-8')
         resultlist.append(name1)
         name2 = data1[10].decode('utf-8')
         resultlist.append(name2)
         list2.append(resultlist)
-    
+
     return list2
 
-def openpyxl_write(outpath,dbpath,filename):
+
+def openpyxl_write(file_name, dbpath, filename):
     utf_en = filename.encode('utf-8')
-    #新建对应的excel
+    # 新建对应的excel
     wb = openpyxl.Workbook()
     ws2 = wb.create_sheet('复测成果表')
     ws1 = wb.create_sheet('复测基准归算表')
@@ -67,15 +72,15 @@ def openpyxl_write(outpath,dbpath,filename):
     ws5 = wb['Sheet']
     wb.remove(ws5)
 
-    #w1部分(基准归算表)
-    #提取数据
+    # w1部分(基准归算表)
+    # 提取数据
     db = sqlite3.connect(dbpath)
     cursor1 = db.cursor()
     sqlstr11 = 'select PointName,Cal_X,Cal_Y,Last_CalX,Last_CalY,Last_CalP,Dis_Ass,Last_ResultName,New_ResultName from GS_Result_Point WHERE TableName = ?'
-    cursor1.execute(sqlstr11,(utf_en,))
-    #获取结果集
+    cursor1.execute(sqlstr11, (utf_en,))
+    # 获取结果集
     result1 = cursor1.fetchall()
-    #整理数据
+    # 整理数据
     plist1 = Arrange_Data1(result1)
     ws1.column_dimensions['A'].width = 5
     ws1.column_dimensions['B'].width = 15
@@ -97,13 +102,13 @@ def openpyxl_write(outpath,dbpath,filename):
                     start_column=4, end_column=6)
     ws1.cell(2, 4).value = plist1[0][7] + '-归算成果(mm)'
     ws_area = ws1["A1:H3"]
-    alignment_center = Alignment(horizontal='center', vertical='center')# 指定区域单元格居中
+    alignment_center = Alignment(horizontal='center', vertical='center')  # 指定区域单元格居中
     for i in ws_area:
         for j in i:
             j.alignment = alignment_center
     alignment_right = Alignment(horizontal='right', vertical='center')
     ws1.merge_cells(start_row=2, end_row=3,
-        start_column=7, end_column=7)
+                    start_column=7, end_column=7)
     ws1.cell(2, 7).value = '位移判定'
     ws1.cell(2, 7).alignment = Alignment(wrap_text=True)
     ws1.cell(3, 2).value = 'X(mm)'
@@ -113,25 +118,25 @@ def openpyxl_write(outpath,dbpath,filename):
     ws1.cell(3, 6).value = '△P'
     row1 = 4
     for data1 in plist1:
-        ws1.cell(row1,1).value = data1[0]
-        ws1.cell(row1,2).value = round(data1[1],4)
-        ws1.cell(row1,3).value = round(data1[2],4)
-        ws1.cell(row1,4).value = round(data1[3],1)
-        ws1.cell(row1,5).value = round(data1[4],1)
-        ws1.cell(row1,6).value = round(data1[5],1)
+        ws1.cell(row1, 1).value = data1[0]
+        ws1.cell(row1, 2).value = round(data1[1], 4)
+        ws1.cell(row1, 3).value = round(data1[2], 4)
+        ws1.cell(row1, 4).value = round(data1[3], 1)
+        ws1.cell(row1, 5).value = round(data1[4], 1)
+        ws1.cell(row1, 6).value = round(data1[5], 1)
         if data1[6] == '稳定':
-            ws1.cell(row1,7).value = ''
+            ws1.cell(row1, 7).value = ''
         else:
-            ws1.cell(row1,7).value = data1[6]
+            ws1.cell(row1, 7).value = data1[6]
         row1 = row1 + 1
 
-    #ws2部分(复测成果表)
-    #提取数据
+    # ws2部分(复测成果表)
+    # 提取数据
     sqlstr1 = 'select PointName,Last_X,Last_Y,Result_X,Result_Y,Last_ResultX,Last_ResultY,Last_ResultP,Dis_Ass,Last_ResultName,New_ResultName from GS_Result_Point WHERE TableName = ?'
-    cursor1.execute(sqlstr1,(utf_en,))
-    #获取结果集
+    cursor1.execute(sqlstr1, (utf_en,))
+    # 获取结果集
     result2 = cursor1.fetchall()
-    #整理数据
+    # 整理数据
     plist2 = Arrange_Data2(result2)
     ws2.column_dimensions['A'].width = 5
     ws2.column_dimensions['B'].width = 15
@@ -149,7 +154,7 @@ def openpyxl_write(outpath,dbpath,filename):
                     start_column=4, end_column=9)
     ws2.cell(1, 4).value = '本期成果'
     ws_area = ws2["A1:I2"]
-    alignment_center = Alignment(horizontal='center', vertical='center')# 指定区域单元格居中
+    alignment_center = Alignment(horizontal='center', vertical='center')  # 指定区域单元格居中
     for i in ws_area:
         for j in i:
             j.alignment = alignment_center
@@ -180,59 +185,63 @@ def openpyxl_write(outpath,dbpath,filename):
     ws2.cell(3, 8).value = '△XY'
     row2 = 4
     for data2 in plist2:
-        ws2.cell(row2,1).value = data2[0]
-        ws2.cell(row2,2).value = round(data2[1],4)
-        ws2.cell(row2,3).value = round(data2[2],4)
-        ws2.cell(row2,4).value = round(data2[3],4)
-        ws2.cell(row2,5).value = round(data2[4],4)
-        ws2.cell(row2,6).value = round(data2[5],1)
-        ws2.cell(row2,7).value = round(data2[6],1)
-        ws2.cell(row2,8).value = round(data2[7],1)
+        ws2.cell(row2, 1).value = data2[0]
+        ws2.cell(row2, 2).value = round(data2[1], 4)
+        ws2.cell(row2, 3).value = round(data2[2], 4)
+        ws2.cell(row2, 4).value = round(data2[3], 4)
+        ws2.cell(row2, 5).value = round(data2[4], 4)
+        ws2.cell(row2, 6).value = round(data2[5], 1)
+        ws2.cell(row2, 7).value = round(data2[6], 1)
+        ws2.cell(row2, 8).value = round(data2[7], 1)
         if data2[8] == '稳定':
-            ws2.cell(row2,9).value = ''
+            ws2.cell(row2, 9).value = ''
         else:
-            ws2.cell(row2,9).value = data2[8]
+            ws2.cell(row2, 9).value = data2[8]
         row2 = row2 + 1
-    
-    #ws3部分(公式)
-    #提取数据
+
+    # ws3部分(公式)
+    # 提取数据
     sqlstr2 = 'select Last_ResultName,New_ResultName,Formula_X1,Formula_X2,Formula_X3,Formula_Y1,Formula_Y2,Formula_Y3 from GS_Trans_Param WHERE TableName = ?'
-    cursor1.execute(sqlstr2,(utf_en,))
-    #获取结果集
-    result3 = cursor1.fetchall() 
+    cursor1.execute(sqlstr2, (utf_en,))
+    # 获取结果集
+    result3 = cursor1.fetchall()
     newname = result3[0][1].decode('utf-8')
     lastname = result3[0][0].decode('utf-8')
     ws3.column_dimensions['A'].width = 75
     ws_area = ws3["A1:A5"]
-    alignment_center = Alignment(horizontal='left', vertical='center')# 指定区域单元格居中
+    alignment_center = Alignment(horizontal='left', vertical='center')  # 指定区域单元格居中
     for i in ws_area:
         for j in i:
             j.alignment = alignment_center
     str1 = newname + '--' + lastname + '已知系统转换公式:'
     ws3.cell(1, 1).value = str1
-    str2 = 'X=(' + str(round(result3[0][2],14)) + ')·x+(' + str(round(result3[0][3],14)) + ')·y+(' + str(round(result3[0][4],11)) + ')'
+    str2 = 'X=(' + str(round(result3[0][2], 14)) + ')·x+(' + str(round(result3[0][3], 14)) + ')·y+(' + str(
+        round(result3[0][4], 11)) + ')'
     ws3.cell(2, 1).value = str2
-    str3 = 'Y=(' + str(round(result3[0][5],14)) + ')·x+(' + str(round(result3[0][6],14)) + ')·y+(' + str(round(result3[0][7],11)) + ')'
+    str3 = 'Y=(' + str(round(result3[0][5], 14)) + ')·x+(' + str(round(result3[0][6], 14)) + ')·y+(' + str(
+        round(result3[0][7], 11)) + ')'
     ws3.cell(3, 1).value = str3
     str4 = '式中:x、y为' + newname
     ws3.cell(4, 1).value = str4
     str5 = '     X、Y为' + lastname + '已知系统的' + newname + '归算坐标'
     ws3.cell(5, 1).value = str5
-    #保存
-    wb.save(outpath)
-    
+    # 保存
+    # wb.save(outpath)
+    # 保存 Excel 文件
+    excel_filename = f"控制网复测平面基准计算成果表{time.strftime('%Y%m%d_%H%M%S')}.xlsx"
+    excel_filepath = os.path.join(file_name, excel_filename)
+    wb.save(excel_filepath)
+
 
 # 主函数 写入excel文件
-def main_function(outpath,dbpath,file_path):
-    dbpath = r"D:\4work_now\20240819GS\ControlNetwork\ControlNetwork\UI\SQL\DataBase.db"
-    outpath = r'D:\4work_now\20240819GS\JPG\GS成果表.xlsx'
-    file_path = r'D:\4work_now\20240819GS\二滩_20240816.xls'
-    file_name = os.path.basename(file_path)
-    # outpath为包含输出excel名字的全路径
-    openpyxl_write(outpath,dbpath,file_name)
-# dbpath = r"D:\4work_now\20240819GS\ControlNetwork\ControlNetwork\UI\SQL\DataBase.db"
-# outpath = r'D:\4work_now\20240819GS\JPG\GS成果表.xlsx'
-# file_path = r'D:\4work_now\20240819GS\二滩_20240816.xls'
-# file_name = os.path.basename(file_path)
-# # outpath为包含输出excel名字的全路径
-# openpyxl_write(outpath,dbpath,file_name)
+def main_function(ui, file_path, dbpath, excelname):
+    # dbpath = r"D:\4work_now\20240819GS\ControlNetwork\ControlNetwork\UI\SQL\DataBase.db"
+    # outpath = r'D:\4work_now\20240819GS\JPG\GS成果表.xlsx'
+    # file_path = r'D:\4work_now\20240819GS\二滩_20240816.xls'
+    file_name = os.path.dirname(file_path)
+    try:
+        openpyxl_write(file_name, dbpath, excelname)
+        QMessageBox.information(ui, '成功', f'成果文件已成功导出到 {file_name}')
+    except Exception as e:
+        QMessageBox.critical(ui, '错误', f'导出过程中发生错误: {str(e)}')
+

Back/WD/WDExport.py

@@ -1,14 +1,17 @@
 import openpyxl
 import sqlite3
 import os
+import time
 from openpyxl.styles import Alignment
+from PySide6.QtWidgets import QMessageBox
+
 
 def Arrange_Data1(list1):
-    #最终return的
+    # 最终return的
     list2 = []
     for data1 in list1:
-        #点名
-        #存每一行的数据
+        # 点名
+        # 存每一行的数据
         resultlist = []
         pn = data1[0].decode('utf-8')
         resultlist.append(pn)
@@ -23,16 +26,16 @@ def Arrange_Data1(list1):
         resultlist.append(data1[9])
         resultlist.append(data1[10])
         resultlist.append(data1[11])
-        #判定1
+        # 判定1
         an1 = data1[12].decode('utf-8')
         resultlist.append(an1)
         resultlist.append(data1[13])
         resultlist.append(data1[14])
         resultlist.append(data1[15])
-        #判定2
+        # 判定2
         an2 = data1[16].decode('utf-8')
         resultlist.append(an2)
-        #3个名字（首，上，新）
+        # 3个名字（首，上，新）
         name1 = data1[17].decode('utf-8')
         resultlist.append(name1)
         name2 = data1[18].decode('utf-8')
@@ -40,28 +43,29 @@ def Arrange_Data1(list1):
         name3 = data1[19].decode('utf-8')
         resultlist.append(name3)
         list2.append(resultlist)
-    
+
     return list2
 
-def openpyxl_write(outpath,dbpath,filename):
+
+def openpyxl_write(file_name, dbpath, filename):
     utf_en = filename.encode('utf-8')
-    #新建对应的excel
+    # 新建对应的excel
     wb = openpyxl.Workbook()
     ws1 = wb.create_sheet('稳定性分析成果表')
     ws2 = wb.create_sheet('改算模型')
     ws3 = wb['Sheet']
     wb.remove(ws3)
 
-    #ws1部分（成果表）
-    #提取数据
+    # ws1部分（成果表）
+    # 提取数据
     db1 = sqlite3.connect(dbpath)
-    #获取游标
+    # 获取游标
     cursor1 = db1.cursor()
     sqlstr1 = 'select PointName,First_X,First_Y,Last_X,Last_Y,Last_Wight,Result_X,Result_Y,New_Wight,New_FirstX,New_FirstY,New_FirstP,NFDis_Ass,New_LastX,New_LastY,New_LastP,NLDis_Ass,First_ResultName,Last_ResultName,New_ResultName from WD_Result_Point WHERE TableName = ?'
-    cursor1.execute(sqlstr1,(utf_en,))
-    #获取结果集
+    cursor1.execute(sqlstr1, (utf_en,))
+    # 获取结果集
     result1 = cursor1.fetchall()
-    #整理数据
+    # 整理数据
     plist1 = Arrange_Data1(result1)
     ws1.column_dimensions['B'].width = 15
     ws1.column_dimensions['C'].width = 15
@@ -83,7 +87,7 @@ def openpyxl_write(outpath,dbpath,filename):
                     start_column=1, end_column=17)
     ws1.cell(1, 1).value = '稳定性分析成果表'
     ws_area = ws1["A1:Q2"]
-    alignment_center = Alignment(horizontal='center', vertical='center')# 指定区域单元格居中
+    alignment_center = Alignment(horizontal='center', vertical='center')  # 指定区域单元格居中
     for i in ws_area:
         for j in i:
             j.alignment = alignment_center
@@ -132,68 +136,74 @@ def openpyxl_write(outpath,dbpath,filename):
 
     row1 = 4
     for data1 in plist1:
-        ws1.cell(row1,1).value = data1[0]
-        ws1.cell(row1,2).value = round(data1[1],4)
-        ws1.cell(row1,3).value = round(data1[2],4)
-        ws1.cell(row1,4).value = round(data1[3],4)
-        ws1.cell(row1,5).value = round(data1[4],4)
-        ws1.cell(row1,6).value = int(data1[5])
-        ws1.cell(row1,7).value = round(data1[6],4)
-        ws1.cell(row1,8).value = round(data1[7],4)
-        ws1.cell(row1,9).value = int(data1[8])
-        ws1.cell(row1,10).value = round(data1[9],1)
-        ws1.cell(row1,11).value = round(data1[10],1)
-        ws1.cell(row1,12).value = round(data1[11],1)
+        ws1.cell(row1, 1).value = data1[0]
+        ws1.cell(row1, 2).value = round(data1[1], 4)
+        ws1.cell(row1, 3).value = round(data1[2], 4)
+        ws1.cell(row1, 4).value = round(data1[3], 4)
+        ws1.cell(row1, 5).value = round(data1[4], 4)
+        ws1.cell(row1, 6).value = int(data1[5])
+        ws1.cell(row1, 7).value = round(data1[6], 4)
+        ws1.cell(row1, 8).value = round(data1[7], 4)
+        ws1.cell(row1, 9).value = int(data1[8])
+        ws1.cell(row1, 10).value = round(data1[9], 1)
+        ws1.cell(row1, 11).value = round(data1[10], 1)
+        ws1.cell(row1, 12).value = round(data1[11], 1)
         if data1[12] == '稳定':
-            ws1.cell(row1,13).value = ''
+            ws1.cell(row1, 13).value = ''
         else:
-            ws1.cell(row1,13).value = data1[12]
-        ws1.cell(row1,14).value = round(data1[13],1)
-        ws1.cell(row1,15).value = round(data1[14],1)
-        ws1.cell(row1,16).value = round(data1[15],1)
+            ws1.cell(row1, 13).value = data1[12]
+        ws1.cell(row1, 14).value = round(data1[13], 1)
+        ws1.cell(row1, 15).value = round(data1[14], 1)
+        ws1.cell(row1, 16).value = round(data1[15], 1)
         if data1[16] == '稳定':
-            ws1.cell(row1,17).value = ''
+            ws1.cell(row1, 17).value = ''
         else:
-            ws1.cell(row1,17).value = data1[16]
+            ws1.cell(row1, 17).value = data1[16]
         row1 = row1 + 1
 
-    #ws2部分（公式）
-    #提取数据
+    # ws2部分（公式）
+    # 提取数据
     sqlstr2 = 'select Last_ResultName,New_ResultName,Formula_X1,Formula_X2,Formula_X3,Formula_Y1,Formula_Y2,Formula_Y3 from WD_Result_Param WHERE TableName = ?'
-    cursor1.execute(sqlstr2,(utf_en,))
-    #获取结果集
-    result3 = cursor1.fetchall() 
+    cursor1.execute(sqlstr2, (utf_en,))
+    # 获取结果集
+    result3 = cursor1.fetchall()
     newname = result3[0][1].decode('utf-8')
     lastname = result3[0][0].decode('utf-8')
     ws2.column_dimensions['A'].width = 75
     ws_area = ws2["A1:A5"]
-    alignment_center = Alignment(horizontal='left', vertical='center')# 指定区域单元格居中
+    alignment_center = Alignment(horizontal='left', vertical='center')  # 指定区域单元格居中
     for i in ws_area:
         for j in i:
             j.alignment = alignment_center
     str1 = newname + '--' + lastname + '已知系统转换公式:'
     ws2.cell(1, 1).value = str1
-    str2 = 'X=(' + str(round(result3[0][2],14)) + ')·x+(' + str(round(result3[0][3],14)) + ')·y+(' + str(round(result3[0][4],11)) + ')'
+    str2 = 'X=(' + str(round(result3[0][2], 14)) + ')·x+(' + str(round(result3[0][3], 14)) + ')·y+(' + str(
+        round(result3[0][4], 11)) + ')'
     ws2.cell(2, 1).value = str2
-    str3 = 'Y=(' + str(round(result3[0][5],14)) + ')·x+(' + str(round(result3[0][6],14)) + ')·y+(' + str(round(result3[0][7],11)) + ')'
+    str3 = 'Y=(' + str(round(result3[0][5], 14)) + ')·x+(' + str(round(result3[0][6], 14)) + ')·y+(' + str(
+        round(result3[0][7], 11)) + ')'
     ws2.cell(3, 1).value = str3
     str4 = '式中:x、y为' + newname
     ws2.cell(4, 1).value = str4
     str5 = '     X、Y为' + lastname + '已知系统的' + newname + '归算坐标'
     ws2.cell(5, 1).value = str5
-    #保存
-    wb.save(outpath)
+    # 保存 Excel 文件
+    excel_filename = f"平面控制网稳定性计算成果表{time.strftime('%Y%m%d_%H%M%S')}.xlsx"
+    excel_filepath = os.path.join(file_name, excel_filename)
+    wb.save(excel_filepath)
 
 
 # 主函数 写入excel文件
-def main_function(outpath,dbpath,file_path):
-    dbpath = r"D:\4work_now\20240819GS\ControlNetwork\ControlNetwork\UI\SQL\DataBase.db"
-    outpath = r'D:\4work_now\20240819GS\JPG\WD成果表.xlsx'
-    file_path = r'D:\4work_now\20240819GS\test_wd.xls'
-    file_name = os.path.basename(file_path)
-    # outpath为包含输出excel名字的全路径
-    openpyxl_write(outpath,dbpath,file_name)
-
+def main_function(ui, file_path, dbpath, excelname):
+    # dbpath = r"D:\4work_now\20240819GS\ControlNetwork\ControlNetwork\UI\SQL\DataBase.db"
+    # outpath = r'D:\4work_now\20240819GS\JPG\WD成果表.xlsx'
+    # file_path = r'D:\4work_now\20240819GS\test_wd.xls'
+    file_name = os.path.dirname(file_path)
+    try:
+        openpyxl_write(file_name, dbpath, excelname)
+        QMessageBox.information(ui, '成功', f'成果文件已成功导出到 {file_name}')
+    except Exception as e:
+        QMessageBox.critical(ui, '错误', f'导出过程中发生错误: {str(e)}')
 
 # dbpath = r"D:\4work_now\20240819GS\ControlNetwork\ControlNetwork\UI\SQL\DataBase.db"
 # # dbpath = r"D:/Code/ControlNetwork/UI/SQL/DataBase.db"
@@ -201,4 +211,4 @@ def main_function(outpath,dbpath,file_path):
 # file_path = r'D:\4work_now\20240819GS\test_wd.xls'
 # file_name = os.path.basename(file_path)
 # # outpath为包含输出excel名字的全路径
-# openpyxl_write(outpath,dbpath,file_name)
+# openpyxl_write(outpath,dbpath,file_name)

Front/modules/ui_functions.py

@@ -356,17 +356,16 @@ class UIFunctions(MainWindow):
         if current_text == "水准测段高差稳定计算":
             GCExport.main_function(self, file_path, utf_en, db_path)
         elif current_text == "控制网复测平面基准计算":
-            GSExport.main_function(self, db_path, file_path)
+            GSExport.main_function(self, file_path, db_path, excelname)
         elif current_text == "平面控制网稳定性计算":
-            # WDExport.main_function(self, file_path)
-            pass
+            WDExport.main_function(self, file_path, db_path, excelname)
         else:
             QMessageBox.warning(self, '警告', '请选择有效的计算类型')
 
-    #数据一览，点击查询
-    def search_data_to_show(self,file_path,current_text,tablename):
+    # 数据一览，点击查询
+    def search_data_to_show(self, file_path, current_text, tablename):
         utf_en = tablename.encode('utf-8')  # 转换文件名为utf-8编码形式
-        #高差部分我没改
+        # 高差部分我没改
         if current_text == "水准测段高差稳定计算":
             GCshow.main_function(self.ui, file_path, utf_en)
         elif current_text == "控制网复测平面基准计算":