chengxr 1 рік тому
батько
коміт
d88d380c76

+ 1 - 1
QFD/common/SchemePlanManager.h

@@ -96,7 +96,7 @@ public:
         Algorithm algorithm = NoAlg;
 
         /// 效能分级, 选择灰色聚类算法计算效能评估时用到
-        int efficiencyGrades = 4;
+        int efficiencyGrades = 3;
 
         bool isChecked = false;  // 是否选择了执行
         QString createTime;      // 创建时间

+ 1 - 1
QFD/shemeFlow/FlowGraphNodeWidget.cpp

@@ -134,7 +134,7 @@ void FlowGraphCommonNodeWidget::initWidget()
     m_spinBox   = new QSpinBox();
     m_spinBox->setPrefix("效能分级:");
     m_spinBox->setMaximum(100);
-    m_spinBox->setMinimum(1);
+    m_spinBox->setMinimum(3);
     m_checkBox = new QCheckBox("执行");
 
     m_layout = new QVBoxLayout(this);

+ 14 - 6
QFD/widgets/DataCollectionWidget.cpp

@@ -40,6 +40,9 @@ void DataCollectionWidget::setType(int type)
     setupTabWidget();
 }
 
+///
+/// \brief DataCollectionWidget::setupTabWidget
+/// 根据评估类型, 评估方案, 评估算法, 加载合适的数据导入界面
 void DataCollectionWidget::setupTabWidget()
 {
     m_tab->clear();
@@ -65,32 +68,38 @@ void DataCollectionWidget::setupTabWidget()
         ProjectManager::IndexType t = (ProjectManager::IndexType)i;
         QString indexName           = ProjectManager::nameOfIndexType(t);
 
+        // 效能评估方案中导入评估数据的步骤, 选择物元分析法时使用
+        SchemePlanManager::SchemeProcessInfo importEffiEvalDataProcess;
+
         for (SchemePlanManager::SchemeProcessInfo process : processList) {
-            /// 效能评估 - 灰色聚类
+            // 综合效能评估 - 灰色聚类法: 效能等级配置页面, 导入评估数据页面
             if (process.algorithm == SchemePlanManager::GCE && process.indexType == ProjectManager::EfficiencyIndex) {
                 GreyClusteringConfigWidget *gc = new GreyClusteringConfigWidget(process.efficiencyGrades);
-                m_tab->addTab(gc, indexName + " - " + "灰色聚类评估配置");
+                m_tab->addTab(gc, indexName + " - " + "灰色聚类法效能等级配置");
 
                 QVector<GreyClusteringItem> items;
                 GreyClusteringSampleTable *gs = new GreyClusteringSampleTable(items, 2, 10);
                 m_tab->addTab(gs, indexName + " - " + "收集效能评估数据");
             }
 
-            /// 效能评估 - 物元分析
+            // 综合效能评估 - 物元分析法: 效能等级配置页面, 导入评估数据页面
             if (process.algorithm == SchemePlanManager::MEA && process.indexType == ProjectManager::EfficiencyIndex) {
                 QList<MEConfigItem> items;
                 MatterElementConfigWidget *w = new MatterElementConfigWidget(items, process.efficiencyGrades);
-                m_tab->addTab(w, indexName + "-" + "物元分析评估配置");
+                m_tab->addTab(w, indexName + "-" + "物元分析法效能等级配置");
 
-                DataTableWidget *table = new DataTableWidget(process, this);
+                DataTableWidget *table = new DataTableWidget(importEffiEvalDataProcess, this);
                 table->mind1()->setNodeList(nodeListMap[i]);
                 table->setCurrentPage(1);
                 m_tab->addTab(table, indexName + " - " + "收集效能评估数据");
             }
 
+            // 导入效能评估的权重分析数据
+            // 导入其他评估的权重分析数据和评估数据
             if (process.dSource >= 0) {
                 if (process.type == SchemePlanManager::ImportEvalData
                     && process.indexType == ProjectManager::EfficiencyIndex) {
+                    importEffiEvalDataProcess = process;
                     continue;
                 }
 
@@ -110,7 +119,6 @@ void DataCollectionWidget::setupTabWidget()
 
 void DataCollectionWidget::slotTabCurrentChanged(int index)
 {
-
     DataTableWidget *table = dynamic_cast<DataTableWidget *>(m_tab->widget(index));
     if (index >= 0 && table != nullptr) {
         bool expert = (table->process().dSource == SchemePlanManager::FromExpert);