diff --git a/Configuration.cpp b/Configuration.cpp index 0dc7eed..bd32c78 100644 --- a/Configuration.cpp +++ b/Configuration.cpp @@ -292,7 +292,6 @@ void CConfiguration::slotDeleteItem() } } jsonObj["channelOperate"] = 3; - QJsonDocument doc(jsonObj); QString strJson(doc.toJson(QJsonDocument::Compact)); QString strSql = QString(" values('%1','%2','%3','%4','%5',3)").arg(SN).arg(ChannelId).arg(BoardNo).arg(ChannelNoInBoard).arg(strJson); diff --git a/HistoryAlarm.cpp b/HistoryAlarm.cpp index 45555d7..3636851 100644 --- a/HistoryAlarm.cpp +++ b/HistoryAlarm.cpp @@ -13,7 +13,7 @@ CHistoryAlarm::CHistoryAlarm(QWidget *parent) : ui(new Ui::CHistoryAlarm) { ui->setupUi(this); - headerStr = QObject::tr(" ,序号,报警级别,报警内容,报警时间,复归时间,报警详情"); + headerStr = QObject::tr(" ,序号,级别,报警内容,报警时间,复归时间,报警详情"); myHeader = new TableHeaderView(Qt::Horizontal, ui->tableView); model = new QStandardItemModel(ui->tableView); ui->tableView->setSelectionBehavior(QAbstractItemView::SelectRows); //选中行 @@ -44,10 +44,12 @@ CHistoryAlarm::CHistoryAlarm(QWidget *parent) : CheckBoxDelegate *pCheckDelegate = new CheckBoxDelegate(this); ui->tableView->setItemDelegateForColumn(0, pCheckDelegate); ui->tableView->horizontalHeader()->setSectionResizeMode(QHeaderView::Interactive); - ui->tableView->setColumnWidth(0, 100); - ui->tableView->setColumnWidth(3, 450); - ui->tableView->setColumnWidth(4, 200); - ui->tableView->setColumnWidth(5, 200); + ui->tableView->setColumnWidth(0, 50); + ui->tableView->setColumnWidth(1, 50); + ui->tableView->setColumnWidth(2, 50); + ui->tableView->setColumnWidth(3, 370); + ui->tableView->setColumnWidth(4, 170); + ui->tableView->setColumnWidth(5, 170); ui->tableView->setAlternatingRowColors(true); diff --git a/RealTimeAlarm.cpp b/RealTimeAlarm.cpp index 4b08ee8..09192a7 100644 --- a/RealTimeAlarm.cpp +++ b/RealTimeAlarm.cpp @@ -14,7 +14,7 @@ CRealTimeAlarm::CRealTimeAlarm(QWidget *parent) : { ui->setupUi(this); ui->widget_alarm->setProperty("flag", "Button"); - headerStr = QObject::tr("序号,报警级别,报警内容,报警时间,报警详情"); + headerStr = QObject::tr("序号,级别,报警内容,报警时间,报警详情"); model = new QStandardItemModel(ui->tableView); ui->tableView->setSelectionBehavior(QAbstractItemView::SelectRows); //选中行 @@ -22,7 +22,9 @@ CRealTimeAlarm::CRealTimeAlarm(QWidget *parent) : model->setHorizontalHeaderLabels(headerList); model->setColumnCount(headerList.size()); ui->tableView->setModel(model); - ui->tableView->setColumnWidth(2, 450); + ui->tableView->setColumnWidth(0, 50); + ui->tableView->setColumnWidth(1, 50); + ui->tableView->setColumnWidth(2, 370); ui->tableView->setColumnWidth(3, 200); ui->tableView->setAlternatingRowColors(true);