完善了bug，对GS的导出功能进行了修改完善

Front/back/GS/GSExport.py

@@ -63,7 +63,7 @@ def Arrange_Data2(list1):
     return list2
 
 
-def openpyxl_write(folder_name, dbpath, filename,file_name):
+def openpyxl_write(folder_name, dbpath, filename, file_name):
     utf_en = filename.encode('utf-8')
     # 新建对应的excel
     wb = openpyxl.Workbook()
@@ -234,7 +234,7 @@ def openpyxl_write(folder_name, dbpath, filename,file_name):
     wb.save(excel_filepath)
 
 
-def export_initial_data(ui, db_path, utf_en, export_folder,file_name):
+def export_initial_data(ui, db_path, utf_en, export_folder, file_name):
     # 获取当前时间并格式化为字符串，例如：20231010_143000
     timestamp = time.strftime("%Y%m%d", time.localtime())
     # 解码 utf_en
@@ -359,7 +359,8 @@ def export_initial_data(ui, db_path, utf_en, export_folder,file_name):
     # 保存工作簿
     wb.save(excel_path)
 
-def export_example_data(ui, db_path, utf_en, export_folder,file_name):
+
+def export_example_data(ui, db_path, utf_en, export_folder, file_name):
     # 解码 utf_en
     decoded_utf_en = utf_en.decode('utf-8') if isinstance(utf_en, bytes) else utf_en
     # excel_file_name = f"{os.path.splitext(decoded_utf_en)[0]}.xlsx"
@@ -482,32 +483,263 @@ def export_example_data(ui, db_path, utf_en, export_folder,file_name):
     # 保存工作簿
     wb.save(excel_path)
 
