chengxr 1 year ago
parent
commit
09c19dd5e2

+ 0 - 2
QFD/QFD.pro

@@ -64,7 +64,6 @@ SOURCES += \
     view/AboutView.cpp \
     view/CreateProjView.cpp \
     view/EvaluateView.cpp \
-    view/ExpertConfigView.cpp \
     view/ExpertInfoView.cpp \
     view/ExpertManageView.cpp \
     view/HomeView.cpp \
@@ -85,7 +84,6 @@ HEADERS += \
     view/AboutView.h \
     view/CreateProjView.h \
     view/EvaluateView.h \
-    view/ExpertConfigView.h \
     view/ExpertInfoView.h \
     view/ExpertManageView.h \
     view/HomeView.h \

+ 0 - 6
QFD/view/ExpertConfigView.cpp

@@ -1,6 +0,0 @@
-#include "ExpertConfigView.h"
-
-ExpertConfigView::ExpertConfigView(QWidget *parent) : QWidget(parent)
-{
-
-}

+ 0 - 18
QFD/view/ExpertConfigView.h

@@ -1,18 +0,0 @@
-#ifndef EXPERTCONFIGVIEW_H
-#define EXPERTCONFIGVIEW_H
-
-#include <QWidget>
-
-///
-/// \brief The ExpertConfigView class
-/// 专家配置页面
-class ExpertConfigView : public QWidget
-{
-    Q_OBJECT
-public:
-    explicit ExpertConfigView(QWidget *parent = nullptr);
-
-signals:
-};
-
-#endif  // EXPERTCONFIGVIEW_H

+ 3 - 14
QFD/view/HomeView.cpp

@@ -1,14 +1,13 @@
 #include "HomeView.h"
 
 #include "CreateProjView.h"
+#include "ProjectStateWidget.h"
 
 #include <Widgets/Button.h>
 #include <Widgets/LineEdit.h>
 
 #include <QBoxLayout>
 #include <QLabel>
-#include <QTableWidget>
-#include <QHeaderView>
 
 #include <QDebug>
 
@@ -35,16 +34,7 @@ void HomeView::initialize()
     m_searchLineEdit->setMinimumWidth(300);
     m_createProjPushButton = new PushButton("新建工程", NEWFLICON(FluentIcon, ADD), this);
 
-    m_projTableWidget = new QTableWidget(this);
-    m_projTableWidget->setEditTriggers(QAbstractItemView::NoEditTriggers);
-    m_projTableWidget->setSelectionBehavior(QAbstractItemView::SelectRows);
-    m_projTableWidget->setSelectionMode(QAbstractItemView::NoSelection);
-    m_projTableWidget->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
-    m_projTableWidget->verticalHeader()->setVisible(false);
-    const QStringList headers = { "工程名", "工程类型", "专家信息", "评估状态" };
-    m_projTableWidget->setColumnCount(headers.count());
-    m_projTableWidget->setHorizontalHeaderLabels(headers);
-    m_projTableWidget->setStyleSheet("border: 1px solid rgba(0, 0, 0, 0.073)");
+    m_projStateWidget = new ProjectStateWidget(this);
 
     m_createProjView = new CreateProjView(this);
 }
@@ -60,8 +50,7 @@ void HomeView::initLayout()
     m_hBoxLayout->addWidget(m_searchLineEdit, 0, Qt::AlignLeft);
     m_hBoxLayout->addWidget(m_createProjPushButton, 1, Qt::AlignLeft);
 
-    m_vBoxLayout->addSpacing(15);
-    m_vBoxLayout->addWidget(m_projTableWidget);
+    m_vBoxLayout->addWidget(m_projStateWidget);
 }
 
 void HomeView::connectSignalsAndSlots()

+ 2 - 3
QFD/view/HomeView.h

@@ -4,6 +4,7 @@
 #include <QWidget>
 
 class CreateProjView;
+class ProjectStateWidget;
 
 class PushButton;
 class SearchLineEdit;
@@ -12,8 +13,6 @@ class QVBoxLayout;
 class QHBoxLayout;
 class QLabel;
 
-class QTableWidget;
-
 ///
 /// \brief The HomeView class
 /// 首页
@@ -38,7 +37,7 @@ private:
     SearchLineEdit *m_searchLineEdit   = nullptr;
     PushButton *m_createProjPushButton = nullptr;
 
-    QTableWidget *m_projTableWidget = nullptr;
+    ProjectStateWidget *m_projStateWidget = nullptr;
 
     CreateProjView *m_createProjView = nullptr;
 };

+ 14 - 14
QFD/view/MainWindow.cpp

@@ -78,12 +78,12 @@ void MainWindow::initialize()
     m_stackWidget   = new StackedWidget(this);
     m_naviInterface = new NavigationInterface(true, true, this);
 
-    m_homeView    = new HomeView(this);
-    m_loginView   = new LoginView(this);
-    m_projectView = new ProjectView(this);
-    m_dataView    = new EvaluateView(this);
-    m_expertView  = new ExpertManageView(this);
-    m_aboutView   = new AboutView(this);
+    m_homeView         = new HomeView(this);
+    m_loginView        = new LoginView(this);
+    m_projectView      = new ProjectView(this);
+    m_evaluateView     = new EvaluateView(this);
+    m_expertManageView = new ExpertManageView(this);
+    m_aboutView        = new AboutView(this);
 }
 
 void MainWindow::initWindow()
