重新提交

Front/main_new.py

@@ -67,7 +67,7 @@ class MyTableModel(QAbstractTableModel):
         return None
 
 class TreeWidgetItem:
-    def __init__(self, id: any, parent_id: any, name: str, icon: QIcon = None, extend: object = None):
+    def __init__(self, id: any, parent_id: any, name: str,icon: QIcon = None, extend: object = None):
         """
         菜单数据接口
         :param id: ID
@@ -83,7 +83,7 @@ class TreeWidgetItem:
         # 实例化
         self.treeWidgetItem = QTreeWidgetItem([self.name])
         # 存储相关数据
-        self.treeWidgetItem.setData(0, Qt.UserRole + 1, extend)
+        self.treeWidgetItem.setData(0, Qt.UserRole + 1,extend )
         self.treeWidgetItem.setIcon(0, QIcon(':/icons/default.png'))
         if icon is not None:
             self.treeWidgetItem.setIcon(0, icon)
@@ -233,18 +233,31 @@ class MainWindow(QMainWindow):
         self.data = sqltree
         # 将按钮的点击信号绑定到当前类的点击信号
         # 信号改为展示方法，这里同导出展示
-        widgets.allTreeWidget.itemClicked.connect(lambda extend: print("单击->扩展数据为：", extend))
+        # widgets.allTreeWidget.itemClicked.connect(lambda extend: print("单击->扩展数据为：", extend))
+        widgets.allTreeWidget.itemClicked.connect(self.test_method)
         widgets.allTreeWidget.itemDoubleClicked.connect(lambda extend: print("双击->扩展数据为：", extend))
         self.__render_items(True)
 
         self.bind()
 
+    def test_method(self):
+        print('ok')
 
+    #绑定组件
+    def bind(self):
+        # 计算
+        widgets.compute.clicked.connect(self.computeClick)
+        widgets.search.clicked.connect(self.searchClick)
+
+    #全部
     def __render_items(self, is_clear: bool):
         if is_clear:
             widgets.allTreeWidget.clear()
+            widgets.qureyTreeWidget.clear()
         widgets.allTreeWidget.setColumnCount(1)
         widgets.allTreeWidget.setHeaderHidden(True)
+        widgets.qureyTreeWidget.setColumnCount(1)
+        widgets.qureyTreeWidget.setHeaderHidden(True)
         if self.data.items is not None:
             # 转为字典
             mapping: dict[any, TreeWidgetItem] = dict(zip([i.id for i in self.data.items], self.data.items))
@@ -261,12 +274,30 @@ class MainWindow(QMainWindow):
             # 挂载到树上
             widgets.allTreeWidget.insertTopLevelItems(0, treeWidgetItems)
 
+    #搜索
+    def __render_items1(self, is_clear: bool):
+        if is_clear:
+            widgets.qureyTreeWidget.clear()
+        widgets.qureyTreeWidget.setColumnCount(1)
+        widgets.qureyTreeWidget.setHeaderHidden(True)
+        if self.data.items is not None:
+            # 转为字典
+            mapping: dict[any, TreeWidgetItem] = dict(zip([i.id for i in self.data.items], self.data.items))
+            # 树容器
+            treeWidgetItems: list[QTreeWidgetItem] = []
+            for d in self.data.items:
+                # 如果找不到父级项，则是根节点
+                parent: TreeWidgetItem = mapping.get(d.parent_id)
+                if parent is None:
+                    treeWidgetItems.append(d.treeWidgetItem)
+                else:
+                    parent.treeWidgetItem.addChild(d.treeWidgetItem)
+
+            # 挂载到树上
+            widgets.qureyTreeWidget.insertTopLevelItems(0, treeWidgetItems)
+
+
 
-    #绑定组件
-    def bind(self):
-        # 计算
-        widgets.compute.clicked.connect(self.computeClick)
-        widgets.search.clicked.connect(self.searchClick)
 
     #删除tableview
     def delete_table_view(table_view):
@@ -518,7 +549,6 @@ class MainWindow(QMainWindow):
 
     #设一个全局变量，存数据库中所有的包含内容（数据库-三种方法-表）
     dblist = []
-    global dblist
     #初始化数据一览（数据库全展示）
     def sql_init(self):
         #初始化全部数据库
@@ -552,41 +582,41 @@ class MainWindow(QMainWindow):
             result1 = cursor1.fetchall()
             for re1 in result1:
                 str1 = re1[0].decode('utf-8')
-                sqlitem.append(TreeWidgetItem(id, gcid, str1, icon=QIcon("D:/4work_now/20240819GS/20241211/Front/images/icons/cil-file.png"),extend=str1))
+                sqlitem.append(TreeWidgetItem(id, gcid, str1, icon=QIcon("D:/4work_now/20240819GS/20241211/Front/images/icons/cil-file.png")))
                 list1 = []
                 list1.append(dbname)
                 list1.append('水准测段高差稳定计算')
                 list1.append(str1)
-                dblist.append(list1)
+                self.dblist.append(list1)
                 id = id + 1
             sqlstr2 = 'SELECT TableName FROM GS_Input_Param;'
             cursor1.execute(sqlstr2)
             result2 = cursor1.fetchall()
             for re2 in result2:
                 str2 = re2[0].decode('utf-8')
-                sqlitem.append(TreeWidgetItem(id, gsid, str2, icon=QIcon("D:/4work_now/20240819GS/20241211/Front/images/icons/cil-file.png"),extend=str2))
+                sqlitem.append(TreeWidgetItem(id, gsid, str2, icon=QIcon("D:/4work_now/20240819GS/20241211/Front/images/icons/cil-file.png")))
                 list2 = []
                 list2.append(dbname)
                 list2.append('控制网复测平面基准计算')
                 list2.append(str2)
-                dblist.append(list2)
+                self.dblist.append(list2)
                 id = id + 1
             sqlstr3 = 'SELECT TableName FROM WD_Input_Param;'
             cursor1.execute(sqlstr3)
             result3 = cursor1.fetchall()
             for re3 in result3:
                 str3 = re3[0].decode('utf-8')
-                sqlitem.append(TreeWidgetItem(id, wdid, str3, icon=QIcon("D:/4work_now/20240819GS/20241211/Front/images/icons/cil-file.png"),extend=str3))
+                sqlitem.append(TreeWidgetItem(id, wdid, str3, icon=QIcon("D:/4work_now/20240819GS/20241211/Front/images/icons/cil-file.png")))
                 list3 = []
                 list3.append(dbname)
                 list3.append('平面控制网稳定性计算')
                 list3.append(str3)
-                dblist.append(list3)
+                self.dblist.append(list3)
                 id = id + 1
         return sqlitem
 
     #关键词查询
-    def sql_search(self):
+    def searchClick(self):
         # GET BUTTON CLICKED
         btn = self.sender()
         btnName = btn.objectName()
@@ -595,7 +625,7 @@ class MainWindow(QMainWindow):
         #符合的list
         fhlist = []
         #查询(待优化)
-        for list1 in dblist:
+        for list1 in self.dblist:
             for li in list1:
                 if text1 in li:
                     fhlist.append(list1)
@@ -608,30 +638,51 @@ class MainWindow(QMainWindow):
         id = 1
         pid = 0
         fid = 0
+        zdy = []
         for list2 in fhlist:
             dbname = list2[0]
             if dbname != str1:
                 str1 = dbname
+                pid = id
+                str2 = ''
                 sqlitem.append(TreeWidgetItem(id, 0, dbname, icon=QIcon(
                     "D:/4work_now/20240819GS/20241211/Front/images/icons/cil-clone.png")))
-                pid = id
+            zdy1 = []
+            zdy1.append(id)
+            zdy1.append(0)
+            zdy1.append(dbname)
+            zdy.append(zdy1)
             id = id + 1
             mename = list2[1]
             if mename != str2:
                 str2 = mename
+                fid = id
                 sqlitem.append(TreeWidgetItem(id, pid, mename, icon=QIcon(
                     "D:/4work_now/20240819GS/20241211/Front/images/icons/cil-description.png")))
-                fid = id
+            zdy1 = []
+            zdy1.append(id)
+            zdy1.append(pid)
+            zdy1.append(mename)
+            zdy.append(zdy1)
             id = id + 1
             sqlitem.append(TreeWidgetItem(id, fid, list2[2], icon=QIcon(
                 "D:/4work_now/20240819GS/20241211/Front/images/icons/cil-file.png"), extend=list2[2]))
+            zdy1 = []
+            zdy1.append(id)
+            zdy1.append(fid)
+            zdy1.append(list2[2])
+            zdy.append(zdy1)
+            id = id + 1
         #展示
-
-
-
-
-
-
+        self.itemClicked: Signal = Signal(object)
+        self.itemDoubleClicked: Signal = Signal(object)
+        sqltree = ElTreeData(items=sqlitem)
+        self.data = sqltree
+        # 将按钮的点击信号绑定到当前类的点击信号
+        # 信号改为展示方法，这里同导出展示
+        self.ui.qureyTreeWidget.itemClicked.connect(lambda extend: print("单击->扩展数据为：", extend))
+        self.ui.qureyTreeWidget.itemDoubleClicked.connect(lambda extend: print("双击->扩展数据为：", extend))
+        self.__render_items1(True)
 
     #直接这个基础上改点选输出表格（未改）
     def computeClick(self):