From fb6ac1f43b24c417999c31b6742bf38c970392ec Mon Sep 17 00:00:00 2001 From: "weiye.wang" Date: Fri, 21 Jun 2024 21:54:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=BD=BF=E7=94=A8=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E5=AF=BC=E5=85=A5=E6=94=BE=E7=BD=AE=E5=85=A5=E9=9D=A2?= =?UTF-8?q?=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 +- 工具v4/Ui_tool_panel.py | 8 ++++++-- 工具v4/tool_panel.py | 8 +++++++- 工具v4/tool_panel.ui | 9 +++++++-- 工具v4/个人使用记录导入.py | 7 ++++++- 5 files changed, 27 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 5238aa2d..3306eb1c 100644 --- a/.gitignore +++ b/.gitignore @@ -13,5 +13,5 @@ *.sh *static *.log -文本文件/* +*/文本文件/* diff --git a/工具v4/Ui_tool_panel.py b/工具v4/Ui_tool_panel.py index 9cfc8ed6..95da0337 100644 --- a/工具v4/Ui_tool_panel.py +++ b/工具v4/Ui_tool_panel.py @@ -180,6 +180,9 @@ class Ui_MainWindow(object): self.tab_gxsy = QWidget() self.tab_gxsy.setObjectName(u"tab_gxsy") self.tabWidget_syjl.addTab(self.tab_gxsy, "") + self.tab_grdr = QWidget() + self.tab_grdr.setObjectName(u"tab_grdr") + self.tabWidget_syjl.addTab(self.tab_grdr, "") self.tabWidget_main.addTab(self.tab_syjl, "") self.tab_notesandanswers = QWidget() self.tab_notesandanswers.setObjectName(u"tab_notesandanswers") @@ -226,14 +229,14 @@ class Ui_MainWindow(object): self.retranslateUi(MainWindow) - self.tabWidget_main.setCurrentIndex(7) + self.tabWidget_main.setCurrentIndex(3) self.tabWidget_luru.setCurrentIndex(0) self.tabWidget_weihu.setCurrentIndex(0) self.tabWidget_shiyong.setCurrentIndex(5) self.tabWidget_beikezu.setCurrentIndex(0) self.tabWidget_latex.setCurrentIndex(0) self.tabWidget_mubiaojichu.setCurrentIndex(1) - self.tabWidget_syjl.setCurrentIndex(0) + self.tabWidget_syjl.setCurrentIndex(6) self.tabWidget_notesandanswers.setCurrentIndex(2) @@ -278,6 +281,7 @@ class Ui_MainWindow(object): self.tabWidget_syjl.setTabText(self.tabWidget_syjl.indexOf(self.tab_xxxz), QCoreApplication.translate("MainWindow", u"\u5c0f\u95f2\u4e0b\u8f7d", None)) 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_syjl.setTabText(self.tabWidget_syjl.indexOf(self.tab_grdr), QCoreApplication.translate("MainWindow", u"\u4e2a\u4eba\u4f7f\u7528\u8bb0\u5f55\u5bfc\u5165", 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)) diff --git a/工具v4/tool_panel.py b/工具v4/tool_panel.py index f6b67043..4a997c5f 100644 --- a/工具v4/tool_panel.py +++ b/工具v4/tool_panel.py @@ -34,6 +34,7 @@ from 赋能卷生成 import MyWindow_fnsc from 排序材料内难度 import MyWindow_pxnd from 单人讲义生成 import MyWindow_drsc from 讲义与答题纸信息查询 import MyWindow_jycx +from 个人使用记录导入 import MyWindow_grdr from database_tools_2 import * class MyWindow(QMainWindow,Ui_MainWindow): @@ -182,6 +183,10 @@ class MyWindow(QMainWindow,Ui_MainWindow): self.jycx = MyWindow_jycx(self.database) self.layout_jycx.addWidget(self.jycx) #以上三行为初始化"讲义答题纸查询"tab + self.layout_grdr = QVBoxLayout(self.tab_grdr) + self.grdr = MyWindow_grdr(self.database) + self.layout_grdr.addWidget(self.grdr) #以上三行为初始化"讲义答题纸查询"tab + @@ -212,7 +217,8 @@ class MyWindow(QMainWindow,Ui_MainWindow): self.jglr.setdbname, self.dtlr.setdbname, self.drsc.setdbname, - self.jycx.setdbname + self.jycx.setdbname, + self.grdr.setdbname ]: #在列表中的tab里传送数据库名的连接 self.sendDBname.connect(func) def sendValue(self): diff --git a/工具v4/tool_panel.ui b/工具v4/tool_panel.ui index c3ff4c2d..06a6f645 100644 --- a/工具v4/tool_panel.ui +++ b/工具v4/tool_panel.ui @@ -27,7 +27,7 @@ QTabWidget::Triangular - 7 + 3 @@ -319,7 +319,7 @@ QTabWidget::Triangular - 0 + 6 @@ -351,6 +351,11 @@ 共享使用记录 + + + 个人使用记录导入 + + diff --git a/工具v4/个人使用记录导入.py b/工具v4/个人使用记录导入.py index 2180a250..131fcf90 100644 --- a/工具v4/个人使用记录导入.py +++ b/工具v4/个人使用记录导入.py @@ -22,7 +22,10 @@ class MyWindow_grdr(QWidget,Ui_Form): self.setupUi(self) self.database_name = database_name self.bind() - + + def setdbname(self,string): + self.database_name = string + # print(self.database_name) def bind(self): self.tableWidget_filelist.setColumnWidth(0,270) @@ -56,6 +59,8 @@ class MyWindow_grdr(QWidget,Ui_Form): def exec(self): tempdir = "临时文件/zips" + self.tableWidget_result.clearContents() + self.tableWidget_result.setRowCount(0) mydb = connect(hostname = db_host, port = db_port, username=db_user, pwd=db_pwd, db = self.database_name) mycursor = mydb.cursor() for zf in tqdm.tqdm(self.filelist,desc = "文件处理进度 "):