修改了部分UI,针对WD,GC的数据导出进行了修改，修改后导出为一个包含初始数据，成果数据的合并excel表格

Front/back/GC/GCExport.py

@@ -10,12 +10,120 @@ from openpyxl.utils.dataframe import dataframe_to_rows
 from openpyxl import Workbook
 
 
-def export_result_data(ui, utf_en, db_path, export_folder,file_name):
+def export_combined_data(ui, utf_en, db_path, export_folder, file_name):
     try:
         # 解码 utf_en
         decoded_utf_en = utf_en.decode('utf-8') if isinstance(utf_en, bytes) else utf_en
+
+        # 创建一个新的 Excel 工作簿
+        wb = Workbook()
+
+        # 导出初始数据到第一个 sheet
+        ws_initial = wb.active
+        ws_initial.title = "初始高差数据"
+
+        # 合并指定的单元格
+        merge_cells = ['A1:B1', 'D1:E1', 'F1:G1', 'I1:J1']
+        for cell_range in merge_cells:
+            ws_initial.merge_cells(cell_range)
+
+        # 设置合并单元格后的居中对齐
+        for cell_range in merge_cells:
+            cell = ws_initial[cell_range.split(':')[0]]
+            cell.alignment = Alignment(horizontal='center', vertical='center')
+
         # 连接数据库
         conn = sqlite3.connect(db_path)
+        cursor = conn.cursor()
+
+        # 查询 GC_Input_Param 表获取 ObservationLevel, Last_ResultName, New_ResultName, Ms_Station 字段
+        query_observation_level = "SELECT ObservationLevel, Last_ResultName, New_ResultName, Ms_Station FROM GC_Input_Param WHERE TableName=?"
+        cursor.execute(query_observation_level, (utf_en,))
+        result = cursor.fetchone()
+        if result:
+            observation_level, last_result_name, new_result_name, ms_station = result
+        else:
+            observation_level = "未找到"
+            last_result_name = "未找到"
+            new_result_name = "未找到"
+            ms_station = "未找到"
+
+        # 填写表头信息
+        ws_initial['A1'] = '观测等级'
+        ws_initial['C1'] = observation_level  # 将 ObservationLevel 写入 C1 单元格
+        ws_initial['A2'] = '序号'
+        ws_initial['B2'] = '起点'
+        ws_initial['C2'] = '终点'
+        ws_initial['D2'] = '高差（m）'
+        ws_initial['E2'] = '路线长（km）'
+        ws_initial['F1'] = '测站全中误差（mm）'
+        ws_initial['F2'] = '序号'
+        ws_initial['G2'] = '起点'
+        ws_initial['H2'] = '终点'
+        ws_initial['I2'] = '高差（m）'
+        ws_initial['J2'] = '路线长（km）'
+
+        # 写入 Last_ResultName, New_ResultName, Ms_Station 到相应的单元格
+        ws_initial['D1'] = last_result_name
+        ws_initial['I1'] = new_result_name
+        ws_initial['H1'] = ms_station
+
+        # 设置 H1 单元格的数值格式为保留两位小数
+        ws_initial['H1'].number_format = '0.00'
+
+        # 查询数据库表为DataFrame，添加 TableName 条件
+        query = "SELECT * FROM GC_Input_Point WHERE TableName=?"
+        cursor.execute(query, (utf_en,))
+        rows = cursor.fetchall()
+
+        # 获取列名
+        column_names = [description[0] for description in cursor.description]
+
+        # 定义需要的列索引
+        last_id_index = column_names.index('Last_ID')
+        last_spname_index = column_names.index('Last_SPName')
+        last_epname_index = column_names.index('Last_EPName')
+        last_hdiff_index = column_names.index('Last_HDiff')
+        last_rlen_index = column_names.index('Last_RLen')
+        new_id_index = column_names.index('New_ID')
+        new_spname_index = column_names.index('New_SPName')
+        new_epname_index = column_names.index('New_EPName')
+        new_hdiff_index = column_names.index('New_HDiff')
+        new_rlen_index = column_names.index('New_RLen')
+
+        # 填充数据到Excel
+        for idx, row in enumerate(rows, start=3):
+            ws_initial.cell(row=idx, column=1, value=row[last_id_index])
+            ws_initial.cell(row=idx, column=2, value=row[last_spname_index])
+            ws_initial.cell(row=idx, column=3, value=row[last_epname_index])
+            ws_initial.cell(row=idx, column=4, value=row[last_hdiff_index])
+            ws_initial.cell(row=idx, column=5, value=row[last_rlen_index])
+            ws_initial.cell(row=idx, column=6, value=row[new_id_index])
+            ws_initial.cell(row=idx, column=7, value=row[new_spname_index])
+            ws_initial.cell(row=idx, column=8, value=row[new_epname_index])
+            ws_initial.cell(row=idx, column=9, value=row[new_hdiff_index])
+            ws_initial.cell(row=idx, column=10, value=row[new_rlen_index])
+
+            # 设置 D, E, I, J 列为强制保留六位小数
+            ws_initial.cell(row=idx, column=4).number_format = '0.000000'
+            ws_initial.cell(row=idx, column=5).number_format = '0.000000'
+            ws_initial.cell(row=idx, column=9).number_format = '0.000000'
+            ws_initial.cell(row=idx, column=10).number_format = '0.000000'
+
+        # 设置B,C,G,H的列宽为9.25
+        ws_initial.column_dimensions['B'].width = 9.25
+        ws_initial.column_dimensions['C'].width = 9.25
+        ws_initial.column_dimensions['G'].width = 9.25
+        ws_initial.column_dimensions['H'].width = 9.25
+
+        # 设置 D, E, I, J 列的列宽为11.5
+        ws_initial.column_dimensions['D'].width = 11.5
+        ws_initial.column_dimensions['E'].width = 11.5
+        ws_initial.column_dimensions['I'].width = 11.5
+        ws_initial.column_dimensions['J'].width = 11.5
+
+        # 导出成果数据到第二个 sheet
+        ws_result = wb.create_sheet(title="成果高差数据")
 
         # 查询数据库表为DataFrame，添加 TableName 条件
         query = "SELECT * FROM GC_Output_Point WHERE TableName=?"
@@ -39,15 +147,19 @@ def export_result_data(ui, utf_en, db_path, export_folder,file_name):
         # 删除 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)
+
         # New_RLen 保留小数点后6位
         if 'New_RLen' in df.columns:
             df['New_RLen'] = df['New_RLen'].round(6)
+
         # Correct_Factor 保留小数点后2位
         if 'Correct_Factor' in df.columns:
             df['Correct_Factor'] = df['Correct_Factor'].round(2)
+
         # Period_Diff 保留小数点后2位
         if 'Period_Diff' in df.columns:
             df['Period_Diff'] = df['Period_Diff'].round(2)
@@ -65,29 +177,27 @@ def export_result_data(ui, utf_en, db_path, export_folder,file_name):
             'Dis_Ass': '变形判定'
         }
         df.rename(columns=column_mapping, inplace=True)
+
         # 查询 GC_Input_Param 表获取 Correct_Factor 字段
         query_param = "SELECT Correct_Factor FROM GC_Input_Param WHERE TableName=?"
         correct_factor_df = pd.read_sql_query(query_param, conn, params=(utf_en,))
 
         correct_factor = correct_factor_df.iloc[0]['Correct_Factor']
 
-        # 创建一个新的 Excel 工作簿
-        wb = Workbook()
-        ws = wb.active
         # 在E1单元格添加内容“修正系数”
