From 956483cc94495d6b7e3778e6beb51a74ddd43b8b Mon Sep 17 00:00:00 2001
From: duanshengchao <519970194@qq.com>
Date: Thu, 18 Sep 2025 15:50:18 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E6=8A=A5=E8=AD=A6?=
 =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=AE=9E=E7=8E=B0=E6=A1=86=E6=9E=B6=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CMakeLists.txt                    |   8 +
 include/alarmEventDataView.h      |  21 +
 include/alarmEventGlobal.h        |  24 +
 include/alarmEventMainDialog.h    |  31 +
 include/customLineEdit.h          |  26 +
 resource/PowerMaster.qrc          |   9 +
 resource/images/icon_checked.png  | Bin 0 -> 281 bytes
 resource/images/icon_first.png    | Bin 0 -> 237 bytes
 resource/images/icon_last.png     | Bin 0 -> 234 bytes
 resource/images/icon_next.png     | Bin 0 -> 273 bytes
 resource/images/icon_previous.png | Bin 0 -> 267 bytes
 source/alarmEventDataView.cpp     |  23 +
 source/alarmEventMainDialog.cpp   |  26 +
 source/customLineEdit.cpp         |  14 +
 source/dashboardFrame.cpp         |   4 +-
 ui/alarmEventMainDialog.ui        | 944 ++++++++++++++++++++++++++++++
 ui/dashboardFrame.ui              |  38 +-
 ui/dashboardNamingDialog.ui       |   2 +-
 18 files changed, 1157 insertions(+), 13 deletions(-)
 create mode 100644 include/alarmEventDataView.h
 create mode 100644 include/alarmEventGlobal.h
 create mode 100644 include/alarmEventMainDialog.h
 create mode 100644 include/customLineEdit.h
 create mode 100644 resource/images/icon_checked.png
 create mode 100644 resource/images/icon_first.png
 create mode 100644 resource/images/icon_last.png
 create mode 100644 resource/images/icon_next.png
 create mode 100644 resource/images/icon_previous.png
 create mode 100644 source/alarmEventDataView.cpp
 create mode 100644 source/alarmEventMainDialog.cpp
 create mode 100644 source/customLineEdit.cpp
 create mode 100644 ui/alarmEventMainDialog.ui

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6eba719..9edc705 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,6 +25,7 @@ set(H_HEADER_FILES
     include/global.h
     include/mainWindow.h
     include/customBorderContainer.h
+    include/customLineEdit.h
     include/customMenu.h
     include/customTab.h
     include/customTabBar.h
@@ -47,6 +48,9 @@ set(H_HEADER_FILES
     include/customCalendarWidget.h
     include/dateTimeSelectionPanel.h
     include/httpRequestManager.h
+    include/alarmEventGlobal.h
+    include/alarmEventMainDialog.h
+    include/alarmEventDataView.h
 )
 
 set(CPP_SOURCE_FILES
@@ -54,6 +58,7 @@ set(CPP_SOURCE_FILES
     source/main.cpp
     source/mainWindow.cpp
     source/customBorderContainer.cpp
+    source/customLineEdit.cpp
     source/customMenu.cpp
     source/customTab.cpp
     source/customTabBar.cpp
@@ -76,6 +81,8 @@ set(CPP_SOURCE_FILES
     source/customCalendarWidget.cpp
     source/dateTimeSelectionPanel.cpp
     source/httpRequestManager.cpp
+    source/alarmEventMainDialog.cpp
+    source/alarmEventDataView.cpp
 )
 
 set(UI_FILES
@@ -94,6 +101,7 @@ set(UI_FILES
     ui/dateTimeWidget.ui
     ui/dateTimeSelectionPanel.ui
     ui/dpConfigurationDialog.ui
+    ui/alarmEventMainDialog.ui
 )
 
 set(UTIL_FILES
diff --git a/include/alarmEventDataView.h b/include/alarmEventDataView.h
new file mode 100644
index 0000000..ab57a9e
--- /dev/null
+++ b/include/alarmEventDataView.h
@@ -0,0 +1,21 @@
+#ifndef ALARMEVENTDATAVIEW_H
+#define ALARMEVENTDATAVIEW_H
+
+#include <QWidget>
+
+class QTableView;
+class QVBoxLayout;
+class AlarmEventDataView : public QWidget
+{
+    Q_OBJECT
+
+public:
+    AlarmEventDataView(QWidget* parent = nullptr);
+    ~AlarmEventDataView();
+
+private:
+    QTableView* m_tableView;
+    QVBoxLayout* m_vLayout;
+};
+
+#endif
diff --git a/include/alarmEventGlobal.h b/include/alarmEventGlobal.h
new file mode 100644
index 0000000..ef6ba8f
--- /dev/null
+++ b/include/alarmEventGlobal.h
@@ -0,0 +1,24 @@
+#ifndef ALARMEVENTGLOBAL_H
+#define ALARMEVENTGLOBAL_H
+
+#include <QString>
+#include <QDateTime>
+
+enum MainDialogType
+{
+    RealTime = 0,
+    Historical
+};
+
+struct EventData
+{
+    QString id;
+    QString stationName;
+    QString bayName;
+    QString description;
+    bool confirmed;
+    QDateTime recivingTime;
+    QDateTime SOETime;
+};
+
+#endif
diff --git a/include/alarmEventMainDialog.h b/include/alarmEventMainDialog.h
new file mode 100644
index 0000000..318630c
--- /dev/null
+++ b/include/alarmEventMainDialog.h
@@ -0,0 +1,31 @@
+#ifndef ALARMEVENTMAINDIALOG_H
+#define ALARMEVENTMAINDIALOG_H
+
+#include <QDialog>
+#include "alarmEventGlobal.h"
+
+QT_BEGIN_NAMESPACE
+namespace Ui {
+class alarmEventMainDialog;
+}
+QT_END_NAMESPACE
+
+class AlarmEventMainDialog : public QDialog
+{
+    Q_OBJECT
+
+public:
+    AlarmEventMainDialog(MainDialogType type, QWidget *parent = nullptr);
+    ~AlarmEventMainDialog();
+
+signals:
+    void sgl_hide();
+
+public slots:
+    void onBtnClicked_close();
+
+private:
+    Ui::alarmEventMainDialog*  ui;
+};
+
+#endif
diff --git a/include/customLineEdit.h b/include/customLineEdit.h
new file mode 100644
index 0000000..cbfd515
--- /dev/null
+++ b/include/customLineEdit.h
@@ -0,0 +1,26 @@
+/**
+     *\brief 用来实现QLineEdit的点击响应
+     *
+     *\author dsc
+     */
+
+#ifndef CUSTOMLINEEDIT_H
+#define CUSTOMLINEEDIT_H
+
+#include <QLineEdit>
+
+class CustomLineEdit : public QLineEdit
+{
+    Q_OBJECT
+
+public:
+    explicit CustomLineEdit(QWidget* parent = nullptr);
+
+signals:
+    void clicked();
+
+protected:
+    void mousePressEvent(QMouseEvent* event) override;
+};
+
+#endif
diff --git a/resource/PowerMaster.qrc b/resource/PowerMaster.qrc
index 276c479..5dbb656 100644
--- a/resource/PowerMaster.qrc
+++ b/resource/PowerMaster.qrc
@@ -1,5 +1,14 @@
 <RCC>
   <qresource prefix="/">
+    <file>images/icon_first.png</file>
+    <file>images/icon_last.png</file>
+    <file>images/icon_next.png</file>
+    <file>images/icon_previous.png</file>
+    <file>images/icon_first.png</file>
+    <file>images/icon_last.png</file>
+    <file>images/icon_next.png</file>
+    <file>images/icon_previous.png</file>
+    <file>images/icon_checked.png</file>
     <file>images/ico_switch_off.png</file>
     <file>images/ico_switch_on.png</file>
     <file>images/down-arrow.png</file>
diff --git a/resource/images/icon_checked.png b/resource/images/icon_checked.png
new file mode 100644
index 0000000000000000000000000000000000000000..914e9b6c90bd15039568f79525eca767207c9071
GIT binary patch
literal 281
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#S9GG!XV7ZFl!D-#c59$
z$B>FSZ>I$E9a0c*+1cWjzvP}vf42Rf>)umt9x=?mwM1#@>1pTv4!K9qIL;UCbR$Gr
za3@0rW5U@E!*5DOVf>S-8LsOrm{@6Ev->H-eb<AEldKuOAAIci=>m^K_fBz#)jQb_
zNPUiCsOR5uIlb0iZU^Urw`O`<W@U%ZWVn^K((z=>(q~6mmNoe7JHGUcxU!%6lHGG}
z@06afa>)%{JqISuZHuHAT=FQ|=p&k3vzt+D?WzT$3x4f7_P^pB(-;3MoY`kwpQLD&
c2TOcm^a?+|wBxK}2+&&$p00i_>zopr02KIeZ~y=R

literal 0
HcmV?d00001

diff --git a/resource/images/icon_first.png b/resource/images/icon_first.png
new file mode 100644
index 0000000000000000000000000000000000000000..788d07bc11f5b6180cf914bf93d0c80a39588fd2
GIT binary patch
literal 237
zcmeAS@N?(olHy`uVBq!ia0vp^QXtI11|(N{`J4k%oCO|{#S9GG!XV7ZFl&wkP;kDd
zi(^Q|oVQaQxegf!xE^P&;C&x-LHcTH{^j6^nBA{5nSRz!i+#}{=E$^kt6E{A+!-xq
zeaSR6rPf0-4Chqd>h4+@6S~$T&O`2LFw;rnLo&v<C#+$Nk$=w6_Co3TooOl7<ulj2
ztlGtVLBH~A*2M4s4hVXyF<oHT;p@4mb6SgtV11<3lPosL^o;p?_HO3OxhDEW=~~cR
hri+><%>#efzw^^NyHcr_H5%wt22WQ%mvv4FO#o%BRj~j7

literal 0
HcmV?d00001

diff --git a/resource/images/icon_last.png b/resource/images/icon_last.png
new file mode 100644
index 0000000000000000000000000000000000000000..69c927b5b34af264a6ea960f94de0805120e2c03
GIT binary patch
literal 234
zcmeAS@N?(olHy`uVBq!ia0vp^QXtI11|(N{`J4k%oCO|{#S9GG!XV7ZFl&wkP;ic?
zi(^Q|oVQaAxtI(ETp#o9X;<I)-J)x%`X%8V5x1+`Kh$jqx-ij|n{#zyH)qq&54)f2
z_nG12l#!+7c`53W;Zl?TTi7f-Hkp?neb6`|d%xrk&!|~9Qyv&ht2WW#XDB;xMRtk$
z8<FHWJDcO|n7gGG?Av6$p^&|{n7MWS4l6Cw=KAX3#|N3Brwg*gWbs}NeK~u=mDB})
fGXgIEf5|wf`0T^jm$&u<-O1qT>gTe~DWM4fACg)E

literal 0
HcmV?d00001

diff --git a/resource/images/icon_next.png b/resource/images/icon_next.png
new file mode 100644
index 0000000000000000000000000000000000000000..08399cd4549141f445863e2a6bc7598c469d8557
GIT binary patch
literal 273
zcmeAS@N?(olHy`uVBq!ia0vp^QXtI11|(N{`J4k%oCO|{#S9GG!XV7ZFl&wkQ1Gy)
zi(^Q|oVQbbxegf!xGfeBSiexcaP>X6qrK*<7F2Lv|H}7v_OVdbUJ-4Pg`O|^cbsUB
zw4I^fa?)j`!va3Ro1G_APj9Lee$QJVF34=-l9Jma8S&@Y?do8Ym0|*n$=&uLwT~BU
zikzcz^30?4^7pk?=<w?3{$pFSi$lxrUrA*`evjlfu1~rTG?XUaYkneI_Am6p%m3^9
z<awLf#MXTb-*;t>$+al|>e>wsQ<l9v@ho#wQ^TE&A)nVxdv)!jZ$z!af|xxFztr51
U{Cs_A3(z|Zp00i_>zopr0AEjUCjbBd

literal 0
HcmV?d00001

diff --git a/resource/images/icon_previous.png b/resource/images/icon_previous.png
new file mode 100644
index 0000000000000000000000000000000000000000..da5d3eb6a9d8d660c3bed4b91eb8aa5dccd42cd6
GIT binary patch
literal 267
zcmeAS@N?(olHy`uVBq!ia0vp^QXtI11|(N{`J4k%oCO|{#S9GG!XV7ZFl&wkP;jrO
zi(^Q|oVQaAxtt6ITo!K?`!7%>eo=bm+~XU?KMI&tbxcS~^X85f6m^;O=jrOqGtFz+
z(mcvG7p@C>+0^0V@y=6k_lvbFvihGe9hkX<$-?zZrI)#&lf<N$`#f={B};{sjMxfl
z%qyijPjoy{TpI11wrBB1p^2KFOTJuV2z|>O!MJ0Ik6i7ES2qPF@izFLI}oME-tgAk
zDZ}F8x{!e2C$GAAom2LF-274RU&31LW7YOQDp*BhSGn%*JXK%7y0_9j{=%B?wLp(B
Nc)I$ztaD0e0sv7|W=jA7

literal 0
HcmV?d00001

diff --git a/source/alarmEventDataView.cpp b/source/alarmEventDataView.cpp
new file mode 100644
index 0000000..2add960
--- /dev/null
+++ b/source/alarmEventDataView.cpp
@@ -0,0 +1,23 @@
+#include "alarmEventDataView.h"
+#include <QTableView>
+#include <QHeaderView>
+#include <QVBoxLayout>
+
+AlarmEventDataView::AlarmEventDataView(QWidget* parent)
+    : QWidget(parent)
+{
+    m_tableView = new QTableView(this);
+    m_tableView->verticalHeader()->setVisible(false);
+    m_tableView->setEditTriggers(QAbstractItemView::NoEditTriggers);
+    m_tableView->setShowGrid(false);
+    //m_tableView->setStyleSheet("QHeaderView{background-color: rgb(40, 40, 40);} QHeaderView::section{background-color:transparent;}");
+
+    m_vLayout = new QVBoxLayout(this);
+    m_vLayout->setSpacing(0);
+    m_vLayout->setContentsMargins(0, 0, 0, 0);
+    m_vLayout->addWidget(m_tableView);
+    this->setLayout(m_vLayout);
+}
+
+AlarmEventDataView::~AlarmEventDataView()
+{}
diff --git a/source/alarmEventMainDialog.cpp b/source/alarmEventMainDialog.cpp
new file mode 100644
index 0000000..7b6623f
--- /dev/null
+++ b/source/alarmEventMainDialog.cpp
@@ -0,0 +1,26 @@
+#include "alarmEventMainDialog.h"
+#include "ui_alarmEventMainDialog.h"
+
+AlarmEventMainDialog::AlarmEventMainDialog(MainDialogType type, QWidget *parent)
+    : QDialog(parent)
+    , ui(new Ui::alarmEventMainDialog)
+{
+    ui->setupUi(this);
+
+    if(type == RealTime)
+        ui->dataFilteringPanel->setVisible(false);
+    else
+        ui->dataFilteringPanel->setVisible(true);
+}
+
+AlarmEventMainDialog::~AlarmEventMainDialog()
+{
+    delete ui;
+}
+
+void AlarmEventMainDialog::onBtnClicked_close()
+{
+    //reject();
+    hide();
+    emit sgl_hide();
+}
diff --git a/source/customLineEdit.cpp b/source/customLineEdit.cpp
new file mode 100644
index 0000000..3b527b5
--- /dev/null
+++ b/source/customLineEdit.cpp
@@ -0,0 +1,14 @@
+#include "customLineEdit.h"
+#include <QMouseEvent>
+
+CustomLineEdit::CustomLineEdit(QWidget* parent)
+    : QLineEdit(parent)
+{}
+
+void CustomLineEdit::mousePressEvent(QMouseEvent* event)
+{
+    if(event->button() == Qt::LeftButton)
+        emit clicked();
+
+    QLineEdit::mousePressEvent(event);
+}
diff --git a/source/dashboardFrame.cpp b/source/dashboardFrame.cpp
index e92aefb..232c8f4 100644
--- a/source/dashboardFrame.cpp
+++ b/source/dashboardFrame.cpp
@@ -43,8 +43,8 @@ DashboardFrame::DashboardFrame(const QString& strName, dashboardFrame::frameType
     m_type = fType;
     if(m_type == dashboardFrame::ft_secondary) //只有主window具有报警提示
     {
-        ui->btnEventNotication->setVisible(false);
-        ui->btnAlarmNoticatio->setVisible(false);
+        ui->btnAllEvent->setVisible(false);
+        ui->btnAlarm->setVisible(false);
     }
 
     initializeGlobalVariable();
diff --git a/ui/alarmEventMainDialog.ui b/ui/alarmEventMainDialog.ui
new file mode 100644
index 0000000..538ec51
--- /dev/null
+++ b/ui/alarmEventMainDialog.ui
@@ -0,0 +1,944 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>alarmEventMainDialog</class>
+ <widget class="QDialog" name="alarmEventMainDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>1496</width>
+    <height>1006</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Dialog</string>
+  </property>
+  <property name="styleSheet">
+   <string notr="true">QDialog
+{
+background-color:rgba(36,43,50,250);
+}
+
+QPushButton
+{
+color: rgb(250, 250, 250);
+font: 700 10pt &quot;微软雅黑&quot;;
+border:1px solid rgb(67,160,249);
+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);
+}
+
+QLabel
+{
+font: 12pt &quot;黑体&quot;;
+color: rgb(250, 250, 250);
+}
+
+QLineEdit
+{
+font: 12pt &quot;黑体&quot;;
+color: rgb(250, 250, 250);
+padding-left:10px;
+border:1px solid rgb(200,200,200);
+background-color: rgb(24, 32, 38);
+}
+QLineEdit:focus
+{
+border:1px solid rgb(67,160,249);
+}
+
+QComboBox
+{
+font: 12pt &quot;黑体&quot;;
+color: rgb(250, 250, 250);
+padding-left:10px;
+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);
+}</string>
+  </property>
+  <layout class="QHBoxLayout" name="hLayout_main" stretch="1,0">
+   <property name="spacing">
+    <number>5</number>
+   </property>
+   <property name="leftMargin">
+    <number>30</number>
+   </property>
+   <property name="topMargin">
+    <number>7</number>
+   </property>
+   <property name="rightMargin">
+    <number>7</number>
+   </property>
+   <property name="bottomMargin">
+    <number>5</number>
+   </property>
+   <item>
+    <layout class="QVBoxLayout" name="vLayout_central">
+     <property name="spacing">
+      <number>0</number>
+     </property>
+     <property name="bottomMargin">
+      <number>0</number>
+     </property>
+     <item>
+      <widget class="QWidget" name="topPanel" native="true">
+       <property name="minimumSize">
+        <size>
+         <width>0</width>
+         <height>60</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>16777215</width>
+         <height>60</height>
+        </size>
+       </property>
+       <property name="styleSheet">
+        <string notr="true">QWidget #topPanel
+{
+border:1px solid rgb(67,160,249);
+border-left:0px;
+border-top:0px;
+border-right:0px;
+}
+
+</string>
+       </property>
+       <layout class="QHBoxLayout" name="horizontalLayout">
+        <property name="rightMargin">
+         <number>0</number>
+        </property>
+        <item>
+         <widget class="QLabel" name="labeWindowlTitle">
+          <property name="styleSheet">
+           <string notr="true">color: rgb(250, 250, 250);
+font: 700 18pt &quot;微软雅黑&quot;;
+</string>
+          </property>
+          <property name="text">
+           <string>历史事件</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QWidget" name="tobBtnsWidget" native="true">
+          <property name="minimumSize">
+           <size>
+            <width>261</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>261</width>
+            <height>16777215</height>
+           </size>
+          </property>
+          <widget class="QPushButton" name="btnConfirmAll">
+           <property name="geometry">
+            <rect>
+             <x>40</x>
+             <y>10</y>
+             <width>101</width>
+             <height>31</height>
+            </rect>
+           </property>
+           <property name="styleSheet">
+            <string notr="true">QPushButton
+{
+icon-size:20px;
+icon: url(:/images/icon_checked.png);
+}</string>
+           </property>
+           <property name="text">
+            <string>全部确认</string>
+           </property>
+          </widget>
+          <widget class="QPushButton" name="btnSetting">
+           <property name="geometry">
+            <rect>
+             <x>170</x>
+             <y>10</y>
+             <width>81</width>
+             <height>31</height>
+            </rect>
+           </property>
+           <property name="styleSheet">
+            <string notr="true">QPushButton
+{
+icon-size:20px;
+icon: url(:/images/icon_configuration.png);
+}</string>
+           </property>
+           <property name="text">
+            <string>设置</string>
+           </property>
+          </widget>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </item>
+     <item>
+      <widget class="QWidget" name="dataFilteringPanel" native="true">
+       <property name="minimumSize">
+        <size>
+         <width>0</width>
+         <height>96</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>16777215</width>
+         <height>96</height>
+        </size>
+       </property>
+       <property name="styleSheet">
+        <string notr="true">QWidget #dataFilteringPanel
+{
+
+}
+
+</string>
+       </property>
+       <layout class="QHBoxLayout" name="horizontalLayout_2" stretch="1,1,1,1">
+        <property name="spacing">
+         <number>35</number>
+        </property>
+        <property name="leftMargin">
+         <number>8</number>
+        </property>
+        <property name="topMargin">
+         <number>10</number>
+        </property>
+        <property name="rightMargin">
+         <number>8</number>
+        </property>
+        <property name="bottomMargin">
+         <number>10</number>
+        </property>
+        <item>
+         <layout class="QGridLayout" name="gridLayout">
+          <property name="horizontalSpacing">
+           <number>3</number>
+          </property>
+          <property name="verticalSpacing">
+           <number>5</number>
+          </property>
+          <item row="0" column="0">
+           <widget class="QLabel" name="label_stationName">
+            <property name="minimumSize">
+             <size>
+              <width>81</width>
+              <height>31</height>
+             </size>
+            </property>
+            <property name="maximumSize">
+             <size>
+              <width>81</width>
+              <height>31</height>
+             </size>
+            </property>
+            <property name="text">
+             <string>厂站名称：</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <widget class="QComboBox" name="conboBox_stationName">
+            <property name="minimumSize">
+             <size>
+              <width>0</width>
+              <height>31</height>
+             </size>
+            </property>
+            <property name="maximumSize">
+             <size>
+              <width>16777215</width>
+              <height>31</height>
+             </size>
+            </property>
+            <item>
+             <property name="text">
+              <string>请选择</string>
+             </property>
+            </item>
+           </widget>
+          </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="label_bayName">
+            <property name="minimumSize">
+             <size>
+              <width>81</width>
+              <height>31</height>
+             </size>
+            </property>
+            <property name="maximumSize">
+             <size>
+              <width>81</width>
+              <height>31</height>
+             </size>
+            </property>
+            <property name="text">
+             <string>间隔名称：</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <widget class="QComboBox" name="conboBox_bayName">
+            <property name="minimumSize">
+             <size>
+              <width>0</width>
+              <height>31</height>
+             </size>
+            </property>
+            <property name="maximumSize">
+             <size>
+              <width>16777215</width>
+              <height>31</height>
+             </size>
+            </property>
+            <item>
+             <property name="text">
+              <string>请选择</string>
+             </property>
+            </item>
+           </widget>
+          </item>
+         </layout>
+        </item>
+        <item>
+         <layout class="QGridLayout" name="gridLayout_2">
+          <property name="horizontalSpacing">
+           <number>3</number>
+          </property>
+          <property name="verticalSpacing">
+           <number>5</number>
+          </property>
+          <item row="0" column="0">
+           <widget class="QLabel" name="label_eventType">
+            <property name="minimumSize">
+             <size>
+              <width>81</width>
+              <height>31</height>
+             </size>
+            </property>
+            <property name="maximumSize">
+             <size>
+              <width>81</width>
+              <height>31</height>
+             </size>
+            </property>
+            <property name="text">
+             <string>告警类型：</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <widget class="QComboBox" name="conboBox_eventType">
+            <property name="minimumSize">
+             <size>
+              <width>0</width>
+              <height>31</height>
+             </size>
+            </property>
+            <property name="maximumSize">
+             <size>
+              <width>16777215</width>
+              <height>31</height>
+             </size>
+            </property>
+            <item>
+             <property name="text">
+              <string>请选择</string>
+             </property>
+            </item>
+           </widget>
+          </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="label_eventLevel">
+            <property name="minimumSize">
+             <size>
+              <width>81</width>
+              <height>31</height>
+             </size>
+            </property>
+            <property name="maximumSize">
+             <size>
+              <width>81</width>
+              <height>31</height>
+             </size>
+            </property>
+            <property name="text">
+             <string>告警等级：</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <widget class="QComboBox" name="conboBox_eventLevel">
+            <property name="minimumSize">
+             <size>
+              <width>0</width>
+              <height>31</height>
+             </size>
+            </property>
+            <property name="maximumSize">
+             <size>
+              <width>16777215</width>
+              <height>31</height>
+             </size>
+            </property>
+            <item>
+             <property name="text">
+              <string>请选择</string>
+             </property>
+            </item>
+           </widget>
+          </item>
+         </layout>
+        </item>
+        <item>
+         <layout class="QGridLayout" name="gridLayout_3">
+          <property name="horizontalSpacing">
+           <number>3</number>
+          </property>
+          <property name="verticalSpacing">
+           <number>5</number>
+          </property>
+          <item row="0" column="0">
+           <widget class="QLabel" name="label_confirmStatus">
+            <property name="minimumSize">
+             <size>
+              <width>81</width>
+              <height>31</height>
+             </size>
+            </property>
+            <property name="maximumSize">
+             <size>
+              <width>81</width>
+              <height>31</height>
+             </size>
+            </property>
+            <property name="text">
+             <string>确认状态：</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <widget class="QComboBox" name="conboBox_confirmStatus">
+            <property name="minimumSize">
+             <size>
+              <width>0</width>
+              <height>31</height>
+             </size>
+            </property>
+            <property name="maximumSize">
+             <size>
+              <width>16777215</width>
+              <height>31</height>
+             </size>
+            </property>
+            <item>
+             <property name="text">
+              <string>请选择</string>
+             </property>
+            </item>
+           </widget>
+          </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="label_timePeriod_3">
+            <property name="minimumSize">
+             <size>
+              <width>81</width>
+              <height>31</height>
+             </size>
+            </property>
+            <property name="maximumSize">
+             <size>
+              <width>81</width>
+              <height>31</height>
+             </size>
+            </property>
+            <property name="text">
+             <string>告警信息：</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <widget class="QLineEdit" name="lineEdit_timePeriod_3">
+            <property name="minimumSize">
+             <size>
+              <width>0</width>
+              <height>31</height>
+             </size>
+            </property>
+            <property name="maximumSize">
+             <size>
+              <width>16777215</width>
+              <height>31</height>
+             </size>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+        <item>
+         <layout class="QGridLayout" name="gridLayout_4">
+          <property name="horizontalSpacing">
+           <number>3</number>
+          </property>
+          <property name="verticalSpacing">
+           <number>5</number>
+          </property>
+          <item row="0" column="0">
+           <widget class="QLabel" name="label_beginTime">
+            <property name="minimumSize">
+             <size>
+              <width>81</width>
+              <height>31</height>
+             </size>
+            </property>
+            <property name="maximumSize">
+             <size>
+              <width>81</width>
+              <height>31</height>
+             </size>
+            </property>
+            <property name="text">
+             <string>最早时间：</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <widget class="CustomLineEdit" name="lineEdit_beginTime">
+            <property name="minimumSize">
+             <size>
+              <width>0</width>
+              <height>31</height>
+             </size>
+            </property>
+            <property name="maximumSize">
+             <size>
+              <width>16777215</width>
+              <height>31</height>
+             </size>
+            </property>
+            <property name="text">
+             <string>2025/09/16 10:06:12 </string>
+            </property>
+            <property name="readOnly">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="label_endTime">
+            <property name="minimumSize">
+             <size>
+              <width>81</width>
+              <height>31</height>
+             </size>
+            </property>
+            <property name="maximumSize">
+             <size>
+              <width>81</width>
+              <height>31</height>
+             </size>
+            </property>
+            <property name="text">
+             <string>最后时间：</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <widget class="CustomLineEdit" name="lineEdit_endTime">
+            <property name="minimumSize">
+             <size>
+              <width>0</width>
+              <height>31</height>
+             </size>
+            </property>
+            <property name="maximumSize">
+             <size>
+              <width>16777215</width>
+              <height>31</height>
+             </size>
+            </property>
+            <property name="text">
+             <string>2025/09/16 10:07:12</string>
+            </property>
+            <property name="readOnly">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+       </layout>
+      </widget>
+     </item>
+     <item>
+      <widget class="QWidget" name="tableView" native="true">
+       <property name="styleSheet">
+        <string notr="true">QWidget #tableView
+{
+	background-color: rgba(54, 62, 74,100);
+}</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QWidget" name="bottomPanel" native="true">
+       <property name="minimumSize">
+        <size>
+         <width>0</width>
+         <height>31</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>16777215</width>
+         <height>31</height>
+        </size>
+       </property>
+       <property name="styleSheet">
+        <string notr="true">QPushButton
+{
+border:1px solid rgb(100,100,100);
+}
+QPushButton:hover
+{
+border:1px solid rgb(67,160,249);
+}
+QPushButton:pressed
+{
+border:1px solid rgb(100,100,100);
+}</string>
+       </property>
+       <widget class="QPushButton" name="btnFirstPage">
+        <property name="enabled">
+         <bool>true</bool>
+        </property>
+        <property name="geometry">
+         <rect>
+          <x>0</x>
+          <y>8</y>
+          <width>21</width>
+          <height>21</height>
+         </rect>
+        </property>
+        <property name="minimumSize">
+         <size>
+          <width>21</width>
+          <height>21</height>
+         </size>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>21</width>
+          <height>21</height>
+         </size>
+        </property>
+        <property name="toolTip">
+         <string>第一页</string>
+        </property>
+        <property name="styleSheet">
+         <string notr="true"/>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+        <property name="icon">
+         <iconset resource="../resource/PowerMaster.qrc">
+          <normaloff>:/images/icon_first.png</normaloff>:/images/icon_first.png</iconset>
+        </property>
+        <property name="iconSize">
+         <size>
+          <width>16</width>
+          <height>16</height>
+         </size>
+        </property>
+       </widget>
+       <widget class="QLabel" name="recordInfo">
+        <property name="geometry">
+         <rect>
+          <x>170</x>
+          <y>8</y>
+          <width>131</width>
+          <height>21</height>
+         </rect>
+        </property>
+        <property name="styleSheet">
+         <string notr="true">font: 11pt &quot;黑体&quot;;</string>
+        </property>
+        <property name="text">
+         <string>共100条记录</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter</set>
+        </property>
+       </widget>
+       <widget class="QPushButton" name="btnPreviousPage">
+        <property name="enabled">
+         <bool>true</bool>
+        </property>
+        <property name="geometry">
+         <rect>
+          <x>30</x>
+          <y>8</y>
+          <width>21</width>
+          <height>21</height>
+         </rect>
+        </property>
+        <property name="minimumSize">
+         <size>
+          <width>21</width>
+          <height>21</height>
+         </size>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>21</width>
+          <height>21</height>
+         </size>
+        </property>
+        <property name="toolTip">
+         <string>第一页</string>
+        </property>
+        <property name="styleSheet">
+         <string notr="true"/>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+        <property name="icon">
+         <iconset resource="../resource/PowerMaster.qrc">
+          <normaloff>:/images/icon_previous.png</normaloff>:/images/icon_previous.png</iconset>
+        </property>
+        <property name="iconSize">
+         <size>
+          <width>16</width>
+          <height>16</height>
+         </size>
+        </property>
+       </widget>
+       <widget class="QPushButton" name="btnNextPage">
+        <property name="enabled">
+         <bool>true</bool>
+        </property>
+        <property name="geometry">
+         <rect>
+          <x>105</x>
+          <y>8</y>
+          <width>21</width>
+          <height>21</height>
+         </rect>
+        </property>
+        <property name="minimumSize">
+         <size>
+          <width>21</width>
+          <height>21</height>
+         </size>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>21</width>
+          <height>21</height>
+         </size>
+        </property>
+        <property name="toolTip">
+         <string>第一页</string>
+        </property>
+        <property name="styleSheet">
+         <string notr="true"/>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+        <property name="icon">
+         <iconset resource="../resource/PowerMaster.qrc">
+          <normaloff>:/images/icon_next.png</normaloff>:/images/icon_next.png</iconset>
+        </property>
+        <property name="iconSize">
+         <size>
+          <width>16</width>
+          <height>16</height>
+         </size>
+        </property>
+       </widget>
+       <widget class="QPushButton" name="btnLastPage">
+        <property name="enabled">
+         <bool>true</bool>
+        </property>
+        <property name="geometry">
+         <rect>
+          <x>135</x>
+          <y>8</y>
+          <width>21</width>
+          <height>21</height>
+         </rect>
+        </property>
+        <property name="minimumSize">
+         <size>
+          <width>21</width>
+          <height>21</height>
+         </size>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>21</width>
+          <height>21</height>
+         </size>
+        </property>
+        <property name="toolTip">
+         <string>第一页</string>
+        </property>
+        <property name="styleSheet">
+         <string notr="true"/>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+        <property name="icon">
+         <iconset resource="../resource/PowerMaster.qrc">
+          <normaloff>:/images/icon_last.png</normaloff>:/images/icon_last.png</iconset>
+        </property>
+        <property name="iconSize">
+         <size>
+          <width>16</width>
+          <height>16</height>
+         </size>
+        </property>
+       </widget>
+       <widget class="QLineEdit" name="lineEdit">
+        <property name="geometry">
+         <rect>
+          <x>60</x>
+          <y>9</y>
+          <width>36</width>
+          <height>20</height>
+         </rect>
+        </property>
+        <property name="styleSheet">
+         <string notr="true">font: 11pt &quot;黑体&quot;;
+border:0px;
+padding:0px;</string>
+        </property>
+        <property name="text">
+         <string>1</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignmentFlag::AlignCenter</set>
+        </property>
+       </widget>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QVBoxLayout" name="vLayout_close">
+     <item>
+      <widget class="QPushButton" name="btnClose">
+       <property name="minimumSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="styleSheet">
+        <string notr="true">QPushButton
+{
+	background-color:transparent;
+	border-image: url(:/images/btn_close_default.png);
+}
+QPushButton:hover
+{
+	border-image: url(:/images/btn_close_hover.png);
+}
+QPushButton:pressed
+{
+	border-image: url(:/images/btn_close_default.png);
+}</string>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="flat">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="verticalSpacer">
+       <property name="orientation">
+        <enum>Qt::Orientation::Vertical</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>20</width>
+         <height>40</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>CustomLineEdit</class>
+   <extends>QLineEdit</extends>
+   <header location="global">customLineEdit.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources>
+  <include location="../resource/PowerMaster.qrc"/>
+ </resources>
+ <connections/>
+</ui>
diff --git a/ui/dashboardFrame.ui b/ui/dashboardFrame.ui
index 6edfe32..62691fd 100644
--- a/ui/dashboardFrame.ui
+++ b/ui/dashboardFrame.ui
@@ -122,7 +122,7 @@
        </property>
        <layout class="QGridLayout" name="gridLayout">
         <item row="0" column="0">
-         <widget class="QPushButton" name="btnEventNotication">
+         <widget class="QPushButton" name="btnAllEvent">
           <property name="minimumSize">
            <size>
             <width>165</width>
@@ -141,23 +141,23 @@
 font: 700 12pt &quot;微软雅黑&quot;;
 color:rgb(250,250,250);
 text-align:right;
-padding-right:40px;
-background-color: rgb(200, 68, 56);
+padding-right:35px;
+background-color: rgb(67,160,249);
 icon-size:20px;
 icon: url(:/images/icon_event.png);
 }
 QPushButton:hover
 {
-background-color: rgb(166, 56, 46);
+background-color: rgb(55,131,204);
 }
 QPushButton:pressed
 {
-background-color: rgb(128, 43, 36);
+background-color: rgb(67,160,249);
 }
 </string>
           </property>
           <property name="text">
-           <string>事件(0)</string>
+           <string>事件查看</string>
           </property>
           <property name="flat">
            <bool>false</bool>
@@ -208,7 +208,7 @@ background-color: rgb(39, 102, 59);
          </widget>
         </item>
         <item row="1" column="0">
-         <widget class="QPushButton" name="btnAlarmNoticatio">
+         <widget class="QPushButton" name="btnAlarm">
           <property name="minimumSize">
            <size>
             <width>165</width>
@@ -227,7 +227,7 @@ background-color: rgb(39, 102, 59);
 font: 700 12pt &quot;微软雅黑&quot;;
 color:rgb(250,250,250);
 text-align:right;
-padding-right:20px;
+padding-right:30px;
 background-color: rgb(200, 68, 56);
 icon-size:20px;
 icon: url(:/images/icon_alarm.png);
@@ -243,7 +243,7 @@ background-color: rgb(128, 43, 36);
 </string>
           </property>
           <property name="text">
-           <string>报警(10+)</string>
+           <string>报警(0条)</string>
           </property>
          </widget>
         </item>
@@ -562,7 +562,25 @@ QPushButton:pressed
        </property>
       </layout>
      </widget>
-     <widget class="QWidget" name="page_notifications"/>
+     <widget class="QWidget" name="page_notifications">
+      <layout class="QHBoxLayout" name="hLayout_notifications">
+       <property name="spacing">
+        <number>0</number>
+       </property>
+       <property name="leftMargin">
+        <number>0</number>
+       </property>
+       <property name="topMargin">
+        <number>0</number>
+       </property>
+       <property name="rightMargin">
+        <number>0</number>
+       </property>
+       <property name="bottomMargin">
+        <number>0</number>
+       </property>
+      </layout>
+     </widget>
     </widget>
    </item>
   </layout>
diff --git a/ui/dashboardNamingDialog.ui b/ui/dashboardNamingDialog.ui
index 4c4d193..6752d84 100644
--- a/ui/dashboardNamingDialog.ui
+++ b/ui/dashboardNamingDialog.ui
@@ -146,7 +146,7 @@ border:1px solid rgb(67,160,249);
 {
 color: rgb(250, 250, 250);
 font: 700 12pt &quot;微软雅黑&quot;;
-border:1px solid rgb(67,160,249);
+border:1px solid rgb(200,200,200);
 border-radius:2px;
 background-color:rgb(24,32,38);
 }