+
+# 合并导出函数
+def combined_export(folder_name, dbpath, filename, file_name):
+    utf_en = filename.encode('utf-8')
+    # 创建新工作簿
+    wb = openpyxl.Workbook()
+
+    # ========== Sheet1: 初始数据 ==========
+    ws_initial = wb.active
+    ws_initial.title = "初始数据"
+
+    # 处理初始数据（原export_initial_data逻辑）
+    conn = sqlite3.connect(dbpath)
+    cursor = conn.cursor()
+
+    # 样式定义
+    decimal_style_3 = NamedStyle(name="decimal_style_3")
+    decimal_style_3.number_format = '0.000'
+    decimal_style_3.alignment = Alignment(horizontal='center', vertical='center')
+
+    decimal_style_1 = NamedStyle(name="decimal_style_1")
+    decimal_style_1.number_format = '0.0'
+    decimal_style_1.alignment = Alignment(horizontal='center', vertical='center')
+
+    decimal_style_4 = NamedStyle(name="decimal_style_4")
+    decimal_style_4.number_format = '0.0000'
+    decimal_style_4.alignment = Alignment(horizontal='center', vertical='center')
+
+    # 处理GS_Input_Param数据
+    param_query = """SELECT New_ResultName, Last_ResultName, Avg_SL, Ms_Dir, 
+                    Ms_WSL, SL_Count, Dir_Count, Scale_Value 
+                    FROM GS_Input_Param WHERE TableName = ?"""
+    cursor.execute(param_query, (utf_en,))
+    param_result = cursor.fetchone()
+
+    if param_result:
+        new_result_name, last_result_name, avg_sl, ms_dir, ms_wsl, sl_count, dir_count, scale_value = param_result
+
+        # 填充参数数据
+        ws_initial['B1'] = new_result_name
+        ws_initial['D1'] = last_result_name
+        ws_initial['G1'] = avg_sl
+        ws_initial['G2'] = ms_dir
+        ws_initial['G3'] = ms_wsl
+        ws_initial['G4'] = sl_count
+        ws_initial['G5'] = dir_count
+        ws_initial['G6'] = scale_value
+
+        # 应用样式
+        ws_initial['G1'].style = decimal_style_3
+        ws_initial['G4'].style = decimal_style_1
+        ws_initial['G5'].style = decimal_style_1
+        ws_initial['G6'].style = decimal_style_4
+
+        # 合并单元格
+        ws_initial.merge_cells('B1:C1')
+        ws_initial.merge_cells('D1:E1')
+        ws_initial['B1'].alignment = Alignment(horizontal='center', vertical='center')
+        ws_initial['D1'].alignment = Alignment(horizontal='center', vertical='center')
+
+    # 处理GS_Input_Point数据
+    point_query = """SELECT PointName, New_X, New_Y, Last_X, Last_Y 
+                    FROM GS_Input_Point WHERE TableName = ?"""
+    cursor.execute(point_query, (utf_en,))
+    point_results = cursor.fetchall()
+
+    # 设置表头
+    headers = [
+        ("A2", "点名"), ("B2", "高斯坐标x(m)"), ("C2", "高斯坐标y(m)"),
+        ("D2", "高斯坐标x(m)"), ("E2", "高斯坐标y(m)"), ("F1", "平均边长(m)"),
+        ("F2", "方向值中误差(″)"), ("F3", "最弱边边长相对中误差"),
+        ("F4", "网点总测边数"), ("F5", "网点总方向观测数"), ("F6", "缩放值")
+    ]
+
+    for cell, value in headers:
+        ws_initial[cell] = value
+        ws_initial[cell].alignment = Alignment(horizontal='center', vertical='center')
+
+    # 填充点数据
+    decimal_style = NamedStyle(name="decimal_style")
+    decimal_style.number_format = '0000.0000'
+    for idx, (point_name, new_x, new_y, last_x, last_y) in enumerate(point_results, start=3):
+        ws_initial[f'A{idx}'] = point_name
+        ws_initial[f'B{idx}'] = round(new_x, 4)
+        ws_initial[f'C{idx}'] = round(new_y, 4)
+        ws_initial[f'D{idx}'] = round(last_x, 4)
+        ws_initial[f'E{idx}'] = round(last_y, 4)
+        for col in ['B', 'C', 'D', 'E']:
+            ws_initial[f'{col}{idx}'].style = decimal_style
+
+    # ========== 后续工作表：原openpyxl_write内容 ==========
+    # 创建其他工作表（自动按顺序添加）
+    ws1 = wb.create_sheet('复测基准归算表')
+    ws2 = wb.create_sheet('复测成果表')
+    ws3 = wb.create_sheet('基准归算模型')
+
+    # 原openpyxl_write中的数据库查询和表格生成逻辑
+    # -- 复测基准归算表 --
+    cursor.execute(
+        'SELECT PointName,Cal_X,Cal_Y,Last_CalX,Last_CalY,Last_CalP,Dis_Ass,Last_ResultName,New_ResultName FROM GS_Result_Point WHERE TableName = ?',
+        (utf_en,))
+    result1 = cursor.fetchall()
+    plist1 = Arrange_Data1(result1)
+
+    # 工作表格式设置（保持原openpyxl_write中的格式代码不变）
+    ws1.column_dimensions['A'].width = 5
+    ws1.column_dimensions['B'].width = 15
+    ws1.column_dimensions['C'].width = 15
+    ws1.column_dimensions['D'].width = 8
+    ws1.column_dimensions['E'].width = 8
+    ws1.column_dimensions['F'].width = 8
+    ws1.column_dimensions['G'].width = 5
+    ws1.merge_cells(start_row=1, end_row=1, start_column=1, end_column=7)
+    ws1.cell(1, 1).value = '复测基准归算与位移判定'
+    ws1.merge_cells(start_row=2, end_row=3, start_column=1, end_column=1)
+    ws1.cell(2, 1).value = '点名'
+    ws1.merge_cells(start_row=2, end_row=2, start_column=2, end_column=3)
+    ws1.cell(2, 2).value = plist1[0][8] + '基准归算成果'
+    ws1.merge_cells(start_row=2, end_row=2, 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')
+    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)
+    ws1.cell(2, 7).value = '位移判定'
+    ws1.cell(2, 7).alignment = Alignment(wrap_text=True)
+    ws1.cell(3, 2).value = 'X(mm)'
+    ws1.cell(3, 3).value = 'Y(mm)'
+    ws1.cell(3, 4).value = '△X'
+    ws1.cell(3, 5).value = '△Y'
+    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)
+        if data1[6] == '稳定':
+            ws1.cell(row1, 7).value = ''
+        else:
+            ws1.cell(row1, 7).value = data1[6]
+        row1 = row1 + 1
+
+    # -- 复测成果表 --
+    cursor.execute(
+        '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 = ?',
+        (utf_en,))
+    result2 = cursor.fetchall()
+    plist2 = Arrange_Data2(result2)
+    ws2.column_dimensions['A'].width = 5
+    ws2.column_dimensions['B'].width = 15
+    ws2.column_dimensions['C'].width = 15
+    ws2.column_dimensions['D'].width = 15
+    ws2.column_dimensions['E'].width = 15
+    ws2.column_dimensions['F'].width = 8
+    ws2.column_dimensions['G'].width = 8
+    ws2.column_dimensions['H'].width = 8
+    ws2.column_dimensions['I'].width = 5
+    ws2.merge_cells(start_row=1, end_row=1, start_column=1, end_column=3)
+    ws2.cell(1, 1).value = '前期成果'
+    ws2.merge_cells(start_row=1, end_row=1, start_column=4, end_column=9)
+    ws2.cell(1, 4).value = '本期成果'
+    ws_area = ws2["A1:I2"]
+    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')
+    ws2.merge_cells(start_row=2, end_row=3, start_column=1, end_column=1)
+    ws2.cell(2, 1).value = '点名'
+    ws2.merge_cells(start_row=2, end_row=2, start_column=2, end_column=3)
+    ws2.cell(2, 2).value = plist2[0][9]
+    ws2.merge_cells(start_row=2, end_row=2, start_column=4, end_column=5)
+    ws2.cell(2, 4).value = plist2[0][10]
+    ws2.merge_cells(start_row=2, end_row=2, start_column=6, end_column=8)
+    newname_1 = plist2[0][9] + '-' + plist2[0][10] + '(mm)'
+    ws2.cell(2, 6).value = newname_1
+    ws2.merge_cells(start_row=2, end_row=3, start_column=9, end_column=9)
+    ws2.cell(2, 9).value = '位移判定'
+    ws2.cell(2, 9).alignment = Alignment(wrap_text=True)
+    ws2.cell(3, 2).value = 'X(m)'
+    ws2.cell(3, 3).value = 'Y(m)'
+    ws2.cell(3, 4).value = 'X(m)'
+    ws2.cell(3, 5).value = 'Y(m)'
+    ws2.cell(3, 6).value = '△X'
+    ws2.cell(3, 7).value = '△Y'
+    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)
+        if data2[8] == '稳定':
+            ws2.cell(row2, 9).value = ''
+        else:
+            ws2.cell(row2, 9).value = data2[8]
+        row2 = row2 + 1
+
+    # -- 基准归算模型 --
+    cursor.execute(
+        'SELECT Last_ResultName,New_ResultName,Formula_X1,Formula_X2,Formula_X3,Formula_Y1,Formula_Y2,Formula_Y3 FROM GS_Trans_Param WHERE TableName = ?',
+        (utf_en,))
+    result3 = cursor.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')
+    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)) + ')'
+    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)) + ')'
+    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
+
+    # 删除默认创建的空白Sheet（如果有）
+    if 'Sheet' in wb.sheetnames:
+        wb.remove(wb['Sheet'])
+
+    # 保存文件
+    excel_filepath = os.path.join(folder_name, file_name)
+    wb.save(excel_filepath)
+    conn.close()
+
+
 # 主函数 写入excel文件