-        ws.cell(row=1, column=1, value="序号")
-        ws.cell(row=1, column=2, value="结果期数")
-        ws.cell(row=1, column=3, value="起点")
-        ws.cell(row=1, column=4, value="终点")
-        ws.cell(row=1, column=5, value="修正系数")
-        ws.cell(row=1, column=6, value=correct_factor)
-        ws.cell(row=1, column=7, value="修正数")
-        ws.cell(row=1, column=8, value="期间差异")
-        ws.cell(row=1, column=9, value="变形判定")
+        ws_result.cell(row=1, column=1, value="序号")
+        ws_result.cell(row=1, column=2, value="结果期数")
+        ws_result.cell(row=1, column=3, value="起点")
+        ws_result.cell(row=1, column=4, value="终点")
+        ws_result.cell(row=1, column=5, value="修正系数")
+        ws_result.cell(row=1, column=6, value=correct_factor)
+        ws_result.cell(row=1, column=7, value="修正数")
+        ws_result.cell(row=1, column=8, value="期间差异")
+        ws_result.cell(row=1, column=9, value="变形判定")
 
         # 将 DataFrame 写入工作表
         for r in dataframe_to_rows(df, index=False, header=True):
-            ws.append(r)
+            ws_result.append(r)
 
         # 定义自定义样式
         style_0_000000 = NamedStyle(name="style_0_000000", number_format='0.000000')
@@ -103,178 +213,57 @@ def export_result_data(ui, utf_en, db_path, export_folder,file_name):
         correct_factor_col_index = df.columns.get_loc('修正数') + 1  # 获取“修正数”列的索引
         period_diff_col_index = df.columns.get_loc('期间差异') + 1  # 获取“期间差异”列的索引
 
-        for row in range(2, ws.max_row + 1):  # 从第二行开始，因为第一行为标题行
-            ws.cell(row=row, column=hdiff_col_index).style = style_0_000000
-            ws.cell(row=row, column=rlen_col_index).style = style_0_000000
-            ws.cell(row=row, column=correct_factor_col_index).style = style_0_00
-            ws.cell(row=row, column=period_diff_col_index).style = style_0_00
+        for row in range(2, ws_result.max_row + 1):  # 从第二行开始，因为第一行为标题行
+            ws_result.cell(row=row, column=hdiff_col_index).style = style_0_000000
+            ws_result.cell(row=row, column=rlen_col_index).style = style_0_000000
+            ws_result.cell(row=row, column=correct_factor_col_index).style = style_0_00
+            ws_result.cell(row=row, column=period_diff_col_index).style = style_0_00
 
         # 设置 Dis_Ass 列为“变形”的行的字体颜色为红色
         red_font = Font(color="FF0000")
         dis_ass_col_index = df.columns.get_loc('变形判定') + 1  # 获取“变形判定”列的索引
 
-        for row in range(2, ws.max_row + 1):  # 从第二行开始，因为第一行为标题行
-            cell_value = ws.cell(row=row, column=dis_ass_col_index).value
+        for row in range(2, ws_result.max_row + 1):  # 从第二行开始，因为第一行为标题行
+            cell_value = ws_result.cell(row=row, column=dis_ass_col_index).value
             if cell_value == '变形':
-                for col in range(1, ws.max_column + 1):
-                    ws.cell(row=row, column=col).font = red_font
+                for col in range(1, ws_result.max_column + 1):
+                    ws_result.cell(row=row, column=col).font = red_font
+
         # 设置列宽
-        ws.column_dimensions['E'].width = 12
-        ws.column_dimensions['F'].width = 12
+        ws_result.column_dimensions['E'].width = 12
+        ws_result.column_dimensions['F'].width = 12
 
         # 保存 Excel 文件之前添加单元格合并操作
         merge_cells = ['A1:A2', 'B1:B2', 'C1:C2', 'D1:D2', 'G1:G2', 'H1:H2', 'I1:I2']
         for cell_range in merge_cells:
-            ws.merge_cells(cell_range)
-
-        # 设置合并单元格后的居中对齐
-        for cell_range in merge_cells:
-            cell = ws[cell_range.split(':')[0]]
-            cell.alignment = Alignment(horizontal='center', vertical='center')
-            # 获取当前时间并格式化为字符串，例如：20231010_143000
-        timestamp = time.strftime("%Y%m%d", time.localtime())
-        # 保存 Excel 文件
-        # excel_filename = f"{os.path.splitext(decoded_utf_en)[0]}-成果数据-{timestamp}.xlsx"
-        excel_filepath = os.path.join(export_folder, file_name)
-        wb.save(excel_filepath)
-
-        QMessageBox.information(ui, '成功', f'成果文件已成功导出到 {export_folder}')
-    except Exception as e:
-        QMessageBox.critical(ui, '错误', f'导出过程中发生错误: {str(e)}')
-    finally:
-        # 关闭数据库连接
-        conn.close()
-
-
-def export_initial_data(ui, utf_en, db_path, export_folder,file_name):
-    try:
-        # 解码 utf_en
-        decoded_utf_en = utf_en.decode('utf-8') if isinstance(utf_en, bytes) else utf_en
-
-        # 创建一个新的 Excel 工作簿
-        wb = Workbook()
-        ws = wb.active
-
-        # 合并指定的单元格
-        merge_cells = ['A1:B1', 'D1:E1', 'F1:G1', 'I1:J1']
-        for cell_range in merge_cells:
-            ws.merge_cells(cell_range)
+            ws_result.merge_cells(cell_range)
 
         # 设置合并单元格后的居中对齐
         for cell_range in merge_cells:
-            cell = ws[cell_range.split(':')[0]]
+            cell = ws_result[cell_range.split(':')[0]]
             cell.alignment = Alignment(horizontal='center', vertical='center')
-        # 连接数据库
-        conn = sqlite3.connect(db_path)
-        cursor = conn.cursor()
-
-        # 查询 GC_Input_Param 表获取 ObservationLevel, Last_ResultName, New_ResultName, Ms_Station 字段
-        query_observation_level = "SELECT ObservationLevel, Last_ResultName, New_ResultName, Ms_Station FROM GC_Input_Param WHERE TableName=?"
-        cursor.execute(query_observation_level, (utf_en,))
-        result = cursor.fetchone()
-        if result:
-            observation_level, last_result_name, new_result_name, ms_station = result
-        else:
-            observation_level = "未找到"
-            last_result_name = "未找到"
-            new_result_name = "未找到"
-            ms_station = "未找到"
 
