From 5efd96cc316f8a704f0f6315b85078b738ddee04 Mon Sep 17 00:00:00 2001
From: wumu <mayi@mayi.com>
Date: 星期二, 26 十一月 2024 23:37:02 +0800
Subject: [PATCH] 1126

---
 internal_system_v1/clientmainwindow.h |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/internal_system_v1/clientmainwindow.h b/internal_system_v1/clientmainwindow.h
index c7f4023..3640fca 100644
--- a/internal_system_v1/clientmainwindow.h
+++ b/internal_system_v1/clientmainwindow.h
@@ -21,6 +21,8 @@
 #include "problemrectificationresult.h"
 #include "tableitemdelegate.h"
 #include <QItemDelegate>
+#include "threemergeproblemlist.h"
+
 
 namespace Ui {
 class ClientMainWindow;
@@ -39,6 +41,11 @@
     bool readDataFromSQL(QString name);
     void calc(); // 缁熻缁撴灉锛屽澶勫湴鏂硅Е鍙戜簡鑷姩璋冪敤
     void searchComName();
+
+    void delay(int msec); // 寤舵椂澶勭悊
+
+signals:
+    void loadExcelSignal();
 
 private slots:
     void on_pushButton_auditPro_clicked();
@@ -81,6 +88,12 @@
 
     void on_comboBox_currentIndexChanged(const QString &arg1);
 
+    void on_pushButton_reset_clicked();
+
+    void updateComboList(QMap<QString,ComInfo> & nameAndComInfos); // 鏇存柊涓嬫媺妗嗗垪琛�
+
+    void on_pushButton_save_export_clicked();
+
 signals:
     void sendDataToAuditProject(QVariantList);
     void sendDataToAuditWorkLoad(QVariantList);
@@ -113,6 +126,9 @@
     TableItemDelegate *m_tableItemDelegate;
     QItemDelegate *m_editDelegate; // 鍙紪杈�
 
+    // 3鍚堜竴
+    ThreeMergeProblemList *m_threeMPList;
+
 };
 
 #endif // CLIENTMAINWINDOW_H

--
Gitblit v1.8.0