讲义与答题纸信息查询功能放到tool_panel上

工具v4/Ui_tool_panel.py

@@ -105,12 +105,6 @@ class Ui_MainWindow(object):
         self.tabWidget_beikezu.setGeometry(QRect(0, 0, 800, 490))
         self.tabWidget_beikezu.setTabPosition(QTabWidget.West)
         self.tabWidget_beikezu.setTabShape(QTabWidget.Triangular)
-        self.tab_jglr = QWidget()
-        self.tab_jglr.setObjectName(u"tab_jglr")
-        self.tabWidget_beikezu.addTab(self.tab_jglr, "")
-        self.tab_dtlr = QWidget()
-        self.tab_dtlr.setObjectName(u"tab_dtlr")
-        self.tabWidget_beikezu.addTab(self.tab_dtlr, "")
         self.tab_jysc = QWidget()
         self.tab_jysc.setObjectName(u"tab_jysc")
         self.tabWidget_beikezu.addTab(self.tab_jysc, "")
@@ -187,6 +181,24 @@ class Ui_MainWindow(object):
         self.tab_gxsy.setObjectName(u"tab_gxsy")
         self.tabWidget_syjl.addTab(self.tab_gxsy, "")
         self.tabWidget_main.addTab(self.tab_syjl, "")
+        self.tab_notesandanswers = QWidget()
+        self.tab_notesandanswers.setObjectName(u"tab_notesandanswers")
+        self.tabWidget_notesandanswers = QTabWidget(self.tab_notesandanswers)
+        self.tabWidget_notesandanswers.setObjectName(u"tabWidget_notesandanswers")
+        self.tabWidget_notesandanswers.setEnabled(True)
+        self.tabWidget_notesandanswers.setGeometry(QRect(0, 0, 800, 490))
+        self.tabWidget_notesandanswers.setTabPosition(QTabWidget.West)
+        self.tabWidget_notesandanswers.setTabShape(QTabWidget.Triangular)
+        self.tab_jglr = QWidget()
+        self.tab_jglr.setObjectName(u"tab_jglr")
+        self.tabWidget_notesandanswers.addTab(self.tab_jglr, "")
+        self.tab_dtlr = QWidget()
+        self.tab_dtlr.setObjectName(u"tab_dtlr")
+        self.tabWidget_notesandanswers.addTab(self.tab_dtlr, "")
+        self.tab_jycx = QWidget()
+        self.tab_jycx.setObjectName(u"tab_jycx")
+        self.tabWidget_notesandanswers.addTab(self.tab_jycx, "")
+        self.tabWidget_main.addTab(self.tab_notesandanswers, "")
         self.horizontalLayoutWidget = QWidget(self.centralwidget)
         self.horizontalLayoutWidget.setObjectName(u"horizontalLayoutWidget")
         self.horizontalLayoutWidget.setGeometry(QRect(30, 0, 741, 31))
@@ -214,14 +226,15 @@ class Ui_MainWindow(object):
 
         self.retranslateUi(MainWindow)
 
-        self.tabWidget_main.setCurrentIndex(3)
+        self.tabWidget_main.setCurrentIndex(7)
         self.tabWidget_luru.setCurrentIndex(0)
         self.tabWidget_weihu.setCurrentIndex(0)
         self.tabWidget_shiyong.setCurrentIndex(5)
-        self.tabWidget_beikezu.setCurrentIndex(5)
+        self.tabWidget_beikezu.setCurrentIndex(0)
         self.tabWidget_latex.setCurrentIndex(0)
-        self.tabWidget_mubiaojichu.setCurrentIndex(0)
+        self.tabWidget_mubiaojichu.setCurrentIndex(1)
         self.tabWidget_syjl.setCurrentIndex(0)
+        self.tabWidget_notesandanswers.setCurrentIndex(2)
 
 
         QMetaObject.connectSlotsByName(MainWindow)