-        # 填写表头信息
-        ws['A1'] = '观测等级'
-        ws['C1'] = observation_level  # 将 ObservationLevel 写入 C1 单元格
-        ws['A2'] = '序号'
-        ws['B2'] = '起点'
-        ws['C2'] = '终点'
-        ws['D2'] = '高差（m）'
-        ws['E2'] = '路线长（km）'
-        ws['F1'] = '测站全中误差（mm）'
-        ws['F2'] = '序号'
-        ws['G2'] = '起点'
-        ws['H2'] = '终点'
-        ws['I2'] = '高差（m）'
-        ws['J2'] = '路线长（km）'
-
-        # 写入 Last_ResultName, New_ResultName, Ms_Station 到相应的单元格
-        ws['D1'] = last_result_name
-        ws['I1'] = new_result_name
-        ws['H1'] = ms_station
-
-        # 设置 H1 单元格的数值格式为保留两位小数
-        ws['H1'].number_format = '0.00'
-
-        # 连接数据库
-        conn = sqlite3.connect(db_path)
-        cursor = conn.cursor()
-
-        # 查询数据库表为DataFrame，添加 TableName 条件
-        query = "SELECT * FROM GC_Input_Point WHERE TableName=?"
-        cursor.execute(query, (utf_en,))
-        rows = cursor.fetchall()
-
-        # 获取列名
-        column_names = [description[0] for description in cursor.description]
-
-        # 定义需要的列索引
-        last_id_index = column_names.index('Last_ID')
-        last_spname_index = column_names.index('Last_SPName')
-        last_epname_index = column_names.index('Last_EPName')
-        last_hdiff_index = column_names.index('Last_HDiff')
-        last_rlen_index = column_names.index('Last_RLen')
-        new_id_index = column_names.index('New_ID')
-        new_spname_index = column_names.index('New_SPName')
-        new_epname_index = column_names.index('New_EPName')
-        new_hdiff_index = column_names.index('New_HDiff')
-        new_rlen_index = column_names.index('New_RLen')
-
-        # 填充数据到Excel
-        for idx, row in enumerate(rows, start=3):
-            ws.cell(row=idx, column=1, value=row[last_id_index])
-            ws.cell(row=idx, column=2, value=row[last_spname_index])
-            ws.cell(row=idx, column=3, value=row[last_epname_index])
-            ws.cell(row=idx, column=4, value=row[last_hdiff_index])
-            ws.cell(row=idx, column=5, value=row[last_rlen_index])
-            ws.cell(row=idx, column=6, value=row[new_id_index])
-            ws.cell(row=idx, column=7, value=row[new_spname_index])
-            ws.cell(row=idx, column=8, value=row[new_epname_index])
-            ws.cell(row=idx, column=9, value=row[new_hdiff_index])
-            ws.cell(row=idx, column=10, value=row[new_rlen_index])
-
-            # 设置 D, E, I, J 列为强制保留六位小数
-            ws.cell(row=idx, column=4).number_format = '0.000000'
-            ws.cell(row=idx, column=5).number_format = '0.000000'
-            ws.cell(row=idx, column=9).number_format = '0.000000'
-            ws.cell(row=idx, column=10).number_format = '0.000000'
-        # 设置B,C,G,H的列宽为9.25
-        ws.column_dimensions['B'].width = 9.25
-        ws.column_dimensions['C'].width = 9.25
-        ws.column_dimensions['G'].width = 9.25
-        ws.column_dimensions['H'].width = 9.25
-
-        # 设置 D, E, I, J 列的列宽为11.5
-        ws.column_dimensions['D'].width = 11.5
-        ws.column_dimensions['E'].width = 11.5
-        ws.column_dimensions['I'].width = 11.5
-        ws.column_dimensions['J'].width = 11.5
         # 获取当前时间并格式化为字符串，例如：20231010_143000
         timestamp = time.strftime("%Y%m%d", time.localtime())
+
         # 设置文件名
-        # excel_filename = f"{os.path.splitext(decoded_utf_en)[0]}-初始数据-{timestamp}.xlsx"
         excel_filepath = os.path.join(export_folder, file_name)
 
         # 保存 Excel 文件
         wb.save(excel_filepath)
 
-        QMessageBox.information(ui, '成功', f'初始数据文件已成功导出到 {export_folder}')
+        QMessageBox.information(ui, '成功', f'数据文件已导出到 {export_folder}')
     except Exception as e:
         if isinstance(e, PermissionError) or (isinstance(e, OSError) and e.errno == 13):
             QMessageBox.critical(ui, '错误', '请确认文件没有被其他程序（如Excel、文本编辑器等）打开。')
         else:
-            QMessageBox.critical(ui, '错误', f'导出初始数据过程中发生错误: {str(e)}')
+            QMessageBox.critical(ui, '错误', f'导出过程中发生错误: {str(e)}')
             print(e)
+    finally:
+        # 关闭数据库连接
+        conn.close()
 
-
-def export_example_data(ui, utf_en, db_path, export_folder,file_name):
+def export_example_data(ui, utf_en, db_path, export_folder, file_name):
     try:
         # 解码 utf_en
         decoded_utf_en = utf_en.decode('utf-8') if isinstance(utf_en, bytes) else utf_en
@@ -419,42 +408,11 @@ def process_utf_en(utf_en):
 
     return utf_en
 
-def main_function_initial(ui, utf_en, db_path,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_example(ui, utf_en, db_path, export_folder, file_name):
     # 调用导出初始数据函数
-    export_initial_data(ui, utf_en, db_path, export_folder,file_name)
+    export_example_data(ui, utf_en, db_path, export_folder, file_name)
 
 
-def main_function_example(ui, utf_en, db_path,export_folder,file_name):
-
-    # # 获取应用的安装目录
-    # app_install_dir = os.getcwd()  # 假设脚本文件位于应用的安装目录下
-    # example_folder = os.path.join(app_install_dir, 'Example')
-    #
-    # # 如果 Example 文件夹不存在，则创建它
-    # if not os.path.exists(example_folder):
-    #     os.makedirs(example_folder)
-
-    # 调用导出初始数据函数
-    export_example_data(ui, utf_en, db_path, export_folder,file_name)
-
-def main_function_result(ui, utf_en, db_path,export_folder,file_name):
-    # 处理 utf_en
-    utf_en = process_utf_en(utf_en)
-    # # 获取应用的安装目录
-    # 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)
-    # 调用导出结果函数
-    export_result_data(ui, utf_en, db_path, export_folder,file_name)
+def main_function_combined(ui, utf_en, db_path, export_folder, file_name):
+    export_combined_data(ui, utf_en, db_path, export_folder, file_name)

Front/back/WD/WDExport.py

@@ -47,295 +47,297 @@ def Arrange_Data1(list1):
     return list2
 
 
-def openpyxl_write(folder_name, dbpath, filename,file_name):
-    utf_en = filename.encode('utf-8')
-    # 新建对应的excel
-    wb = openpyxl.Workbook()
-    ws1 = wb.create_sheet('稳定性分析成果表')
-    ws2 = wb.create_sheet('改算模型')
-    ws3 = wb['Sheet']
-    wb.remove(ws3)
-
-    # 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,))
-    # 获取结果集
-    result1 = cursor1.fetchall()
-    # 整理数据
-    plist1 = Arrange_Data1(result1)
-    ws1.column_dimensions['B'].width = 15
-    ws1.column_dimensions['C'].width = 15
-    ws1.column_dimensions['D'].width = 15
-    ws1.column_dimensions['E'].width = 15
-    ws1.column_dimensions['F'].width = 5
-    ws1.column_dimensions['G'].width = 15
-    ws1.column_dimensions['H'].width = 15
-    ws1.column_dimensions['I'].width = 5
-    ws1.column_dimensions['M'].width = 5
-    ws1.column_dimensions['Q'].width = 5
-    ws1.column_dimensions['J'].width = 8
-    ws1.column_dimensions['K'].width = 8
-    ws1.column_dimensions['L'].width = 8
-    ws1.column_dimensions['N'].width = 8
-    ws1.column_dimensions['O'].width = 8
-    ws1.column_dimensions['P'].width = 8
-    ws1.merge_cells(start_row=1, end_row=1,
-                    start_column=1, end_column=17)
-    ws1.cell(1, 1).value = '稳定性分析成果表'
-    ws_area = ws1["A1:Q2"]
-    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=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][17]
-    ws1.merge_cells(start_row=2, end_row=2,
-                    start_column=4, end_column=6)
-    ws1.cell(2, 4).value = plist1[0][18]
-    ws1.merge_cells(start_row=2, end_row=2,
-                    start_column=7, end_column=9)
-
-    ws1.cell(2, 7).value = plist1[0][19]
-    ws1.merge_cells(start_row=2, end_row=2,
-                    start_column=10, end_column=12)
-    ws1.cell(2, 10).value = '本期-首期(mm)'
-    ws1.merge_cells(start_row=2, end_row=3,
-                    start_column=13, end_column=13)
-    ws1.cell(2, 13).value = '变形判定'
-    ws1.merge_cells(start_row=2, end_row=2,
-                    start_column=14, end_column=16)
-    ws1.cell(2, 14).value = '本期-上期(mm)'
-    ws1.merge_cells(start_row=2, end_row=3,
-                    start_column=17, end_column=17)
-    ws1.cell(2, 17).value = '变形判定'
-    ws1.cell(2, 13).alignment = Alignment(wrap_text=True)
-    ws1.cell(2, 17).alignment = Alignment(wrap_text=True)
-    ws1.cell(3, 2).value = 'X(m)'
-    ws1.cell(3, 3).value = 'Y(m)'
-    ws1.cell(3, 4).value = 'X(m)'
-    ws1.cell(3, 5).value = 'Y(m)'
-    ws1.cell(3, 6).value = '权'
-    ws1.cell(3, 7).value = 'X(m)'
-    ws1.cell(3, 8).value = 'Y(m)'
-    ws1.cell(3, 9).value = '权'
-    ws1.cell(3, 10).value = '△X'
-    ws1.cell(3, 11).value = '△Y'
-    ws1.cell(3, 12).value = '△XY'
-    ws1.cell(3, 14).value = '△X'
-    ws1.cell(3, 15).value = '△Y'
-    ws1.cell(3, 16).value = '△XY'
-
-    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)
-        if data1[12] == '稳定':
-            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)
-        if data1[16] == '稳定':
-            ws1.cell(row1, 17).value = ''
-        else:
-            ws1.cell(row1, 17).value = data1[16]
-        row1 = row1 + 1
-
-    # 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()
-    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')  # 指定区域单元格居中
-    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)) + ')'
-    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)) + ')'
-    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
-    # 获取当前时间并格式化为字符串，例如：20231010_143000
-    timestamp = time.strftime("%Y%m%d", time.localtime())
-    # 保存 Excel 文件
-    # excel_filename = f"{os.path.splitext(filename)[0]}-成果数据-{timestamp}.xlsx"
-    excel_filepath = os.path.join(folder_name, file_name)
-    wb.save(excel_filepath)
-
-
-def export_initial_data(ui, db_path, utf_en, export_folder,file_name):
-    # 获取当前时间并格式化为字符串，例如：20231010_143000
-    timestamp = time.strftime("%Y%m%d", time.localtime())
-    # 解码文件名并去掉后缀名
-    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]}-初始数据-{timestamp}.xlsx"
-    excel_path = os.path.join(export_folder, file_name)
-
-    # 创建一个新的工作簿和工作表
-    wb = openpyxl.Workbook()
-    ws = wb.active
-
-    # 连接到数据库
-    conn = sqlite3.connect(db_path)
-    cursor = conn.cursor()
-
-    # 查询WD_Input_Param表中的数据
-    query = """
-    SELECT New_ResultName, Last_ResultName, Avg_SL, Ms_Dir, SL_Count, Dir_Count, Scale_Value, First_ResultName
-    FROM WD_Input_Param
-    WHERE TableName = ?
-    """
-    cursor.execute(query, (utf_en,))
-    result = cursor.fetchone()
-
-    # 创建样式来保留指定的小数位数
-    decimal_style_3 = NamedStyle(name="decimal_style_3")
-    decimal_style_3.number_format = '0.0000'
-    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'
-    decimal_style_4.alignment = Alignment(horizontal='center', vertical='center')
-
-    if result:
-        new_result_name, last_result_name, avg_sl, ms_dir, sl_count, dir_count, scale_value, first_result_name = result
-
-        # 填充数据到Excel并应用样式
-        ws['B1'] = new_result_name
-        ws['B1'].alignment = Alignment(horizontal='center', vertical='center')
-
-        ws['D1'] = last_result_name
-        ws['D1'].alignment = Alignment(horizontal='center', vertical='center')
-
-        ws['G1'] = first_result_name  # 新增：填入First_ResultName
-        ws['G1'].alignment = Alignment(horizontal='center', vertical='center')  # 新增：设置居中对齐
-
-        ws['J1'] = avg_sl
-        ws['J1'].style = decimal_style_3
-
-        ws['J2'] = ms_dir
-        ws['J2'].alignment = Alignment(horizontal='center', vertical='center')
-
-        ws['J3'] = sl_count
-        ws['J3'].style = decimal_style_4
-
-        ws['J4'] = dir_count
-        ws['J4'].style = decimal_style_4
-
-        ws['J5'] = scale_value
-        ws['J5'].style = decimal_style_4
-
-        # 合并单元格
-        ws.merge_cells('B1:C1')
-        ws.merge_cells('D1:E1')
-        ws.merge_cells('G1:H1')
-
-        # 设置列宽
-        ws.column_dimensions['B'].width = 12.5
-        ws.column_dimensions['C'].width = 12.5
-        ws.column_dimensions['D'].width = 12.5
-        ws.column_dimensions['E'].width = 12.5
-        ws.column_dimensions['F'].width = 3
-        ws.column_dimensions['F'].alignment = Alignment(horizontal='center', vertical='center')  # 新增：设置F列居中对齐
-        ws.column_dimensions['G'].width = 12.5
-        ws.column_dimensions['H'].width = 12.5
-        ws.column_dimensions['I'].width = 14
-        ws.column_dimensions['J'].width = 10
-
-    # 设置表头
-    headers = [
-        ("A2", "点名"),
-        ("B2", "高斯坐标x(m)"),
-        ("C2", "高斯坐标y(m)"),
-        ("D2", "高斯坐标x(m)"),
-        ("E2", "高斯坐标y(m)"),
-        ("F2", "权"),
-        ("G2", "高斯坐标x(m)"),
-        ("H2", "高斯坐标y(m)"),
-        ("I1", "平均边长"),
-        ("I2", "方向值中误差"),
-        ("I3", "总边数"),
-        ("I4", "总方向数"),
-        ("I5", "缩放值")
-    ]
-
-    for cell, value in headers:
-        ws[cell] = value
-        ws[cell].alignment = Alignment(horizontal='center', vertical='center')
-
-    # 查询WD_Input_Point表中的数据
-    query_point = """
-    SELECT PointName, New_X, New_Y, Last_X, Last_Y, Wight, First_X, First_Y
-    FROM WD_Input_Point
-    WHERE TableName = ?
-    """
-    cursor.execute(query_point, (utf_en,))
-    results_point = cursor.fetchall()
-
-    # 创建一个样式来强制保留四位小数
-    decimal_style = NamedStyle(name="decimal_style")
-    decimal_style.number_format = '0000.0000'
-
-    # 填充数据到Excel
-    for idx, (point_name, new_x, new_y, last_x, last_y, wight, first_x, first_y) in enumerate(results_point, start=3):
-        ws[f'A{idx}'] = point_name
-        ws[f'B{idx}'] = round(new_x, 4)
-        ws[f'C{idx}'] = round(new_y, 4)
-        ws[f'D{idx}'] = round(last_x, 4)
-        ws[f'E{idx}'] = round(last_y, 4)
-        ws[f'F{idx}'] = round(wight, 0)  # 新增
-        ws[f'G{idx}'] = round(first_x, 4)  # 新增
-        ws[f'H{idx}'] = round(first_y, 4)  # 新增
-
-        # 应用样式以保留四位小数
-        ws[f'B{idx}'].style = decimal_style
-        ws[f'C{idx}'].style = decimal_style
-        ws[f'D{idx}'].style = decimal_style
-        ws[f'E{idx}'].style = decimal_style
-        ws[f'G{idx}'].style = decimal_style  # 新增
-        ws[f'H{idx}'].style = decimal_style  # 新增
+def export_combined_data(ui, db_path, utf_en, export_folder, file_name):
+    try:
+        # 解码文件名并去掉后缀名
+        decoded_utf_en = utf_en.decode('utf-8') if isinstance(utf_en, bytes) else utf_en
+        excel_path = os.path.join(export_folder, file_name)
+
+        # 创建一个新的工作簿
+        wb = openpyxl.Workbook()
+
+        # 创建三个Sheet
+        ws_initial = wb.create_sheet('原始数据')
+        ws_stability = wb.create_sheet('稳定性分析成果表')
+        ws_model = wb.create_sheet('改算模型')
+
+        # 删除默认的Sheet
+        ws_default = wb['Sheet']
+        wb.remove(ws_default)
+
+        # 连接到数据库
+        conn = sqlite3.connect(db_path)
+        cursor = conn.cursor()
+
+        # 查询WD_Input_Param表中的数据
+        query_param = """
+        SELECT New_ResultName, Last_ResultName, Avg_SL, Ms_Dir, SL_Count, Dir_Count, Scale_Value, First_ResultName
+        FROM WD_Input_Param
+        WHERE TableName = ?
+        """
+        cursor.execute(query_param, (utf_en,))
+        result_param = cursor.fetchone()
+
+        # 创建样式来保留指定的小数位数
+        decimal_style_3 = NamedStyle(name="decimal_style_3")
+        decimal_style_3.number_format = '0.0000'
+        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'
+        decimal_style_4.alignment = Alignment(horizontal='center', vertical='center')
+
+        if result_param:
+            new_result_name, last_result_name, avg_sl, ms_dir, sl_count, dir_count, scale_value, first_result_name = result_param
+
+            # 填充数据到“原始数据”Sheet并应用样式
+            ws_initial['B1'] = new_result_name
+            ws_initial['B1'].alignment = Alignment(horizontal='center', vertical='center')
+
+            ws_initial['D1'] = last_result_name
+            ws_initial['D1'].alignment = Alignment(horizontal='center', vertical='center')
+
+            ws_initial['G1'] = first_result_name
+            ws_initial['G1'].alignment = Alignment(horizontal='center', vertical='center')
+
+            ws_initial['J1'] = avg_sl
+            ws_initial['J1'].style = decimal_style_3
+
+            ws_initial['J2'] = ms_dir
+            ws_initial['J2'].alignment = Alignment(horizontal='center', vertical='center')
+
+            ws_initial['J3'] = sl_count
+            ws_initial['J3'].style = decimal_style_4
+
+            ws_initial['J4'] = dir_count
+            ws_initial['J4'].style = decimal_style_4
+
+            ws_initial['J5'] = scale_value
+            ws_initial['J5'].style = decimal_style_4
+
+            # 合并单元格
+            ws_initial.merge_cells('B1:C1')
+            ws_initial.merge_cells('D1:E1')
+            ws_initial.merge_cells('G1:H1')
+
+            # 设置列宽
+            ws_initial.column_dimensions['B'].width = 12.5
+            ws_initial.column_dimensions['C'].width = 12.5
+            ws_initial.column_dimensions['D'].width = 12.5
+            ws_initial.column_dimensions['E'].width = 12.5
+            ws_initial.column_dimensions['F'].width = 3
+            ws_initial.column_dimensions['G'].width = 12.5
+            ws_initial.column_dimensions['H'].width = 12.5
+            ws_initial.column_dimensions['I'].width = 14
+            ws_initial.column_dimensions['J'].width = 10
+
+        # 设置表头
+        headers = [
+            ("A2", "点名"),
+            ("B2", "高斯坐标x(m)"),
+            ("C2", "高斯坐标y(m)"),
+            ("D2", "高斯坐标x(m)"),
+            ("E2", "高斯坐标y(m)"),
+            ("F2", "权"),
+            ("G2", "高斯坐标x(m)"),
+            ("H2", "高斯坐标y(m)"),
+            ("I1", "平均边长"),
+            ("I2", "方向值中误差"),
+            ("I3", "总边数"),
+            ("I4", "总方向数"),
+            ("I5", "缩放值")
+        ]
+
+        for cell, value in headers:
+            ws_initial[cell] = value
+            ws_initial[cell].alignment = Alignment(horizontal='center', vertical='center')
+
+        # 查询WD_Input_Point表中的数据
+        query_point = """
+        SELECT PointName, New_X, New_Y, Last_X, Last_Y, Wight, First_X, First_Y
+        FROM WD_Input_Point
+        WHERE TableName = ?
+        """
+        cursor.execute(query_point, (utf_en,))
+        results_point = cursor.fetchall()
+
+        # 创建一个样式来强制保留四位小数
+        decimal_style = NamedStyle(name="decimal_style")
+        decimal_style.number_format = '0000.0000'
+
+        # 填充数据到“原始数据”Sheet
+        for idx, (point_name, new_x, new_y, last_x, last_y, wight, first_x, first_y) in enumerate(results_point,
+                                                                                                  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)
+            ws_initial[f'F{idx}'] = round(wight, 0)
+            ws_initial[f'G{idx}'] = round(first_x, 4)
+            ws_initial[f'H{idx}'] = round(first_y, 4)
+
+            # 应用样式以保留四位小数
+            ws_initial[f'B{idx}'].style = decimal_style
+            ws_initial[f'C{idx}'].style = decimal_style
+            ws_initial[f'D{idx}'].style = decimal_style
+            ws_initial[f'E{idx}'].style = decimal_style
+            ws_initial[f'G{idx}'].style = decimal_style
+            ws_initial[f'H{idx}'].style = decimal_style
+
+        # 提取“稳定性分析成果表”数据
+        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 = ?'
+        cursor.execute(sqlstr1, (utf_en,))
+        result1 = cursor.fetchall()
+        plist1 = Arrange_Data1(result1)
+
+        # 设置“稳定性分析成果表”列宽
+        ws_stability.column_dimensions['B'].width = 15
+        ws_stability.column_dimensions['C'].width = 15
+        ws_stability.column_dimensions['D'].width = 15
+        ws_stability.column_dimensions['E'].width = 15
+        ws_stability.column_dimensions['F'].width = 5
+        ws_stability.column_dimensions['G'].width = 15
+        ws_stability.column_dimensions['H'].width = 15
+        ws_stability.column_dimensions['I'].width = 5
+        ws_stability.column_dimensions['M'].width = 5
+        ws_stability.column_dimensions['Q'].width = 5
+        ws_stability.column_dimensions['J'].width = 8
+        ws_stability.column_dimensions['K'].width = 8
+        ws_stability.column_dimensions['L'].width = 8
+        ws_stability.column_dimensions['N'].width = 8
+        ws_stability.column_dimensions['O'].width = 8
+        ws_stability.column_dimensions['P'].width = 8
+
+        # 设置“稳定性分析成果表”表头
+        ws_stability.merge_cells(start_row=1, end_row=1, start_column=1, end_column=17)
+        ws_stability.cell(1, 1).value = '稳定性分析成果表'
+        ws_area = ws_stability["A1:Q2"]
+        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')
+        ws_stability.merge_cells(start_row=2, end_row=3, start_column=1, end_column=1)
+        ws_stability.cell(2, 1).value = '点号'
+
+        ws_stability.merge_cells(start_row=2, end_row=2, start_column=2, end_column=3)
+        ws_stability.cell(2, 2).value = plist1[0][17]
+
+        ws_stability.merge_cells(start_row=2, end_row=2, start_column=4, end_column=6)
+        ws_stability.cell(2, 4).value = plist1[0][18]
+
+        ws_stability.merge_cells(start_row=2, end_row=2, start_column=7, end_column=9)
+        ws_stability.cell(2, 7).value = plist1[0][19]
+
+        ws_stability.merge_cells(start_row=2, end_row=2, start_column=10, end_column=12)
+        ws_stability.cell(2, 10).value = '本期-首期(mm)'
+
+        ws_stability.merge_cells(start_row=2, end_row=3, start_column=13, end_column=13)
+        ws_stability.cell(2, 13).value = '变形判定'
+
+        ws_stability.merge_cells(start_row=2, end_row=2, start_column=14, end_column=16)
+        ws_stability.cell(2, 14).value = '本期-上期(mm)'
+
+        ws_stability.merge_cells(start_row=2, end_row=3, start_column=17, end_column=17)
+        ws_stability.cell(2, 17).value = '变形判定'
+
+        ws_stability.cell(2, 13).alignment = Alignment(wrap_text=True)
+        ws_stability.cell(2, 17).alignment = Alignment(wrap_text=True)
+
+        ws_stability.cell(3, 2).value = 'X(m)'
+        ws_stability.cell(3, 3).value = 'Y(m)'
+        ws_stability.cell(3, 4).value = 'X(m)'
+        ws_stability.cell(3, 5).value = 'Y(m)'
+        ws_stability.cell(3, 6).value = '权'
+        ws_stability.cell(3, 7).value = 'X(m)'
+        ws_stability.cell(3, 8).value = 'Y(m)'
+        ws_stability.cell(3, 9).value = '权'
+        ws_stability.cell(3, 10).value = '△X'
+        ws_stability.cell(3, 11).value = '△Y'
+        ws_stability.cell(3, 12).value = '△XY'
+        ws_stability.cell(3, 14).value = '△X'
+        ws_stability.cell(3, 15).value = '△Y'
+        ws_stability.cell(3, 16).value = '△XY'
+
+        row1 = 4
+        for data1 in plist1:
+            ws_stability.cell(row1, 1).value = data1[0]
+            ws_stability.cell(row1, 2).value = round(data1[1], 4)
+            ws_stability.cell(row1, 3).value = round(data1[2], 4)
+            ws_stability.cell(row1, 4).value = round(data1[3], 4)
+            ws_stability.cell(row1, 5).value = round(data1[4], 4)
+            ws_stability.cell(row1, 6).value = int(data1[5])
+            ws_stability.cell(row1, 7).value = round(data1[6], 4)
+            ws_stability.cell(row1, 8).value = round(data1[7], 4)
+            ws_stability.cell(row1, 9).value = int(data1[8])
+            ws_stability.cell(row1, 10).value = round(data1[9], 1)
+            ws_stability.cell(row1, 11).value = round(data1[10], 1)
+            ws_stability.cell(row1, 12).value = round(data1[11], 1)
+            if data1[12] == '稳定':
+                ws_stability.cell(row1, 13).value = ''
+            else:
+                ws_stability.cell(row1, 13).value = data1[12]
+            ws_stability.cell(row1, 14).value = round(data1[13], 1)
+            ws_stability.cell(row1, 15).value = round(data1[14], 1)
+            ws_stability.cell(row1, 16).value = round(data1[15], 1)
+            if data1[16] == '稳定':
+                ws_stability.cell(row1, 17).value = ''
+            else:
+                ws_stability.cell(row1, 17).value = data1[16]
+            row1 += 1
+
+        # 提取“改算模型”数据
+        sqlstr2 = 'select Last_ResultName,New_ResultName,Formula_X1,Formula_X2,Formula_X3,Formula_Y1,Formula_Y2,Formula_Y3 from WD_Result_Param WHERE TableName = ?'
+        cursor.execute(sqlstr2, (utf_en,))
+        result3 = cursor.fetchall()
+        newname = result3[0][1].decode('utf-8')
+        lastname = result3[0][0].decode('utf-8')
+
+        # 设置“改算模型”列宽
+        ws_model.column_dimensions['A'].width = 75
+
+        # 设置“改算模型”表头
+        ws_area = ws_model["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 + '已知系统转换公式:'
+        ws_model.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)) + ')'
+        ws_model.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)) + ')'
+        ws_model.cell(3, 1).value = str3
+        str4 = '式中:x、y为' + newname
+        ws_model.cell(4, 1).value = str4
+        str5 = '     X、Y为' + lastname + '已知系统的' + newname + '归算坐标'
+        ws_model.cell(5, 1).value = str5
+
+        # 保存工作簿
+        wb.save(excel_path)
+
+        QMessageBox.information(ui, '成功', f'数据文件已导出到 {export_folder}')
 
