修改了模型展示表格的顺序

Back/GC/GCshow.py

@@ -76,7 +76,7 @@ def search_show_function(ui, db_path, utf_en):
     if not isinstance(utf_en, bytes):
         utf_en = utf_en.encode('utf-8')
 
-    tabs_to_show = [(0, '输入数据'), (2, '水准测段高差计算成果表')]
+    tabs_to_show = [(0, '输入数据'), (1, '水准测段高差计算成果表')]
     for index in range(ui.View.count()):
         visible = index in [t[0] for t in tabs_to_show]
         ui.View.setTabVisible(index, visible)

Back/GS/GSshow.py

@@ -93,8 +93,8 @@ def search_show_function(ui, db_path, utf_en):
     ui.View.setTabVisible(3, True)
     # 重新设置文字名称
     ui.View.setTabText(0, '输入数据')
-    ui.View.setTabText(1, '基准归算模型')
-    ui.View.setTabText(2, '复测基准归算表')
+    ui.View.setTabText(1, '复测基准归算表')
+    ui.View.setTabText(2, '基准归算模型')
     ui.View.setTabText(3, '复测成果表')
 
     # 连接到数据库

Back/WD/WDshow.py

@@ -82,8 +82,8 @@ def search_show_function(ui, db_path, utf_en):
     ui.View.setTabVisible(2, True)
     ui.View.setTabVisible(3, False)
     # 重新设置文字名称
-    ui.View.setTabText(1, '自由网成果归算模型')
-    ui.View.setTabText(2, '稳定性分析成果表')
+    ui.View.setTabText(1, '稳定性分析成果表')
+    ui.View.setTabText(2, '自由网成果归算模型')
     ui.View.setTabText(0, '输入数据')
     # 链接数据库并显示
     # 连接到数据库

Front/modules/ui_main.py

@@ -9,6 +9,7 @@
 ################################################################################
 
 import sys
+
 sys.path.append("../..")
 
 import sqlite3
@@ -24,8 +25,9 @@ from PySide6.QtWidgets import (QApplication, QCheckBox, QComboBox, QFormLayout,
                                QFrame, QGridLayout, QHBoxLayout, QHeaderView,
                                QLabel, QLineEdit, QListView, QMainWindow,
                                QPushButton, QSizePolicy, QStackedWidget, QTabWidget,
-                               QTableView, QTextEdit, QVBoxLayout, QWidget, QMessageBox,QTreeWidget)
-from Back.Program_Run.data_show import Arrange_Data, Arrange_Data1, Arrange_Data2, Data_in_Cell, Data_in_Cell1, Data_in_Cell2
+                               QTableView, QTextEdit, QVBoxLayout, QWidget, QMessageBox, QTreeWidget)
+from Back.Program_Run.data_show import Arrange_Data, Arrange_Data1, Arrange_Data2, Data_in_Cell, Data_in_Cell1, \
+    Data_in_Cell2
 from Back.Program_Run.database_operations import create_database_and_tables
 from Back.Program_Run.file_system_watching import ComboBoxUpdater
 from watchdog.observers import Observer
@@ -1504,10 +1506,6 @@ class Ui_MainWindow(object):
         self.tabWidget.setTabsClosable(False)
         self.tabWidget.setTabBarAutoHide(False)
 
-
-
-
-
         self.resultTable = QWidget()
         self.resultTable.setObjectName(u"resultTable")
         self.verticalLayout_29 = QVBoxLayout(self.resultTable)
@@ -1536,7 +1534,7 @@ class Ui_MainWindow(object):
         self.printTable.setTabletTracking(False)
         self.verticalLayout_28 = QVBoxLayout(self.printTable)
         self.verticalLayout_28.setObjectName(u"verticalLayout_28")
-        self.printTableView =  QTextEdit(self.printTable)
+        self.printTableView = QTextEdit(self.printTable)
         self.printTableView.setObjectName(u"printTableView")
         self.printTableView.setReadOnly(True)
         self.verticalLayout_28.addWidget(self.printTableView)
@@ -1589,7 +1587,6 @@ class Ui_MainWindow(object):
         self.tabWidget.setTabVisible(1, False)
         self.tabWidget.setTabVisible(2, False)
 
-
         self.search = QPushButton(self.datainfo)
         self.search.setObjectName(u"search")
         sizePolicy4 = QSizePolicy(QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Fixed)