@@ -245,8 +258,6 @@ class Ui_MainWindow(object):
         self.tabWidget_shiyong.setTabText(self.tabWidget_shiyong.indexOf(self.tab_hqth), QCoreApplication.translate("MainWindow", u"\u83b7\u53d6\u9898\u53f7", None))
         self.tabWidget_shiyong.setTabText(self.tabWidget_shiyong.indexOf(self.tab_sjlb), QCoreApplication.translate("MainWindow", u"\u8bd5\u5377\u5217\u8868", None))
         self.tabWidget_main.setTabText(self.tabWidget_main.indexOf(self.tab_shiyong), QCoreApplication.translate("MainWindow", u"\u4f7f\u7528", None))
-        self.tabWidget_beikezu.setTabText(self.tabWidget_beikezu.indexOf(self.tab_jglr), QCoreApplication.translate("MainWindow", u"\u8bb2\u4e49\u7ed3\u6784\u7f16\u53f7\u5f55\u5165", None))
-        self.tabWidget_beikezu.setTabText(self.tabWidget_beikezu.indexOf(self.tab_dtlr), QCoreApplication.translate("MainWindow", u"\u7b54\u9898\u7eb8\u5bf9\u5e94\u5f55\u5165", None))
         self.tabWidget_beikezu.setTabText(self.tabWidget_beikezu.indexOf(self.tab_jysc), QCoreApplication.translate("MainWindow", u"\u7cfb\u5217\u8bb2\u4e49\u751f\u6210", None))
         self.tabWidget_beikezu.setTabText(self.tabWidget_beikezu.indexOf(self.tab_fnsc), QCoreApplication.translate("MainWindow", u"\u8d4b\u80fd\u5377\u751f\u6210", None))
         self.tabWidget_beikezu.setTabText(self.tabWidget_beikezu.indexOf(self.tab_pxnd), QCoreApplication.translate("MainWindow", u"\u96be\u5ea6\u6392\u5e8f", None))
@@ -268,6 +279,10 @@ class Ui_MainWindow(object):
         self.tabWidget_syjl.setTabText(self.tabWidget_syjl.indexOf(self.tab_scjl), QCoreApplication.translate("MainWindow", u"\u5220\u9664\u4f7f\u7528\u8bb0\u5f55", None))
         self.tabWidget_syjl.setTabText(self.tabWidget_syjl.indexOf(self.tab_gxsy), QCoreApplication.translate("MainWindow", u"\u5171\u4eab\u4f7f\u7528\u8bb0\u5f55", None))
         self.tabWidget_main.setTabText(self.tabWidget_main.indexOf(self.tab_syjl), QCoreApplication.translate("MainWindow", u"\u4f7f\u7528\u8bb0\u5f55", None))
+        self.tabWidget_notesandanswers.setTabText(self.tabWidget_notesandanswers.indexOf(self.tab_jglr), QCoreApplication.translate("MainWindow", u"\u8bb2\u4e49\u7ed3\u6784\u4e0e\u5185\u5bb9\u5f55\u5165", None))
+        self.tabWidget_notesandanswers.setTabText(self.tabWidget_notesandanswers.indexOf(self.tab_dtlr), QCoreApplication.translate("MainWindow", u"\u7b54\u9898\u7eb8\u5bf9\u5e94\u5f55\u5165", None))
+        self.tabWidget_notesandanswers.setTabText(self.tabWidget_notesandanswers.indexOf(self.tab_jycx), QCoreApplication.translate("MainWindow", u"\u8bb2\u4e49\u53ca\u7b54\u9898\u7eb8\u4fe1\u606f\u67e5\u8be2", None))
+        self.tabWidget_main.setTabText(self.tabWidget_main.indexOf(self.tab_notesandanswers), QCoreApplication.translate("MainWindow", u"\u8bb2\u4e49\u4e0e\u7b54\u9898\u7eb8", None))
         self.pushButton_tiku.setText(QCoreApplication.translate("MainWindow", u"\u6b63\u5f0f\u6570\u636e\u5e93", None))
         self.pushButton_tikutest.setText(QCoreApplication.translate("MainWindow", u"\u6d4b\u8bd5\u6570\u636e\u5e93", None))
     # retranslateUi

工具v4/tool_panel.py

