|
@@ -115,30 +115,46 @@ void DataTableWidget::updateCurrentTable()
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
- // 设置顶部水平方向标题
|
|
|
QStandardItemModel *model = (QStandardItemModel *)table->model();
|
|
|
- CNodeData n = m_mind1->nodesInLevel(m_currentPage)[c];
|
|
|
- QList<CNodeData> hList = m_mind1->subNodes(n);
|
|
|
+
|
|
|
+ // 设置顶部水平方向标题
|
|
|
+ int hIndex = 0;
|
|
|
+ // 技术措施重要度评估数据表, 增加一列指标权重
|
|
|
+ if (m_process.indexType == ProjectManager::TechIndex) {
|
|
|
+ QStandardItem *item = new QStandardItem("指标权重");
|
|
|
+ model->setHorizontalHeaderItem(hIndex++, item);
|
|
|
+ }
|
|
|
+ // 指标
|
|
|
+ CNodeData n = m_mind1->nodesInLevel(m_currentPage)[c];
|
|
|
+ QList<CNodeData> hList = m_mind1->subNodes(n);
|
|
|
for (int i = 0; i < hList.count(); i++) {
|
|
|
CNodeData node = hList[i];
|
|
|
QStandardItem *item = new QStandardItem(node.name);
|
|
|
item->setToolTip(node.remark);
|
|
|
- model->setHorizontalHeaderItem(i, item);
|
|
|
+ model->setHorizontalHeaderItem(i + hIndex, item);
|
|
|
}
|
|
|
|
|
|
- QList<CNodeData> vList = hList;
|
|
|
- if (m_mind2->nodeList().count() > 0) {
|
|
|
- vList = m_mind2->leaves();
|
|
|
+ // 设置左侧垂直方向标题
|
|
|
+ QList<CNodeData> vList;
|
|
|
+ if (m_process.indexType == ProjectManager::AbilityIndex && m_process.dSource == SchemePlanManager::FromExpert) {
|
|
|
+ vList = hList;
|
|
|
}
|
|
|
|
|
|
+ if (m_process.indexType == ProjectManager::TechIndex) {
|
|
|
+ vList = m_mind2->leaves();
|
|
|
+ }
|
|
|
for (int i = 0; i < vList.count(); i++) {
|
|
|
- // 设置左侧垂直方向标题
|
|
|
CNodeData node = vList[i];
|
|
|
QStandardItem *item = new QStandardItem(QString(" %1 ").arg(node.name));
|
|
|
item->setToolTip(node.remark);
|
|
|
model->setVerticalHeaderItem(i, item);
|
|
|
+ table->setRowHeight(i, 35);
|
|
|
+ }
|
|
|
|
|
|
- // 填充单元格
|
|
|
+ return;
|
|
|
+
|
|
|
+ // 填充单元格
|
|
|
+ for (int i = 0; i < vList.count(); i++) {
|
|
|
for (int j = 0; j < hList.count(); j++) {
|
|
|
QStandardItem *item = new QStandardItem();
|
|
|
item->setEditable(false);
|