完成了GC的参数的展示

Back/GC/GCshow.py

@@ -1,3 +1,4 @@
+import itertools
 import sqlite3
 
 from PySide6.QtGui import QStandardItemModel, QStandardItem
@@ -91,24 +92,37 @@ def search_show_function(ui, db_path, utf_en):
 
     # 查询 GC_Input_Point 表中的数据
     input_query = """
-    SELECT New_ID, Last_ResultName, Last_SPName, Last_EPName,Last_HDiff,Last_RLen, New_ResultName,  New_SPName, New_EPName,New_HDiff, New_RLen
+    SELECT New_ID, Last_ResultName, Last_SPName, Last_EPName, Last_HDiff, Last_RLen, New_ResultName, New_SPName, New_EPName, New_HDiff, New_RLen
     FROM GC_Input_Point
     WHERE TableName = ?
     """
     cursor1.execute(input_query, (utf_en,))
     input_result = cursor1.fetchall()
 
+    # 查询 GC_Input_Param 表中的数据
+    param_query = """
+    SELECT ObservationLevel, Ms_Station, Last_StationCount, Last_SumHDiff, Last_SumRLen, New_StationCount, New_SumHDiff, New_SumRLen
+    FROM GC_Input_Param
+    WHERE TableName = ?
+    """
+    cursor1.execute(param_query, (utf_en,))
+    param_result = cursor1.fetchall()
+
     # 创建 QStandardItemModel 实例
     input_model = QStandardItemModel()
-    input_model.setColumnCount(len(input_result[0]))
+    input_model.setColumnCount(len(input_result[0]) + 8)  # 增加八列（2 + 6）
 
     # 设置表头
-    input_headers = ['序号', '上期成果名', '上期测段起点', '上期测段终点', '上期高差', '上期路线长', '本期成果名',
-                     '本期测段起点', '本期测段终点',
-                     '本期高差', '本期路线长']
+    input_headers = [
+        '序号', '上期成果名', '上期测段起点', '上期测段终点', '上期高差', '上期路线长', '本期成果名',
+        '本期测段起点', '本期测段终点',
+        '本期高差', '本期路线长', '观测等级', '测站全中误差',
+        '上次总测段数', '上期高差合计', '上期路线长合计', '本期总测段数', '本期高差合计', '本期路线长合计'
+    ]
     input_model.setHorizontalHeaderLabels(input_headers)
 
-    for row_data in input_result:
+    # 使用 itertools.zip_longest 处理长度不一致的情况
+    for row_data, param_data in itertools.zip_longest(input_result, param_result, fillvalue=(None, None, None, None, None, None, None, None)):
         items = []
         for i, item in enumerate(row_data):
             if item is None:
@@ -117,6 +131,50 @@ def search_show_function(ui, db_path, utf_en):
                 if i in [4, 5, 10, 11]:  # 索引4,5,10,11（高差和路线长）
                     item = f"{item:.6f}"  # 格式化为6位小数
             items.append(QStandardItem(str(item)))
+
+        # 添加新的列数据
+        if param_data is not None:
+            observation_level, ms_station, last_station_count, last_sum_hdiff, last_sum_rlen, new_station_count, new_sum_hdiff, new_sum_rlen = param_data
+        else:
+            observation_level, ms_station, last_station_count, last_sum_hdiff, last_sum_rlen, new_station_count, new_sum_hdiff, new_sum_rlen = "", "", "", "", "", "", "", ""
+
+        # 确保 observation_level 和 ms_station 是字符串
+        if observation_level is None:
+            observation_level = ""
+        if ms_station is None:
+            ms_station = ""
+
+        # 确保其他字段是字符串或格式化后的字符串
+        if last_station_count is None:
+            last_station_count = ""
+        if last_sum_hdiff is None:
+            last_sum_hdiff = ""
+        else:
+            last_sum_hdiff = f"{last_sum_hdiff:.6f}"
+        if last_sum_rlen is None:
+            last_sum_rlen = ""
+        else:
+            last_sum_rlen = f"{last_sum_rlen:.6f}"
+        if new_station_count is None:
+            new_station_count = ""
+        if new_sum_hdiff is None:
+            new_sum_hdiff = ""
+        else:
+            new_sum_hdiff = f"{new_sum_hdiff:.6f}"
+        if new_sum_rlen is None:
+            new_sum_rlen = ""
+        else:
+            new_sum_rlen = f"{new_sum_rlen:.6f}"
+
+        items.append(QStandardItem(str(observation_level)))
+        items.append(QStandardItem(f"{ms_station:.2f}" if isinstance(ms_station, (int, float)) else ""))
+        items.append(QStandardItem(str(last_station_count)))
+        items.append(QStandardItem(str(last_sum_hdiff)))
+        items.append(QStandardItem(str(last_sum_rlen)))
+        items.append(QStandardItem(str(new_station_count)))
+        items.append(QStandardItem(str(new_sum_hdiff)))
+        items.append(QStandardItem(str(new_sum_rlen)))
+
         input_model.appendRow(items)
 
     # 设置并展示输入数据表格
@@ -179,3 +237,4 @@ def search_show_function(ui, db_path, utf_en):
 
     # 隐藏 QLabel
     ui.default_remind1.hide()
+