diff --git a/QPagedTable/QPagedTable.cpp b/QPagedTable/QPagedTable.cpp index b9ee239..1bb4af0 100644 --- a/QPagedTable/QPagedTable.cpp +++ b/QPagedTable/QPagedTable.cpp @@ -202,6 +202,21 @@ return ui->table; } +QList QPagedTable::filterCells(QString colName, QString value) +{ + QList filterList; + + int rowIdx = 0; + for (QMap rowData : datas) { + if (rowData.value(colName).toString() == value) { + filterList.append(rowIdx); + } + rowIdx++; + } + + return filterList; +} + QWidget * QPagedTable::buildNewCheckWidget() { QWidget* activeWidget = new QWidget(ui->table); diff --git a/QPagedTable/QPagedTable.cpp b/QPagedTable/QPagedTable.cpp index b9ee239..1bb4af0 100644 --- a/QPagedTable/QPagedTable.cpp +++ b/QPagedTable/QPagedTable.cpp @@ -202,6 +202,21 @@ return ui->table; } +QList QPagedTable::filterCells(QString colName, QString value) +{ + QList filterList; + + int rowIdx = 0; + for (QMap rowData : datas) { + if (rowData.value(colName).toString() == value) { + filterList.append(rowIdx); + } + rowIdx++; + } + + return filterList; +} + QWidget * QPagedTable::buildNewCheckWidget() { QWidget* activeWidget = new QWidget(ui->table); diff --git a/QPagedTable/QPagedTable.h b/QPagedTable/QPagedTable.h index a4cc823..e561d01 100644 --- a/QPagedTable/QPagedTable.h +++ b/QPagedTable/QPagedTable.h @@ -61,6 +61,7 @@ void setMultiCheckType(MultiCheckType type); QTableWidget * getTableInstance(); + QList filterCells(QString colName, QString value); private: Ui::QPagedTable *ui; diff --git a/QPagedTable/QPagedTable.cpp b/QPagedTable/QPagedTable.cpp index b9ee239..1bb4af0 100644 --- a/QPagedTable/QPagedTable.cpp +++ b/QPagedTable/QPagedTable.cpp @@ -202,6 +202,21 @@ return ui->table; } +QList QPagedTable::filterCells(QString colName, QString value) +{ + QList filterList; + + int rowIdx = 0; + for (QMap rowData : datas) { + if (rowData.value(colName).toString() == value) { + filterList.append(rowIdx); + } + rowIdx++; + } + + return filterList; +} + QWidget * QPagedTable::buildNewCheckWidget() { QWidget* activeWidget = new QWidget(ui->table); diff --git a/QPagedTable/QPagedTable.h b/QPagedTable/QPagedTable.h index a4cc823..e561d01 100644 --- a/QPagedTable/QPagedTable.h +++ b/QPagedTable/QPagedTable.h @@ -61,6 +61,7 @@ void setMultiCheckType(MultiCheckType type); QTableWidget * getTableInstance(); + QList filterCells(QString colName, QString value); private: Ui::QPagedTable *ui; diff --git a/dao/SystemDao.cpp b/dao/SystemDao.cpp index 95f0785..be0f6de 100644 --- a/dao/SystemDao.cpp +++ b/dao/SystemDao.cpp @@ -85,7 +85,7 @@ "WHERE DEL_FLAG = '0' AND ACCOUNT = :account"; sql = appendSchemaName(sql, QStringList() << "sys_user"); - qDebug() << sql; +// qDebug() << sql; query.prepare(sql); query.bindValue(":account", account); diff --git a/QPagedTable/QPagedTable.cpp b/QPagedTable/QPagedTable.cpp index b9ee239..1bb4af0 100644 --- a/QPagedTable/QPagedTable.cpp +++ b/QPagedTable/QPagedTable.cpp @@ -202,6 +202,21 @@ return ui->table; } +QList QPagedTable::filterCells(QString colName, QString value) +{ + QList filterList; + + int rowIdx = 0; + for (QMap rowData : datas) { + if (rowData.value(colName).toString() == value) { + filterList.append(rowIdx); + } + rowIdx++; + } + + return filterList; +} + QWidget * QPagedTable::buildNewCheckWidget() { QWidget* activeWidget = new QWidget(ui->table); diff --git a/QPagedTable/QPagedTable.h b/QPagedTable/QPagedTable.h index a4cc823..e561d01 100644 --- a/QPagedTable/QPagedTable.h +++ b/QPagedTable/QPagedTable.h @@ -61,6 +61,7 @@ void setMultiCheckType(MultiCheckType type); QTableWidget * getTableInstance(); + QList filterCells(QString colName, QString value); private: Ui::QPagedTable *ui; diff --git a/dao/SystemDao.cpp b/dao/SystemDao.cpp index 95f0785..be0f6de 100644 --- a/dao/SystemDao.cpp +++ b/dao/SystemDao.cpp @@ -85,7 +85,7 @@ "WHERE DEL_FLAG = '0' AND ACCOUNT = :account"; sql = appendSchemaName(sql, QStringList() << "sys_user"); - qDebug() << sql; +// qDebug() << sql; query.prepare(sql); query.bindValue(":account", account); diff --git a/frame/LoginWindowForm.cpp b/frame/LoginWindowForm.cpp index 0703b09..95fd9b6 100644 --- a/frame/LoginWindowForm.cpp +++ b/frame/LoginWindowForm.cpp @@ -98,7 +98,7 @@ ui->iptUsername->clear(); ProMemory::getInstance().setLoginUser(loginUser); - qDebug() << loginUser.value("userRole").toStringList() << loginUser.value("userRoleIndex").toStringList(); +// qDebug() << loginUser.value("userRole").toStringList() << loginUser.value("userRoleIndex").toStringList(); onLoginSuccessHandler(); } else { CustomMessageBox::failure(this, "登录失败", "账号或密码错误,请重新输入!"); diff --git a/QPagedTable/QPagedTable.cpp b/QPagedTable/QPagedTable.cpp index b9ee239..1bb4af0 100644 --- a/QPagedTable/QPagedTable.cpp +++ b/QPagedTable/QPagedTable.cpp @@ -202,6 +202,21 @@ return ui->table; } +QList QPagedTable::filterCells(QString colName, QString value) +{ + QList filterList; + + int rowIdx = 0; + for (QMap rowData : datas) { + if (rowData.value(colName).toString() == value) { + filterList.append(rowIdx); + } + rowIdx++; + } + + return filterList; +} + QWidget * QPagedTable::buildNewCheckWidget() { QWidget* activeWidget = new QWidget(ui->table); diff --git a/QPagedTable/QPagedTable.h b/QPagedTable/QPagedTable.h index a4cc823..e561d01 100644 --- a/QPagedTable/QPagedTable.h +++ b/QPagedTable/QPagedTable.h @@ -61,6 +61,7 @@ void setMultiCheckType(MultiCheckType type); QTableWidget * getTableInstance(); + QList filterCells(QString colName, QString value); private: Ui::QPagedTable *ui; diff --git a/dao/SystemDao.cpp b/dao/SystemDao.cpp index 95f0785..be0f6de 100644 --- a/dao/SystemDao.cpp +++ b/dao/SystemDao.cpp @@ -85,7 +85,7 @@ "WHERE DEL_FLAG = '0' AND ACCOUNT = :account"; sql = appendSchemaName(sql, QStringList() << "sys_user"); - qDebug() << sql; +// qDebug() << sql; query.prepare(sql); query.bindValue(":account", account); diff --git a/frame/LoginWindowForm.cpp b/frame/LoginWindowForm.cpp index 0703b09..95fd9b6 100644 --- a/frame/LoginWindowForm.cpp +++ b/frame/LoginWindowForm.cpp @@ -98,7 +98,7 @@ ui->iptUsername->clear(); ProMemory::getInstance().setLoginUser(loginUser); - qDebug() << loginUser.value("userRole").toStringList() << loginUser.value("userRoleIndex").toStringList(); +// qDebug() << loginUser.value("userRole").toStringList() << loginUser.value("userRoleIndex").toStringList(); onLoginSuccessHandler(); } else { CustomMessageBox::failure(this, "登录失败", "账号或密码错误,请重新输入!"); diff --git a/frame/MainWindowForm.ui b/frame/MainWindowForm.ui index e503a61..d3fd4fe 100644 --- a/frame/MainWindowForm.ui +++ b/frame/MainWindowForm.ui @@ -347,7 +347,7 @@ - 34.5℃ + -- ℃ @@ -380,7 +380,7 @@ - 25%Rh + -- %Rh diff --git a/QPagedTable/QPagedTable.cpp b/QPagedTable/QPagedTable.cpp index b9ee239..1bb4af0 100644 --- a/QPagedTable/QPagedTable.cpp +++ b/QPagedTable/QPagedTable.cpp @@ -202,6 +202,21 @@ return ui->table; } +QList QPagedTable::filterCells(QString colName, QString value) +{ + QList filterList; + + int rowIdx = 0; + for (QMap rowData : datas) { + if (rowData.value(colName).toString() == value) { + filterList.append(rowIdx); + } + rowIdx++; + } + + return filterList; +} + QWidget * QPagedTable::buildNewCheckWidget() { QWidget* activeWidget = new QWidget(ui->table); diff --git a/QPagedTable/QPagedTable.h b/QPagedTable/QPagedTable.h index a4cc823..e561d01 100644 --- a/QPagedTable/QPagedTable.h +++ b/QPagedTable/QPagedTable.h @@ -61,6 +61,7 @@ void setMultiCheckType(MultiCheckType type); QTableWidget * getTableInstance(); + QList filterCells(QString colName, QString value); private: Ui::QPagedTable *ui; diff --git a/dao/SystemDao.cpp b/dao/SystemDao.cpp index 95f0785..be0f6de 100644 --- a/dao/SystemDao.cpp +++ b/dao/SystemDao.cpp @@ -85,7 +85,7 @@ "WHERE DEL_FLAG = '0' AND ACCOUNT = :account"; sql = appendSchemaName(sql, QStringList() << "sys_user"); - qDebug() << sql; +// qDebug() << sql; query.prepare(sql); query.bindValue(":account", account); diff --git a/frame/LoginWindowForm.cpp b/frame/LoginWindowForm.cpp index 0703b09..95fd9b6 100644 --- a/frame/LoginWindowForm.cpp +++ b/frame/LoginWindowForm.cpp @@ -98,7 +98,7 @@ ui->iptUsername->clear(); ProMemory::getInstance().setLoginUser(loginUser); - qDebug() << loginUser.value("userRole").toStringList() << loginUser.value("userRoleIndex").toStringList(); +// qDebug() << loginUser.value("userRole").toStringList() << loginUser.value("userRoleIndex").toStringList(); onLoginSuccessHandler(); } else { CustomMessageBox::failure(this, "登录失败", "账号或密码错误,请重新输入!"); diff --git a/frame/MainWindowForm.ui b/frame/MainWindowForm.ui index e503a61..d3fd4fe 100644 --- a/frame/MainWindowForm.ui +++ b/frame/MainWindowForm.ui @@ -347,7 +347,7 @@ - 34.5℃ + -- ℃ @@ -380,7 +380,7 @@ - 25%Rh + -- %Rh diff --git a/infomation/task/DeptTaskForm.cpp b/infomation/task/DeptTaskForm.cpp index 8f956eb..208973c 100644 --- a/infomation/task/DeptTaskForm.cpp +++ b/infomation/task/DeptTaskForm.cpp @@ -149,14 +149,19 @@ item.insert("measureStatus", task.measureStatusName); pageData.append(item); - } // 设置分页表格数据 ui->tableDeptTask->setTotalCount(page.totalCount); ui->tableDeptTask->setDatas(pageData); -// qDebug() << ui->tableDeptTask->getTableInstance()->cellWidget(3, 9)->metaObject()->className(); + // 筛选 加急=是 的单元格标红提示 + QList matchedRows = ui->tableDeptTask->filterCells("isUrgent", "是"); + if (!matchedRows.isEmpty()) { + for (int row : matchedRows) { + ui->tableDeptTask->getTableInstance()->item(row, 9)->setForeground(QBrush("#FF0000")); + } + } } void DeptTaskForm::on_btnQuery_clicked()