-    # 保存工作簿
-    wb.save(excel_path)
+    except PermissionError as e:
+        if e.errno == 13:
+            QMessageBox.critical(ui, '错误', '请确认文件没有被其他程序（如Excel、文本编辑器等）打开')
+        else:
+            QMessageBox.critical(ui, '错误', f'导出过程中发生错误: {str(e)}')
+    except Exception as e:
+        QMessageBox.critical(ui, '错误', f'导出过程中发生错误: {str(e)}')
 
 
-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):
     # 解码文件名并去掉后缀名
     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"
@@ -472,51 +474,16 @@ def export_example_data(ui, db_path, utf_en, export_folder,file_name):
     # 保存工作簿
     wb.save(excel_path)
 
-# 主函数 写入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)
-    try:
-        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_combined(ui, dbpath, excelname, export_folder, file_name):
+    export_combined_data(ui, dbpath, excelname, export_folder, file_name)
 
-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)
-    try:
-        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:
-            QMessageBox.critical(ui, '错误', '请确认文件没有被其他程序（如Excel、文本编辑器等）打开')
-        else:
-            QMessageBox.critical(ui, '错误', f'导出过程中发生错误: {str(e)}')
-    except Exception as e:
-        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:
@@ -524,4 +491,4 @@ 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)}')

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
 # ///////////////////////////////////////////////////////////////