@@ -1648,7 +1645,7 @@ class Ui_MainWindow(object):
         self.verticalLayout_30.setObjectName(u"verticalLayout_30")
         self.horizontalLayout_11 = QHBoxLayout()
         self.horizontalLayout_11.setObjectName(u"horizontalLayout_11")
-        #留个空，什么编辑排序筛选可以放在这儿
+        # 留个空，什么编辑排序筛选可以放在这儿
         self.edit_button = QPushButton(self.datainfo)
         self.edit_button.setObjectName(u"edit_button")
         sizePolicy4 = QSizePolicy(QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Fixed)
@@ -1704,6 +1701,20 @@ class Ui_MainWindow(object):
         icon51.addFile(u":/icons/images/icons/1.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
         self.View.addTab(self.resultTable1, icon51, "")
 
+        self.reconTable1 = QWidget()
+        self.reconTable1.setObjectName(u"reconTable1")
+        # self.reconTable.setCursor(QCursor(Qt.CursorShape.UpArrowCursor))
+        self.reconTable1.setMouseTracking(False)
+        self.reconTable1.setTabletTracking(False)
+        self.verticalLayout_36 = QVBoxLayout(self.reconTable1)
+        self.verticalLayout_36.setObjectName(u"verticalLayout_36")
+        self.reconTableView1 = QTableView(self.reconTable1)
+        self.reconTableView1.setObjectName(u"modelTableView1")
+        self.verticalLayout_36.addWidget(self.reconTableView1)
+        icon7 = QIcon()
+        icon7.addFile(u":/icons/images/icons/2.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
+        self.View.addTab(self.reconTable1, icon7, "")
+
         self.printTable1 = QWidget()
         self.printTable1.setObjectName(u"printTable1")
         self.printTable1.setMouseTracking(False)
@@ -1715,22 +1726,9 @@ class Ui_MainWindow(object):
         self.printTableView1.setReadOnly(True)
         self.verticalLayout_35.addWidget(self.printTableView1)
         icon6 = QIcon()
-        icon6.addFile(u":/icons/images/icons/2.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
+        icon6.addFile(u":/icons/images/icons/3.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
         self.View.addTab(self.printTable1, icon6, "")
 
-        self.reconTable1 = QWidget()
-        self.reconTable1.setObjectName(u"reconTable1")
-        # self.reconTable.setCursor(QCursor(Qt.CursorShape.UpArrowCursor))
-        self.reconTable1.setMouseTracking(False)
-        self.reconTable1.setTabletTracking(False)
-        self.verticalLayout_36 = QVBoxLayout(self.reconTable1)
-        self.verticalLayout_36.setObjectName(u"verticalLayout_36")
-        self.reconTableView1 = QTableView(self.reconTable1)
-        self.reconTableView1.setObjectName(u"modelTableView1")
-        self.verticalLayout_36.addWidget(self.reconTableView1)
-        icon7 = QIcon()
-        icon7.addFile(u":/icons/images/icons/3.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
-        self.View.addTab(self.reconTable1, icon7, "")
 
         self.inputTable1 = QWidget()
         self.inputTable1.setObjectName(u"inputTable1")
@@ -1746,7 +1744,7 @@ class Ui_MainWindow(object):
         icon8.addFile(u":/icons/images/icons/4.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
         self.View.addTab(self.inputTable1, icon8, "")
 
-        # 设置到处结果显示页面（View）的默认隐藏2.3页
+        # 设置导出结果显示页面（View）的默认隐藏2.3页
         self.View.setTabVisible(1, False)
         self.View.setTabVisible(2, False)
         self.View.setTabVisible(3, False)
@@ -1866,6 +1864,7 @@ class Ui_MainWindow(object):
 
         self.stackedWidget.setCurrentIndex(1)
         self.tabWidget.setCurrentIndex(0)
+
     # setupUi
 
     # UI中的文字样式以及文字内容，Unicode编码的形式进行文字编辑的
@@ -2029,4 +2028,3 @@ class Ui_MainWindow(object):
         self.btn_message.setText(QCoreApplication.translate("MainWindow", u"\u5207\u6362\u4e3b\u9898", None))
         self.creditsLabel.setText(QCoreApplication.translate("MainWindow", u"\u7248\u6743\u4fe1\u606f", None))
         self.version.setText(QCoreApplication.translate("MainWindow", u"v1.0.0", None))
-