-def main_function(ui, dbpath, excelname,export_folder,file_name):
-    # # 获取应用的安装目录
-    # app_install_dir = os.getcwd()  # 假设脚本文件位于应用的安装目录下
-    # export_folder = os.path.join(app_install_dir, 'Export')
-    #
-    # # 如果 Export 文件夹不存在，则创建它
-    # if not os.path.exists(export_folder):
-    #     os.makedirs(export_folder)
+def main_function(ui, dbpath, excelname, export_folder, file_name):
     try:
-        openpyxl_write(export_folder, dbpath, excelname,file_name)
+        openpyxl_write(export_folder, dbpath, excelname, file_name)
         QMessageBox.information(ui, '成功', f'成果文件已成功导出到 {export_folder}')
     except Exception as e:
         QMessageBox.critical(ui, '错误', f'导出过程中发生错误: {str(e)}')
 
 
-def main_function_initial(ui, dbpath, excelname_utf8,export_folder,file_name):
-    # # 获取应用的安装目录
-    # app_install_dir = os.getcwd()  # 假设脚本文件位于应用的安装目录下
-    # export_folder = os.path.join(app_install_dir, 'Export')
-    #
-    # # 如果 Export 文件夹不存在，则创建它
-    # if not os.path.exists(export_folder):
-    #     os.makedirs(export_folder)
+def main_function_initial(ui, dbpath, excelname_utf8, export_folder, file_name):
     try:
-        export_initial_data(ui, dbpath, excelname_utf8, export_folder,file_name)
+        export_initial_data(ui, dbpath, excelname_utf8, export_folder, file_name)
         QMessageBox.information(ui, '成功', f'初始文件已成功导出到 {export_folder}')
     except PermissionError as e:
         if e.errno == 13:
@@ -518,16 +750,9 @@ def main_function_initial(ui, dbpath, excelname_utf8,export_folder,file_name):
         QMessageBox.critical(ui, '错误', f'导出过程中发生错误: {str(e)}')
 
 
-def main_function_example(ui, dbpath, excelname_utf8,export_folder,file_name):
-    # # 获取应用的安装目录
-    # app_install_dir = os.getcwd()  # 假设脚本文件位于应用的安装目录下
-    # export_folder = os.path.join(app_install_dir, 'Example')
-    #
-    # # 如果 Export 文件夹不存在，则创建它
-    # if not os.path.exists(export_folder):
-    #     os.makedirs(export_folder)
+def main_function_example(ui, dbpath, excelname_utf8, export_folder, file_name):
     try:
-        export_example_data(ui, dbpath, excelname_utf8, export_folder,file_name)
+        export_example_data(ui, dbpath, excelname_utf8, export_folder, file_name)
         QMessageBox.information(ui, '成功', f'示例文件已成功导出到 {export_folder}')
     except PermissionError as e:
         if e.errno == 13:
@@ -535,4 +760,12 @@ def main_function_example(ui, dbpath, excelname_utf8,export_folder,file_name):
         else:
             QMessageBox.critical(ui, '错误', f'导出过程中发生错误: {str(e)}')
     except Exception as e:
-        QMessageBox.critical(ui, '错误', f'导出过程中发生错误: {str(e)}')
+        QMessageBox.critical(ui, '错误', f'导出过程中发生错误: {str(e)}')
+
+
+def main_function_combined(ui, dbpath, excelname, export_folder, file_name):
+    try:
+        combined_export(export_folder, dbpath, excelname, file_name)
+        QMessageBox.information(ui, '成功', f'数据文件已成功导出到 {export_folder}')
+    except Exception as e:
+        QMessageBox.critical(ui, '错误', f'导出过程中发生错误: {str(e)}')

Front/main.py

@@ -47,7 +47,7 @@ from pathlib import Path
 project_root = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
 sys.path.append(project_root)
 
-# os.environ["QT_FONT_DPI"] = "96"  # FIX Problem for High DPI and Scale above 100%
+os.environ["QT_FONT_DPI"] = "96"  # FIX Problem for High DPI and Scale above 100%
 
 # SET AS GLOBAL WIDGETS
 # ///////////////////////////////////////////////////////////////
@@ -415,11 +415,8 @@ class ElTree(QWidget):
         if parent_name == '水准测段高差稳定计算':
             GCExport.main_function_combined(self, tablename_utf8, dbpath, folder_name, file_name)
         elif parent_name == '控制网复测平面基准计算':
-            GSExport.main_function(self, dbpath, tablename, folder_name, file_name)
-            GSExport.main_function_initial(self, dbpath, tablename_utf8, folder_name, file_name)
+            GSExport.main_function_combined(self, dbpath, tablename, folder_name, file_name)
         elif parent_name == '平面控制网稳定性计算':
-            # WDExport.main_function(self, dbpath, tablename, folder_name, file_name)
-            # WDExport.main_function_initial(self, dbpath, tablename_utf8, folder_name, file_name)
             WDExport.main_function_combined(self, dbpath, tablename_utf8, folder_name, file_name)
         else:
             QMessageBox.warning(self, '警告', '未知的父节点')
@@ -697,10 +694,9 @@ class ElTree1(QWidget):
         if parent_name == '水准测段高差稳定计算':
             GCExport.main_function_combined(self, tablename_utf8, dbpath, folder_name, file_name)  # 导出合并文件
         elif parent_name == '控制网复测平面基准计算':
-            GSExport.main_function_initial(self, dbpath, tablename_utf8, folder_name, file_name)  # 导出初始文件
-            GSExport.main_function(self, dbpath, tablename, folder_name, file_name)  # 导出结果文件
+            GSExport.main_function_combined(self, dbpath, tablename, folder_name, file_name)
         elif parent_name == '平面控制网稳定性计算':
-            WDExport.main_function_combined(self, dbpath, excelname, folder_name, file_name)
+            WDExport.main_function_combined(self, dbpath, tablename_utf8, folder_name, file_name)
         else:
             QMessageBox.warning(self, '警告', '未知的父节点')
             return
@@ -1013,7 +1009,6 @@ class MainWindow(QMainWindow):
             # 在这里处理文件保存逻辑
             if self.file_path:
                 UIFunctions.export_database_to_excel(self, self.file_path, folder_name, file_name)
-                QMessageBox.information(self, "保存成功", f"文件将保存到: {file_name}")
             else:
                 QMessageBox.warning(self, '警告', '请先选择项目并上传文件')
         else:

Front/modules/ui_functions.py

@@ -362,7 +362,8 @@ class UIFunctions(MainWindow):
         if current_text == "水准测段高差稳定计算":
             GCExport.main_function_combined(self, utf_en, db_path,folder_name,file_name)
         elif current_text == "控制网复测平面基准计算":
-            GSExport.main_function(self, db_path, excelname,folder_name,file_name)
+            # GSExport.main_function(self, db_path, excelname,folder_name,file_name)
+            GSExport.main_function_combined(self, db_path, excelname, folder_name, file_name)
         elif current_text == "平面控制网稳定性计算":
             WDExport.main_function_combined(self, db_path, excelname,folder_name,file_name)
         else: