From 080d99ce7c30d7d859f66bdcacccbe57068e66e1 Mon Sep 17 00:00:00 2001 From: duanshengchao <519970194@qq.com> Date: Mon, 1 Dec 2025 09:55:07 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E6=B7=BB=E5=8A=A0=E6=8A=A5=E8=AD=A6?= =?UTF-8?q?=E9=85=8D=E7=BD=AEalarmEventConfigDialog=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E6=A1=86=E6=9E=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 3 + include/alarmEventConfigDialog.h | 0 include/alarmEventDataView.h | 1 + include/alarmEventMainDialog.h | 10 + include/alarmEventRealTimeDock.h | 1 + include/dashboardFrame.h | 2 + resource/PowerMaster.qrc | 3 + resource/images/icon_checked_green.png | Bin 0 -> 273 bytes resource/images/icon_unchecked.png | Bin 0 -> 163 bytes resource/images/icon_unchecked_green.png | Bin 0 -> 164 bytes source/alarmEventConfigDialog.cpp | 0 source/alarmEventDataService.cpp | 4 +- source/alarmEventDataView.cpp | 8 +- source/alarmEventMainDialog.cpp | 126 +++++ source/alarmEventRealTimeDock.cpp | 1 + source/dashboardFrame.cpp | 6 + source/messageDialog.cpp | 5 +- ui/alarmEventConfigDialog.ui | 619 +++++++++++++++++++++++ ui/alarmEventMainDialog.ui | 14 +- 19 files changed, 790 insertions(+), 13 deletions(-) create mode 100644 include/alarmEventConfigDialog.h create mode 100644 resource/images/icon_checked_green.png create mode 100644 resource/images/icon_unchecked.png create mode 100644 resource/images/icon_unchecked_green.png create mode 100644 source/alarmEventConfigDialog.cpp create mode 100644 ui/alarmEventConfigDialog.ui diff --git a/CMakeLists.txt b/CMakeLists.txt index ac42696..4cee6a6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,6 +55,7 @@ set(H_HEADER_FILES include/alarmEventRealTimeDock.h include/alarmEventUtils.h include/alarmEventDataService.h + include/alarmEventConfigDialog.h ) set(CPP_SOURCE_FILES @@ -90,6 +91,7 @@ set(CPP_SOURCE_FILES source/alarmEventRealTimeDock.cpp source/alarmEventUtils.cpp source/alarmEventDataService.cpp + source/alarmEventConfigDialog.cpp ) set(UI_FILES @@ -110,6 +112,7 @@ set(UI_FILES ui/dpConfigurationDialog.ui ui/alarmEventMainDialog.ui ui/alarmEventRealTimeDock.ui + ui/alarmEventConfigDialog.ui ) set(UTIL_FILES diff --git a/include/alarmEventConfigDialog.h b/include/alarmEventConfigDialog.h new file mode 100644 index 0000000..e69de29 diff --git a/include/alarmEventDataView.h b/include/alarmEventDataView.h index 3c162a7..16e939b 100644 --- a/include/alarmEventDataView.h +++ b/include/alarmEventDataView.h @@ -65,6 +65,7 @@ public: void refresh(); bool setCurrentPage(int); + int currentPage() const; void previousPage(); void nextPage(); void firstPage(); diff --git a/include/alarmEventMainDialog.h b/include/alarmEventMainDialog.h index ec87c8d..0d8d2ab 100644 --- a/include/alarmEventMainDialog.h +++ b/include/alarmEventMainDialog.h @@ -32,15 +32,25 @@ signals: protected: void showEvent(QShowEvent* event) override; void resizeEvent(QResizeEvent*) override; + bool eventFilter(QObject*, QEvent*) override; private slots: void onSignal_subDialogClose(); void onSyncDataStatus(const PaginationInfo&); void onLoadDataError(const QString&); + //搜索条件 + void onBeginTimeChanged(); + void onEndTimeChanged(); public slots: void onBtnClicked_close(); + void onBtnClicked_firstPage(); + void onBtnClicked_previousPage(); + void onBtnClicked_nextPage(); + void onBtnClicked_lastPage(); + void onEditingFinished_page(); + private: void showTransparentMask(); void hideTransparentMask(); diff --git a/include/alarmEventRealTimeDock.h b/include/alarmEventRealTimeDock.h index 894ce81..161b205 100644 --- a/include/alarmEventRealTimeDock.h +++ b/include/alarmEventRealTimeDock.h @@ -34,6 +34,7 @@ public: signals: void alertWidgetBGColorAlphaChanged(float value); + void viewAllRealTimeEvents(); public slots: void onBtnClicked_open(); diff --git a/include/dashboardFrame.h b/include/dashboardFrame.h index 6c48b01..fd36c96 100644 --- a/include/dashboardFrame.h +++ b/include/dashboardFrame.h @@ -95,6 +95,8 @@ public slots: void onSignal_viewRealTimeData(); void onSignal_viewHistoricalData(QDateTime); + void onSignal_viewAllRealTimeEvents(); + private: Ui::dashboardFrame* ui; QString m_strName; diff --git a/resource/PowerMaster.qrc b/resource/PowerMaster.qrc index 1e5dd44..8d56199 100644 --- a/resource/PowerMaster.qrc +++ b/resource/PowerMaster.qrc @@ -1,5 +1,8 @@ + images/icon_unchecked.png + images/icon_checked_green.png + images/icon_unchecked_green.png images/icon_configuration_blue.png images/icon_checked_blue.png images/icon_search_blue.png diff --git a/resource/images/icon_checked_green.png b/resource/images/icon_checked_green.png new file mode 100644 index 0000000000000000000000000000000000000000..2fdce21b8781034d328f755fcb677d727af2222c GIT binary patch literal 273 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#S9GG!XV7ZFl!D-#bHku z$B>FSZ>K!uI;0@b@ZI9#%et=uy>SPus}7WXQ~D;M-SKO?dc=;Vlru$E3lrGeIeyhH zZx=f%6zsI&7UN@AgHl6I(|JpmozmXGo%Hb0+_UY%Du=CS|5rN@W-wESX~oAdxo?kl ziu-ToI?#CgW9g(ymIEczeKy@MJ~B07*Rhz1g{wb><~=v`HA`mTXkh2sAlsxMAXnq+ zoFK_D|4PdCnfuz*>`gXY&Dy&0=h{y``ZMc17n>=!vfZE0nRtrKN`#GX+0RoY~|(s;wF+>`@MQ}i~- zOYFUq{Ph*<+g?{DwFIWULLdG!#MfVUsO$(SeZ>?xXA9#O&Z3!HPNz8lEnx6;^>bP0 Hl+XkKF%314 literal 0 HcmV?d00001 diff --git a/resource/images/icon_unchecked_green.png b/resource/images/icon_unchecked_green.png new file mode 100644 index 0000000000000000000000000000000000000000..d5a612d2f846ae772ddef64df6500f925cfb151d GIT binary patch literal 164 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#S9GG!XV7ZFl!D-MVP0H zV@SoE|TiLSxkR&Tl1OtPCrtq#kN5m6>HZXX)`njxg HN@xNA#91z= literal 0 HcmV?d00001 diff --git a/source/alarmEventConfigDialog.cpp b/source/alarmEventConfigDialog.cpp new file mode 100644 index 0000000..e69de29 diff --git a/source/alarmEventDataService.cpp b/source/alarmEventDataService.cpp index c3429fb..9955e5c 100644 --- a/source/alarmEventDataService.cpp +++ b/source/alarmEventDataService.cpp @@ -259,11 +259,11 @@ void AlarmEventDataService::processHistoricalResponse(const QByteArray& data) return ; } + QList historicalEvents; QJsonObject obj = doc.object(); QJsonValue dataValue = obj.value("data"); if(dataValue.isArray()) { - QList historicalEvents; QJsonArray eventArray = dataValue.toArray(); int size = eventArray.size(); for(int i = 0; i < size; ++i) @@ -277,8 +277,8 @@ void AlarmEventDataService::processHistoricalResponse(const QByteArray& data) if(validateEvent(event)) historicalEvents.append(event); } - emit historicalQueryData(historicalEvents); } + emit historicalQueryData(historicalEvents); } // ==================== 槽函数 ==================== diff --git a/source/alarmEventDataView.cpp b/source/alarmEventDataView.cpp index 36fae81..1ab5d05 100644 --- a/source/alarmEventDataView.cpp +++ b/source/alarmEventDataView.cpp @@ -175,7 +175,7 @@ void AlarmEventDataModel::iniHeaderData() m_headerData.emplace_back(SectionData("间隔", 200, Bay)); m_headerData.emplace_back(SectionData("信息", -1, Description)); m_headerData.emplace_back(SectionData("类型", 160, Type)); - m_headerData.emplace_back(SectionData("等级", 160, Severity)); + m_headerData.emplace_back(SectionData("级别", 160, Severity)); m_headerData.emplace_back(SectionData("确认状态", 150, Status)); m_headerData.emplace_back(SectionData("操作", 180, Operation)); } @@ -382,12 +382,18 @@ bool AlarmEventDataModel::setCurrentPage(int page) { m_paginationInfo.currentPage = page; updateCurPageData(); + emit syncDataStatus(m_paginationInfo); return true; } return false; } +int AlarmEventDataModel::currentPage() const +{ + return m_paginationInfo.currentPage; +} + void AlarmEventDataModel::previousPage() { if(m_paginationInfo.currentPage == 1) diff --git a/source/alarmEventMainDialog.cpp b/source/alarmEventMainDialog.cpp index 8ac8bd7..c9982db 100644 --- a/source/alarmEventMainDialog.cpp +++ b/source/alarmEventMainDialog.cpp @@ -4,6 +4,8 @@ #include "messageDialog.h" //#include "dashboardFrame.h" #include "alarmEventDataView.h" +#include +#include AlarmEventMainDialog::AlarmEventMainDialog(QWidget *parent) : QDialog(parent) @@ -16,11 +18,19 @@ AlarmEventMainDialog::AlarmEventMainDialog(QWidget *parent) setWindowFlags(Qt::FramelessWindowHint); setAttribute(Qt::WA_TranslucentBackground); + //正则表达式，只能输入数字 + QRegularExpression regExp("[0-9]+"); + QRegularExpressionValidator* validator = new QRegularExpressionValidator(regExp, this); + ui->lineEditPage->setValidator(validator); + ui->lineEditPage->installEventFilter(this); + //时间范围初始化 QDateTime endTime = QDateTime::currentDateTime(); QDateTime beginTime = QDateTime::currentDateTime().addDays(-15); ui->endTime->setDateTime(endTime); + ui->endTime->installEventFilter(this); ui->beginTime->setDateTime(beginTime); + ui->beginTime->installEventFilter(this); m_eventFilter.setTimeRange(beginTime, endTime); m_tableView = new AlarmEventDataView(Historical_All, this); @@ -30,6 +40,11 @@ AlarmEventMainDialog::AlarmEventMainDialog(QWidget *parent) connect(m_tableView->model(), &AlarmEventDataModel::loadDataError, this, &AlarmEventMainDialog::onLoadDataError); connect(ui->btnClose, &QPushButton::clicked, this, &AlarmEventMainDialog::onBtnClicked_close); + + connect(ui->btnFirstPage, &QPushButton::clicked, this, &AlarmEventMainDialog::onBtnClicked_firstPage); + connect(ui->btnPreviousPage, &QPushButton::clicked, this, &AlarmEventMainDialog::onBtnClicked_previousPage); + connect(ui->btnNextPage, &QPushButton::clicked, this, &AlarmEventMainDialog::onBtnClicked_nextPage); + connect(ui->btnLastPage, &QPushButton::clicked, this, &AlarmEventMainDialog::onBtnClicked_lastPage); } AlarmEventMainDialog::~AlarmEventMainDialog() @@ -48,6 +63,51 @@ void AlarmEventMainDialog::resizeEvent(QResizeEvent* event) m_pTransparentMask->setGeometry(0, 0, this->width(), this->height()); } +bool AlarmEventMainDialog::eventFilter(QObject* obj, QEvent* event) +{ + if(obj == ui->lineEditPage) + { + if(event->type() == QEvent::KeyPress) + { + QKeyEvent* pKeyEvent = static_cast(event); + if (pKeyEvent->key() == Qt::Key_Enter || pKeyEvent->key() == Qt::Key_Return) + { + onEditingFinished_page(); + } + } + else if(event->type() == QEvent::FocusOut) + onEditingFinished_page(); + } + else if(obj == ui->beginTime) + { + if(event->type() == QEvent::KeyPress) + { + QKeyEvent* pKeyEvent = static_cast(event); + if (pKeyEvent->key() == Qt::Key_Enter || pKeyEvent->key() == Qt::Key_Return) + { + onBeginTimeChanged(); + } + } + else if(event->type() == QEvent::FocusOut) + onBeginTimeChanged(); + } + else if(obj == ui->endTime) + { + if(event->type() == QEvent::KeyPress) + { + QKeyEvent* pKeyEvent = static_cast(event); + if (pKeyEvent->key() == Qt::Key_Enter || pKeyEvent->key() == Qt::Key_Return) + { + onEndTimeChanged(); + } + } + else if(event->type() == QEvent::FocusOut) + onEndTimeChanged(); + } + + return QWidget::eventFilter(obj, event); +} + void AlarmEventMainDialog::showTransparentMask() { if(m_pTransparentMask == nullptr) @@ -125,9 +185,75 @@ void AlarmEventMainDialog::onLoadDataError(const QString& error) showMessageDialog(type_warning, QString("错误"), QString("加载数据失败(%1)").arg(error)); } +void AlarmEventMainDialog::onBeginTimeChanged() +{ + //qDebug() << "beginTimeChanged: " << ui->beginTime->dateTime().toString("yyyy-MM-dd hh:mm:ss"); + qint64 beginTime = ui->beginTime->dateTime().toMSecsSinceEpoch(); + qint64 endTime = ui->endTime->dateTime().toMSecsSinceEpoch(); + if(beginTime > endTime) + { + showTransparentMask(); + showMessageDialog(type_warning, QString("错误"), QString("'最早时间' 不能晚于 '最后时间'")); + return; + } + + if(m_eventFilter.beginTime() == ui->beginTime->dateTime()) + return; + + m_eventFilter.setTimeRange(ui->beginTime->dateTime(), ui->endTime->dateTime()); + m_tableView->model()->setFilter(m_eventFilter); +} + +void AlarmEventMainDialog::onEndTimeChanged() +{ + qint64 beginTime = ui->beginTime->dateTime().toMSecsSinceEpoch(); + qint64 endTime = ui->endTime->dateTime().toMSecsSinceEpoch(); + if(beginTime > endTime) + { + showTransparentMask(); + showMessageDialog(type_warning, QString("错误"), QString("'最后时间' 不能早于 '最早时间'")); + return; + } + + if(m_eventFilter.endTime() == ui->endTime->dateTime()) + return; + + m_eventFilter.setTimeRange(ui->beginTime->dateTime(), ui->endTime->dateTime()); + m_tableView->model()->setFilter(m_eventFilter); +} + void AlarmEventMainDialog::onBtnClicked_close() { //reject(); hide(); emit sgl_hide(); } + +void AlarmEventMainDialog::onBtnClicked_firstPage() +{ + m_tableView->model()->firstPage(); +} + +void AlarmEventMainDialog::onBtnClicked_previousPage() +{ + m_tableView->model()->previousPage(); +} + +void AlarmEventMainDialog::onBtnClicked_nextPage() +{ + m_tableView->model()->nextPage(); +} + +void AlarmEventMainDialog::onBtnClicked_lastPage() +{ + m_tableView->model()->lastPage(); +} + +void AlarmEventMainDialog::onEditingFinished_page() +{ + //qInfo() << "onEditingFinished_page"; + QString strPage = ui->lineEditPage->text(); + bool result = m_tableView->model()->setCurrentPage(strPage.toInt()); + if(!result) + ui->lineEditPage->setText(QString::number(m_tableView->model()->currentPage())); +} diff --git a/source/alarmEventRealTimeDock.cpp b/source/alarmEventRealTimeDock.cpp index 8385abe..e161557 100644 --- a/source/alarmEventRealTimeDock.cpp +++ b/source/alarmEventRealTimeDock.cpp @@ -191,6 +191,7 @@ void AlarmEventRealTimeDock::onBtnClicked_confirmAll() void AlarmEventRealTimeDock::onBtnClicked_checkAll() { + emit viewAllRealTimeEvents(); } void AlarmEventRealTimeDock::onSIG_receivedNewAlarm(const EventData& event) diff --git a/source/dashboardFrame.cpp b/source/dashboardFrame.cpp index a92b785..07b309f 100644 --- a/source/dashboardFrame.cpp +++ b/source/dashboardFrame.cpp @@ -48,6 +48,7 @@ DashboardFrame::DashboardFrame(const QString& strName, dashboardFrame::frameType if(m_type == dashboardFrame::ft_main) //只有主window具有报警提示 { m_pAlarmEventRealTimeDock = new AlarmEventRealTimeDock(this); + connect(m_pAlarmEventRealTimeDock, &AlarmEventRealTimeDock::viewAllRealTimeEvents, this, &DashboardFrame::onSignal_viewAllRealTimeEvents); } else { @@ -774,3 +775,8 @@ void DashboardFrame::onSignal_viewHistoricalData(QDateTime dateTime) m_pDateTimeWidget->setState(historical); } } + +void DashboardFrame::onSignal_viewAllRealTimeEvents() +{ + onBtnClicked_showRealtimeEvents(); +} diff --git a/source/messageDialog.cpp b/source/messageDialog.cpp index b3a996f..0a3caf6 100644 --- a/source/messageDialog.cpp +++ b/source/messageDialog.cpp @@ -84,13 +84,12 @@ void MessageDialog::setMessage(MessageDialogType type,const QString& strTitle,co setType(type); int maxLength = 25; ui->labelTitle->setText(strTitle); - qInfo() << getStringLength(strContent); + //qInfo() << getStringLength(strContent); if(getStringLength(strContent) > maxLength) { - //QString& strText = const_cast(strContent); QString strText(strContent); int index = getIndexForLength(strContent, maxLength); - qInfo() << index; + //qInfo() << index; strText.insert(index, "\n"); //实现简单自动换行 ui->labelContent->setText(strText); } diff --git a/ui/alarmEventConfigDialog.ui b/ui/alarmEventConfigDialog.ui new file mode 100644 index 0000000..3fe8091 --- /dev/null +++ b/ui/alarmEventConfigDialog.ui @@ -0,0 +1,619 @@ + + + alarmEventConfigDialog + + + + 0 + 0 + 501 + 334 + + + + Dialog + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + QWidget #contentWidget +{ +border:1px solid rgb(76,88,105); +background-color:rgba(36,43,50,250); +} + +QLabel +{ +font: 12pt "黑体"; +color: rgb(250, 250, 250); +} + +QRadioButton +{ +spacing:8px; +font: 12pt "黑体"; +color: rgb(250, 250, 250); +} +QRadioButton::indicator +{ +width:36px; +height:20px; +} +QRadioButton::indicator:unchecked +{ +image: url(:/images/ico_switch_off.png); +} +QRadioButton::indicator:checked +{ +image: url(:/images/ico_switch_on.png); +} + +QCheckBox +{ +spacing:5px; +font: 12pt "黑体"; +color: rgb(250, 250, 250); +} +QCheckBox::indicator +{ +width:24px; +height:24px; +} +QCheckBox::indicator:checked +{ +image: url(:/images/icon_checked_green.png); +} +QCheckBox::indicator:unchecked +{ +image: url(:/images/icon_unchecked.png); +} + +QLineEdit +{ +font: 12pt "黑体"; +color: rgb(250, 250, 250); +border:1px solid rgb(200,200,200); +background:transparent; +} +QLineEdit:focus +{ +border:1px solid rgb(67,160,249); +} + +QComboBox +{ +font: 11pt "黑体"; +color: rgb(250, 250, 250); +background-color: rgb(54, 62, 74); +border: 0px; +border-radius: 0px; +} +QComboBox:hover +{ +background-color: rgb(72, 83, 99); +} +QComboBox::drop-down +{ +border:0px; +} +QComboBox::down-arrow +{ +margin-right:10px; +width:14px; +border-image: url(:/images/down-arrow.png); +} +QComboBox QAbstractItemView +{ +outline: 0px; /*去除选中虚线框 */ +border:0px; +background-color:rgba(25,25,25,220); +} +QComboBox QAbstractItemView::item:hover +{ +background-color: rgb(43, 102, 158); +} +QComboBox QAbstractItemView::item:selected +{ +color: rgb(250, 250, 250); +background-color: rgba(43, 102, 158, 80); +} + + + + + + 25 + 20 + 451 + 31 + + + + color: rgb(250, 250, 250); +font: 700 13pt "微软雅黑"; +border:0.5px solid rgb(250,250,250); +border-left:0px; +border-top:0px; +border-right:0px; + + + 报警配置 + + + + + + 25 + 60 + 451 + 46 + + + + QWidget #tabBar +{ + background-color: rgb(54, 62, 74); + border-bottom:1px solid rgb(200,200,200); +} + + + + + 110 + 16 + 100 + 30 + + + + PointingHandCursor + + + QPushButton +{ +color: rgb(250, 250, 250); +font: 700 12pt "黑体"; +border:0px; +background-color:transparent; +} +QPushButton:hover +{ +} +QPushButton:pressed +{ +} + + + 通知设置 + + + + + + 10 + 16 + 100 + 30 + + + + PointingHandCursor + + + QPushButton +{ +color: rgb(250, 250, 250); +font: 700 12pt "黑体"; +border:1px solid rgb(200,200,200); +border-bottom:0px; +background-color:rgba(36,43,50, 250); +} +QPushButton:hover +{ +} +QPushButton:pressed +{ +} + + + 数据筛选 + + + + + + + 25 + 110 + 451 + 171 + + + + 0 + + + + QWidget #page_dataFilter +{ +background-color:transparent; +} + + + + + + 0 + 10 + 101 + 21 + + + + 报警级别 + + + + + + 35 + 45 + 71 + 19 + + + + 告知 + + + true + + + + + + 140 + 45 + 71 + 19 + + + + 预警 + + + true + + + + + + 245 + 45 + 71 + 19 + + + + 异常 + + + true + + + + + + 350 + 45 + 71 + 19 + + + + 事故 + + + true + + + + + + 0 + 90 + 101 + 21 + + + + 事件类型 + + + + + + 35 + 125 + 91 + 19 + + + + 硬事件 + + + true + + + + + + 155 + 125 + 121 + 19 + + + + 平台软事件 + + + true + + + + + + 305 + 125 + 121 + 19 + + + + 应用软事件 + + + true + + + + + + QWidget #page_notifySetting +{ +background-color:transparent; +} + + + + + + 35 + 40 + 121 + 31 + + + + 声音提示 + + + true + + + false + + + + + + 180 + 40 + 121 + 31 + + + + 自动弹窗 + + + true + + + false + + + + + + 0 + 10 + 101 + 21 + + + + 报警提示 + + + + + + 0 + 90 + 101 + 21 + + + + 弹窗设置 + + + + + + 140 + 130 + 71 + 19 + + + + 预警 + + + false + + + + + + 245 + 130 + 71 + 19 + + + + 异常 + + + true + + + + + + 350 + 130 + 71 + 19 + + + + 事故 + + + true + + + + + + 35 + 130 + 71 + 19 + + + + 告知 + + + false + + + + + + + + 400 + 290 + 71 + 26 + + + + QPushButton +{ +color: rgb(250, 250, 250); +font: 700 12pt "微软雅黑"; +border:1px solid rgb(200,200,200); +border-radius:2px; +background-color:rgb(24,32,38); +} +QPushButton:hover +{ +background-color:rgb(8,11,13); +} +QPushButton:pressed +{ +background-color:rgb(24,32,38); +} + + + 取消 + + + false + + + + + true + + + + 315 + 290 + 71 + 26 + + + + QPushButton +{ +color: rgb(250, 250, 250); +font: 700 12pt "微软雅黑"; +border:0px; +border-radius:2px; +background-color:rgb(67,160,249); +} +QPushButton:hover +{ +background-color:rgb(55,131,204); +} +QPushButton:pressed +{ +background-color:rgb(67,160,249); +} +QPushButton:disabled +{ +background-color: rgb(60, 60, 60); +} + + + 确认 + + + false + + + + + + + + + + + diff --git a/ui/alarmEventMainDialog.ui b/ui/alarmEventMainDialog.ui index 4045e10..c469b2f 100644 --- a/ui/alarmEventMainDialog.ui +++ b/ui/alarmEventMainDialog.ui @@ -371,7 +371,7 @@ icon: url(:/images/icon_configuration.png); - 请选择 + 所有厂站 @@ -411,7 +411,7 @@ icon: url(:/images/icon_configuration.png); - 请选择 + 所有间隔 @@ -461,7 +461,7 @@ icon: url(:/images/icon_configuration.png); - 请选择 + 全部 @@ -501,7 +501,7 @@ icon: url(:/images/icon_configuration.png); - 请选择 + 全部 @@ -551,7 +551,7 @@ icon: url(:/images/icon_configuration.png); - 请选择 + 全部 @@ -664,7 +664,7 @@ icon: url(:/images/icon_configuration.png); - yyyy/MM/dd H:mm + yyyy/MM/dd hh:mm:ss @@ -683,7 +683,7 @@ icon: url(:/images/icon_configuration.png); - yyyy/MM/dd H:mm + yyyy/MM/dd hh:mm:ss