@@ -129,14 +129,14 @@ void MainWindow::initNavigation()
     m_naviInterface->addItem(m_projectView->objectName(), NEWFLICON(FluentIcon, DOCUMENT), "工程", this,
                              SLOT(projectViewClicked()));
 
-    m_expertView->setObjectName("expertView");
-    m_stackWidget->addWidget(m_expertView);
-    m_naviInterface->addItem(m_expertView->objectName(), NEWFLICON(FluentIcon, SETTING), "专家信息管理", this,
+    m_expertManageView->setObjectName("expertManageView");
+    m_stackWidget->addWidget(m_expertManageView);
+    m_naviInterface->addItem(m_expertManageView->objectName(), NEWFLICON(FluentIcon, SETTING), "专家信息管理", this,
                              SLOT(expertViewClicked()));
 
-    m_dataView->setObjectName("dataView");
-    m_stackWidget->addWidget(m_dataView);
-    m_naviInterface->addItem(m_dataView->objectName(), NEWFLICON(FluentIcon, BOOK_SHELF), "评估数据分析", this,
+    m_evaluateView->setObjectName("evaluateView");
+    m_stackWidget->addWidget(m_evaluateView);
+    m_naviInterface->addItem(m_evaluateView->objectName(), NEWFLICON(FluentIcon, BOOK_SHELF), "评估数据分析", this,
                              SLOT(dataViewClicked()));
 
     m_naviInterface->addSeparator();
@@ -204,7 +204,7 @@ void MainWindow::projectViewClicked()
 
 void MainWindow::expertViewClicked()
 {
-    switchTo(m_expertView);
+    switchTo(m_expertManageView);
 }
 
 void MainWindow::aboutViewClicked()
@@ -214,5 +214,5 @@ void MainWindow::aboutViewClicked()
 
 void MainWindow::dataViewClicked()
 {
-    switchTo(m_dataView);
+    switchTo(m_evaluateView);
 }

+ 2 - 2
QFD/view/MainWindow.h

@@ -79,8 +79,8 @@ private:
 
     HomeView *m_homeView;
     ProjectView *m_projectView;
-    ExpertManageView *m_expertView;
-    EvaluateView *m_dataView;
+    ExpertManageView *m_expertManageView;
+    EvaluateView *m_evaluateView;
     LoginView *m_loginView;
     AboutView *m_aboutView;
 };

+ 4 - 3
QFD/view/ProjectView.h

@@ -1,8 +1,10 @@
-#ifndef PROJECTVIEW_H
+#ifndef PROJECTVIEW_H
 #define PROJECTVIEW_H
 
 #include <QWidget>
 
+/// 工程视图
+/// 可以查看和编辑指标体系、配置专家
 class ProjectView : public QWidget
 {
     Q_OBJECT
@@ -10,7 +12,6 @@ public:
     explicit ProjectView(QWidget *parent = nullptr);
 
 signals:
-
 };
 
-#endif // PROJECTVIEW_H
+#endif  // PROJECTVIEW_H

+ 27 - 1
QFD/widgets/ProjectStateWidget.cpp

@@ -1,6 +1,32 @@
-#include "ProjectStateWidget.h"
+#include "ProjectStateWidget.h"
+
+#include <QTableWidget>
+#include <QHeaderView>
+#include <QBoxLayout>
 
 ProjectStateWidget::ProjectStateWidget(QWidget *parent) : QWidget(parent)
 {
+    initialize();
+    initLayout();
+}
+
+void ProjectStateWidget::initialize()
+{
+    m_vBoxLayout = new QVBoxLayout(this);
 
+    m_projTableWidget = new QTableWidget(this);
+    m_projTableWidget->setEditTriggers(QAbstractItemView::NoEditTriggers);
+    m_projTableWidget->setSelectionBehavior(QAbstractItemView::SelectRows);
+    m_projTableWidget->setSelectionMode(QAbstractItemView::NoSelection);
+    m_projTableWidget->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
+    m_projTableWidget->verticalHeader()->setVisible(false);
+    const QStringList headers = { "工程名", "工程类型", "专家信息", "评估状态" };
+    m_projTableWidget->setColumnCount(headers.count());
+    m_projTableWidget->setHorizontalHeaderLabels(headers);
+    m_projTableWidget->setStyleSheet("border: 1px solid rgba(0, 0, 0, 0.073)");
+}
+
+void ProjectStateWidget::initLayout()
+{
+    layout()->addWidget(m_projTableWidget);
 }

+ 12 - 0
QFD/widgets/ProjectStateWidget.h

@@ -3,6 +3,9 @@
 
 #include <QWidget>
 
+class QTableWidget;
+class QVBoxLayout;
+
 ///
 /// \brief The ProjectStateWidget class
 /// 工程评估状态表
@@ -13,6 +16,15 @@ public:
     explicit ProjectStateWidget(QWidget *parent = nullptr);
 
 signals:
+
+private:
+    void initialize();
+    void initLayout();
+
+private:
+    QVBoxLayout *m_vBoxLayout = nullptr;
+
+    QTableWidget *m_projTableWidget = nullptr;
 };
 
 #endif  // PROJECTSTATEWIDGET_H