From c914e43ceaf92e0773c97b78ca5b1bc7e00604da Mon Sep 17 00:00:00 2001
From: zhangsheng <zhangs1125@sina.com>
Date: Mon, 25 Nov 2024 14:55:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=95=8C=E9=9D=A2=EF=BC=8C?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BB=A7=E7=94=B5=E5=99=A81,2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Configuration.cpp |  6 ++++++
 HistoryAlarm.cpp  | 12 +++++++-----
 RealTimeAlarm.cpp |  6 ++++--
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/Configuration.cpp b/Configuration.cpp
index f17b5a1..19f76d6 100644
--- a/Configuration.cpp
+++ b/Configuration.cpp
@@ -557,6 +557,12 @@ void CConfiguration::on_pushButton_confirm_clicked()
     }else if(ui->radioButton_10->isChecked()){
         flag = 1;
         ConfiguraitonsObj = SelectChannel(12);
+    }else if(ui->radioButton_11->isChecked()){
+        flag = 1;
+        ConfiguraitonsObj = SelectChannel(1);
+    }else if(ui->radioButton_12->isChecked()){
+        flag = 1;
+        ConfiguraitonsObj = SelectChannel(2);
     }
 
     if(flag == -1){
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);