@@ -234,7 +234,7 @@ class ElTree(QWidget):
             pass
 
     def delete_js(self):
-        #选中当前计算
+        # 选中当前计算
         selected_items = widgets.allTreeWidget.selectedItems()
         item = selected_items[0]
         parent_name = item.text(0)
@@ -244,7 +244,7 @@ class ElTree(QWidget):
             QMessageBox.warning(self, '警告', '所选项目没有父节点')
             return
         dbname = db_item.text(0)
-        dbpath = os.path.join(os.path.abspath('./SQL'), f"{dbname}.db")
+        dbpath = resource_path(os.path.join('SQL', f"{dbname}.db"))
         # 确定要清空的表
         tables_to_delete = []
         if parent_name == '水准测段高差稳定计算':
@@ -281,7 +281,7 @@ class ElTree(QWidget):
         selected_items = widgets.allTreeWidget.selectedItems()
         item = selected_items[0]
         dbname = item.text(0)
-        dbpath = os.path.join(os.path.abspath('./SQL'), f"{dbname}.db")
+        dbpath = resource_path(os.path.join('SQL', f"{dbname}.db"))
         # 确认删除操作
         reply = QMessageBox.question(self, '确认删除', f'确定要删除项目 {dbname} 吗？',
                                      QMessageBox.Yes | QMessageBox.No, QMessageBox.No)