@@ -33,6 +33,7 @@ from 试卷列表 import MyWindow_sjlb
 from 赋能卷生成 import MyWindow_fnsc
 from 排序材料内难度 import MyWindow_pxnd
 from 单人讲义生成 import MyWindow_drsc
+from 讲义与答题纸信息查询 import MyWindow_jycx
 from database_tools_2 import *
 
 class MyWindow(QMainWindow,Ui_MainWindow):
@@ -175,7 +176,13 @@ class MyWindow(QMainWindow,Ui_MainWindow):
 
         self.layout_drsc = QVBoxLayout(self.tab_drsc)
         self.drsc = MyWindow_drsc(self.database)
-        self.layout_drsc.addWidget(self.drsc)
+        self.layout_drsc.addWidget(self.drsc) #以上三行为初始化"单人讲义生成"tab
+
+        self.layout_jycx = QVBoxLayout(self.tab_jycx)
+        self.jycx = MyWindow_jycx(self.database)
+        self.layout_jycx.addWidget(self.jycx) #以上三行为初始化"讲义答题纸查询"tab
+
+
 
 
         for func in [
@@ -204,7 +211,8 @@ class MyWindow(QMainWindow,Ui_MainWindow):
             self.xxdr.setdbname,
             self.jglr.setdbname,
             self.dtlr.setdbname,
-            self.drsc.setdbname
+            self.drsc.setdbname,
+            self.jycx.setdbname
         ]: #在列表中的tab里传送数据库名的连接
             self.sendDBname.connect(func)
     def sendValue(self):

工具v4/tool_panel.ui

@@ -27,7 +27,7 @@
      <enum>QTabWidget::Triangular</enum>
     </property>
     <property name="currentIndex">
-     <number>3</number>
+     <number>7</number>
     </property>
     <widget class="QWidget" name="tab_luru">
      <attribute name="title">
@@ -192,18 +192,8 @@
        <enum>QTabWidget::Triangular</enum>
       </property>
       <property name="currentIndex">
-       <number>5</number>
+       <number>0</number>
       </property>
-      <widget class="QWidget" name="tab_jglr">
-       <attribute name="title">
-        <string>讲义结构编号录入</string>
-       </attribute>
-      </widget>
-      <widget class="QWidget" name="tab_dtlr">
-       <attribute name="title">
-        <string>答题纸对应录入</string>
-       </attribute>
-      </widget>
       <widget class="QWidget" name="tab_jysc">
        <attribute name="title">
         <string>系列讲义生成</string>
@@ -280,7 +270,7 @@
        <enum>QTabWidget::Triangular</enum>
       </property>
       <property name="currentIndex">
-       <number>0</number>
+       <number>1</number>
       </property>
       <widget class="QWidget" name="tab_tjjc">
        <attribute name="title">
@@ -363,6 +353,48 @@
       </widget>
      </widget>
     </widget>
+    <widget class="QWidget" name="tab_notesandanswers">
+     <attribute name="title">
+      <string>讲义与答题纸</string>
+     </attribute>
+     <widget class="QTabWidget" name="tabWidget_notesandanswers">
+      <property name="enabled">
+       <bool>true</bool>
+      </property>
+      <property name="geometry">
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>800</width>
+        <height>490</height>
+       </rect>
+      </property>
+      <property name="tabPosition">
+       <enum>QTabWidget::West</enum>
+      </property>
+      <property name="tabShape">
+       <enum>QTabWidget::Triangular</enum>
+      </property>
+      <property name="currentIndex">
+       <number>2</number>
+      </property>
+      <widget class="QWidget" name="tab_jglr">
+       <attribute name="title">
+        <string>讲义结构与内容录入</string>
+       </attribute>
+      </widget>
+      <widget class="QWidget" name="tab_dtlr">
+       <attribute name="title">
+        <string>答题纸对应录入</string>
+       </attribute>
+      </widget>
+      <widget class="QWidget" name="tab_jycx">
+       <attribute name="title">
+        <string>讲义及答题纸信息查询</string>
+       </attribute>
+      </widget>
+     </widget>
+    </widget>
    </widget>
    <widget class="QWidget" name="horizontalLayoutWidget">
     <property name="geometry">