@@ -413,14 +413,14 @@ class ElTree(QWidget):
 
         # 根据父节点名称确定导出操作
         if parent_name == '水准测段高差稳定计算':
-            GCExport.main_function_initial(self, tablename_utf8, dbpath,folder_name,file_name)
-            GCExport.main_function_result(self, tablename_utf8, dbpath,folder_name,file_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(self, dbpath, tablename, folder_name, file_name)
+            GSExport.main_function_initial(self, dbpath, tablename_utf8, 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(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, '警告', '未知的父节点')
             return
@@ -507,7 +507,7 @@ class ElTree1(QWidget):
             pass
 
     def delete_js(self):
-        #选中当前计算
+        # 选中当前计算
         selected_items = widgets.qureyTreeWidget.selectedItems()
         item = selected_items[0]
         parent_name = item.text(0)
@@ -517,7 +517,7 @@ class ElTree1(QWidget):
             QMessageBox.warning(self, '警告', '所选项目没有父节点')
             return
         dbname = db_item.text(0)
-        dbpath = os.path.join(os.path.abspath('./SQL'), f"{dbname}.db")
+        dbpath = resource_path(os.path.join('SQL', f"{dbname}.db"))
         # 确定要清空的表
         tables_to_delete = []
         if parent_name == '水准测段高差稳定计算':
@@ -558,7 +558,7 @@ class ElTree1(QWidget):
         selected_items = widgets.qureyTreeWidget.selectedItems()
         item = selected_items[0]
         dbname = item.text(0)
-        dbpath = os.path.join(os.path.abspath('./SQL'), f"{dbname}.db")
+        dbpath = resource_path(os.path.join('SQL', f"{dbname}.db"))
         # 确认删除操作
         reply = QMessageBox.question(self, '确认删除', f'确定要删除项目 {dbname} 吗？',
                                      QMessageBox.Yes | QMessageBox.No, QMessageBox.No)
@@ -573,7 +573,7 @@ class ElTree1(QWidget):
                 pass
             # 强制垃圾回收
             gc.collect()
-            #删除路径
+            # 删除路径
             os.remove(dbpath)
             QMessageBox.information(self, '成功', f'项目 {dbname} 中的数据已删除')
             # 清空树状图
@@ -653,7 +653,7 @@ class ElTree1(QWidget):
             QMessageBox.critical(self, '错误', f'删除数据时出错: {str(e)}')
 
     def export_item(self):
-        #对话框
+        # 对话框
         file_path, ok = QFileDialog.getSaveFileName(
             self,  # 父窗口
             "保存文件",  # 对话框标题
@@ -695,14 +695,12 @@ class ElTree1(QWidget):
 
         # 根据父节点名称确定导出操作
         if parent_name == '水准测段高差稳定计算':
-            GCExport.main_function_initial(self, tablename_utf8, dbpath,folder_name,file_name)  # 导出初始文件
-            GCExport.main_function_result(self, tablename_utf8, dbpath,folder_name,file_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_initial(self, dbpath, tablename_utf8, folder_name, file_name)  # 导出初始文件
+            GSExport.main_function(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, excelname, folder_name, file_name)
         else:
             QMessageBox.warning(self, '警告', '未知的父节点')
             return
@@ -996,8 +994,8 @@ class MainWindow(QMainWindow):
 
     # 定义导出数据库的槽函数
     def on_export_2_clicked(self):
-        #不清楚位置的按钮（？）
-        #方法还是那个方法
+        # 不清楚位置的按钮（？）
+        # 方法还是那个方法
         # 弹出输入对话框，让用户输入文件名
         file_path, ok = QFileDialog.getSaveFileName(
             self,  # 父窗口
@@ -1021,7 +1019,6 @@ class MainWindow(QMainWindow):
         else:
             QMessageBox.warning(self, "取消", "用户取消了保存操作")
 
-
     # RESIZE EVENTS
     # ///////////////////////////////////////////////////////////////
     def resizeEvent(self, event):
@@ -1421,12 +1418,11 @@ class MainWindow(QMainWindow):
             # 提取文件名
             file_name = path.name
             # 在这里处理文件保存逻辑
-            Back.WD.WDExport.main_function_example(self, db_path, excelname_utf8,folder_name,file_name)
+            Back.WD.WDExport.main_function_example(self, db_path, excelname_utf8, folder_name, file_name)
             # QMessageBox.information(self, "保存成功", f"文件将保存到: {file_name}")
         else:
             QMessageBox.warning(self, "取消", "用户取消了保存操作")
 
-
     def on_download_2_clicked(self):
         # 获取应用的安装目录
         app_install_dir = os.getcwd()
@@ -1448,12 +1444,11 @@ class MainWindow(QMainWindow):
             # 提取文件名
             file_name = path.name
             # 在这里处理文件保存逻辑
-            Back.GS.GSExport.main_function_example(self, db_path, excelname_utf8,folder_name,file_name)
+            Back.GS.GSExport.main_function_example(self, db_path, excelname_utf8, folder_name, file_name)
             # QMessageBox.information(self, "保存成功", f"文件将保存到: {file_name}")
         else:
             QMessageBox.warning(self, "取消", "用户取消了保存操作")
 
-
     def on_download_3_clicked(self):
         # 获取应用的安装目录
         app_install_dir = os.getcwd()
@@ -1475,14 +1470,13 @@ class MainWindow(QMainWindow):
             # 提取文件名
             file_name = path.name
             # 在这里处理文件保存逻辑
-            Back.GC.GCExport.main_function_example(self, utf_en, db_path,folder_name,file_name)
+            Back.GC.GCExport.main_function_example(self, utf_en, db_path, folder_name, file_name)
             # QMessageBox.information(self, "保存成功", f"文件将保存到: {file_name}")
         else:
             QMessageBox.warning(self, "取消", "用户取消了保存操作")
         # 调用main_function_example函数
 
 
-
 def main():
     app = QApplication(sys.argv)
     app.setWindowIcon(QIcon("icon.ico"))

Front/main.ui

@@ -2341,42 +2341,6 @@ background-repeat:no-repeat;</string>
                              <property name="bottomMargin">
                               <number>0</number>
                              </property>
-                             <item>
-                              <widget class="QFrame" name="frame_title_wid_1">
-                               <property name="maximumSize">
-                                <size>
-                                 <width>16777215</width>
-                                 <height>34</height>
-                                </size>
-                               </property>
-                               <property name="frameShape">
-                                <enum>QFrame::Shape::NoFrame</enum>
-                               </property>
-                               <property name="frameShadow">
-                                <enum>QFrame::Shadow::Raised</enum>
-                               </property>
-                               <layout class="QVBoxLayout" name="verticalLayout_18">
-                                <item>
-                                 <widget class="QLabel" name="labelBoxBlenderInstalation">
-                                  <property name="font">
-                                   <font>
-                                    <family>Segoe UI</family>
-                                    <pointsize>10</pointsize>
-                                    <italic>false</italic>
-                                    <bold>false</bold>
-                                   </font>
-                                  </property>
-                                  <property name="styleSheet">
-                                   <string notr="true"/>
-                                  </property>
-                                  <property name="text">
-                                   <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:700;&quot;&gt;导入Excel表格&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-                                  </property>
-                                 </widget>
-                                </item>
-                               </layout>
-                              </widget>
-                             </item>
                              <item>
                               <widget class="QFrame" name="frame_content_wid_1">
                                <property name="minimumSize">
@@ -2404,25 +2368,12 @@ background-repeat:no-repeat;</string>
                                    <number>0</number>
                                   </property>
                                   <property name="horizontalSpacing">
-                                   <number>7</number>
+                                   <number>1</number>
                                   </property>
                                   <property name="verticalSpacing">
                                    <number>4</number>
                                   </property>
-                                  <item row="0" column="0">
-                                   <widget class="QLabel" name="label">
-                                    <property name="maximumSize">
-                                     <size>
-                                      <width>60</width>
-                                      <height>16777215</height>
-                                     </size>
-                                    </property>
-                                    <property name="text">
-                                     <string>选择项目：</string>
-                                    </property>
-                                   </widget>
-                                  </item>
-                                  <item row="0" column="1">
+                                  <item row="1" column="1">
                                    <widget class="QComboBox" name="comboBox">
                                     <property name="maximumSize">
                                      <size>
@@ -2490,7 +2441,61 @@ background-repeat:no-repeat;</string>
                                     </item>
                                    </widget>
                                   </item>
-                                  <item row="0" column="2">
+                                  <item row="2" column="0">
+                                   <widget class="QLabel" name="label_4">
+                                    <property name="text">
+                                     <string>选择计算方式：</string>
+                                    </property>
+                                   </widget>
+                                  </item>
+                                  <item row="1" column="0">
+                                   <widget class="QLabel" name="label">
+                                    <property name="maximumSize">
+                                     <size>
+                                      <width>60</width>
+                                      <height>16777215</height>
+                                     </size>
+                                    </property>
+                                    <property name="text">
+                                     <string>选择项目：</string>
+                                    </property>
+                                   </widget>
+                                  </item>
+                                  <item row="2" column="1">
+                                   <widget class="QComboBox" name="comboBox_2">
+                                    <property name="cursor">
+                                     <cursorShape>PointingHandCursor</cursorShape>
+                                    </property>
+                                    <property name="styleSheet">
+                                     <string notr="true">QComboBox QAbstractItemView {
+    border: 2px solid #282c34;
+	background-color: rgba(40, 44, 52,.7);
+    border-radius-bottom: 15px;
+    padding: 1px 2px 1px 2px;  
+    min-width: 9em;   
+}</string>
+                                    </property>
+                                    <property name="currentText">
+                                     <string>控制网复测平面基准计算</string>
+                                    </property>
+                                    <item>
+                                     <property name="text">
+                                      <string>控制网复测平面基准计算</string>
+                                     </property>
+                                    </item>
+                                    <item>
+                                     <property name="text">
+                                      <string>平面控制网稳定性计算</string>
+                                     </property>
+                                    </item>
+                                    <item>
+                                     <property name="text">
+                                      <string>水准测段高差稳定计算</string>
+                                     </property>
+                                    </item>
+                                   </widget>
+                                  </item>
+                                  <item row="1" column="2">
                                    <widget class="QLineEdit" name="lineEdit">
                                     <property name="minimumSize">
                                      <size>
@@ -2515,7 +2520,7 @@ background-repeat:no-repeat;</string>
                                     </property>
                                    </widget>
                                   </item>
-                                  <item row="0" column="3">
+                                  <item row="2" column="2">
                                    <widget class="QPushButton" name="createFile">
                                     <property name="minimumSize">
                                      <size>
@@ -2525,7 +2530,7 @@ background-repeat:no-repeat;</string>
                                     </property>
                                     <property name="maximumSize">
                                      <size>
-                                      <width>60</width>
+                                      <width>16777215</width>
                                       <height>16777215</height>
                                      </size>
                                     </property>
@@ -2552,45 +2557,18 @@ background-repeat:no-repeat;</string>
                                     </property>
                                    </widget>
                                   </item>
-                                  <item row="1" column="0">
-                                   <widget class="QLabel" name="label_4">
+                                  <item row="0" column="1">
+                                   <widget class="QLabel" name="label_14">
                                     <property name="text">
-                                     <string>选择计算方式：</string>
+                                     <string>选择现有项目</string>
                                     </property>
                                    </widget>
                                   </item>
-                                  <item row="1" column="1">
-                                   <widget class="QComboBox" name="comboBox_2">
-                                    <property name="cursor">
-                                     <cursorShape>PointingHandCursor</cursorShape>
-                                    </property>
-                                    <property name="styleSheet">
-                                     <string notr="true">QComboBox QAbstractItemView {
-    border: 2px solid #282c34;
-	background-color: rgba(40, 44, 52,.7);
-    border-radius-bottom: 15px;
-    padding: 1px 2px 1px 2px;  
-    min-width: 9em;   
-}</string>
-                                    </property>
-                                    <property name="currentText">
-                                     <string>控制网复测平面基准计算</string>
+                                  <item row="0" column="2">
+                                   <widget class="QLabel" name="label_15">
+                                    <property name="text">
+                                     <string>创建新项目</string>
                                     </property>
-                                    <item>
-                                     <property name="text">
-                                      <string>控制网复测平面基准计算</string>
-                                     </property>
-                                    </item>
-                                    <item>
-                                     <property name="text">
-                                      <string>平面控制网稳定性计算</string>
-                                     </property>
-                                    </item>
-                                    <item>
-                                     <property name="text">
-                                      <string>水准测段高差稳定计算</string>
-                                     </property>
-                                    </item>
                                    </widget>
                                   </item>
                                  </layout>

Front/modules/ui_functions.py

@@ -331,13 +331,6 @@ class UIFunctions(MainWindow):
     # 计算与展示文件的方法
     def compute_show_process_excel_file(self, file_path):
         current_text = self.ui.comboBox_2.currentText()
-        # # 获取当前脚本所在的目录
-        # current_dir = os.getcwd()
-        # # 构建 SQL 文件夹的相对路径（上一级的上一级中的 SQL 文件夹）
-        # sql_folder = os.path.join(current_dir, '..', '..', 'SQL')
-        # # 将相对路径转换为绝对路径
-        # sql_folder = os.path.abspath(sql_folder)
-        # db_path = os.path.join(sql_folder, f"{self.ui.comboBox.currentText()}.db")
         db_path = os.path.join(resource_path('SQL'), f"{self.ui.comboBox.currentText()}.db")
         # 转换为utf-8
         excelname = os.path.basename(file_path)  # 文件名
@@ -367,11 +360,11 @@ class UIFunctions(MainWindow):
         excelname = os.path.basename(file_path)  # 文件名
         utf_en = excelname.encode('utf-8')  # 转换文件名为utf-8编码形式
         if current_text == "水准测段高差稳定计算":
-            GCExport.main_function_result(self, utf_en, db_path,folder_name,file_name)
+            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)
         elif current_text == "平面控制网稳定性计算":
-            WDExport.main_function(self, db_path, excelname,folder_name,file_name)
+            WDExport.main_function_combined(self, db_path, excelname,folder_name,file_name)
         else:
             QMessageBox.warning(self, '警告', '请选择有效的计算类型')