[ref]同步711 711更新

product/src/gui/plugin/AlarmWidget/CAccidentReviewDialog.cpp

@@ -1,4 +1,4 @@
-#include "CAccidentReviewDialog.h"
+#include "CAccidentReviewDialog.h"
 #include "public/pub_utility_api/FileUtil.h"
 #include "public/pub_logger_api/logger.h"
 #include <QTreeWidget>

product/src/gui/plugin/AlarmWidget/CAccidentReviewDialog.h

@@ -1,4 +1,4 @@
-#ifndef CACCIDENTREVIEWDIALOG_H
+#ifndef CACCIDENTREVIEWDIALOG_H
 #define CACCIDENTREVIEWDIALOG_H
 
 #include <QObject>

product/src/gui/plugin/AlarmWidget/CAiAlarmDataCollect.cpp

@@ -1,4 +1,4 @@
-#include "CAiAlarmDataCollect.h"
+#include "CAiAlarmDataCollect.h"
 #include "pub_logger_api/logger.h"
 #include "CAlarmMsgManage.h"
 #include <QDebug>

product/src/gui/plugin/AlarmWidget/CAiAlarmDataCollect.h

@@ -1,4 +1,4 @@
-#ifndef CAIALARMDATACOLLECT_H
+#ifndef CAIALARMDATACOLLECT_H
 #define CAIALARMDATACOLLECT_H
 
 #include <QObject>

product/src/gui/plugin/AlarmWidget/CAiAlarmDelegate.cpp

@@ -1,4 +1,4 @@
-#include "CAiAlarmDelegate.h"
+#include "CAiAlarmDelegate.h"
 #include <QFile>
 #include "pub_utility_api/FileUtil.h"
 #include "pub_utility_api/FileStyle.h"

product/src/gui/plugin/AlarmWidget/CAiAlarmDelegate.h

@@ -1,4 +1,4 @@
-#ifndef CAIALARMDELEGATE_H
+#ifndef CAIALARMDELEGATE_H
 #define CAIALARMDELEGATE_H
 
 #include <QObject>

product/src/gui/plugin/AlarmWidget/CAiAlarmMsgInfo.cpp

@@ -1,4 +1,4 @@
-#include "CAiAlarmMsgInfo.h"
+#include "CAiAlarmMsgInfo.h"
 #include <QDateTime>
 #include "CAlarmDataCollect.h"
 #include <QDebug>

product/src/gui/plugin/AlarmWidget/CAiAlarmMsgInfo.h

@@ -1,4 +1,4 @@
-#ifndef CAIALARMMSGINFO_H
+#ifndef CAIALARMMSGINFO_H
 #define CAIALARMMSGINFO_H
 
 

product/src/gui/plugin/AlarmWidget/CAiAlarmTreeItem.cpp

@@ -1,4 +1,4 @@
-#include "CAiAlarmTreeItem.h"
+#include "CAiAlarmTreeItem.h"
 #include "CAiAlarmMsgInfo.h"
 #include "CAlarmMsgInfo.h"
 #include "CAlarmCommon.h"

product/src/gui/plugin/AlarmWidget/CAiAlarmTreeItem.h

@@ -1,4 +1,4 @@
-#ifndef CAIALARMTREEITEM_H
+#ifndef CAIALARMTREEITEM_H
 #define CAIALARMTREEITEM_H
 
 #include <QVector>

product/src/gui/plugin/AlarmWidget/CAiAlarmTreeModel.cpp

@@ -1,4 +1,4 @@
-#include "CAiAlarmTreeModel.h"
+#include "CAiAlarmTreeModel.h"
 #include "CAlarmMsgManage.h"
 #include "CAiAlarmDataCollect.h"
 #include "CAlarmDataCollect.h"

product/src/gui/plugin/AlarmWidget/CAiAlarmTreeModel.h

@@ -1,4 +1,4 @@
-#ifndef CAIALARMTREEMODEL_H
+#ifndef CAIALARMTREEMODEL_H
 #define CAIALARMTREEMODEL_H
 
 #include <QAbstractItemModel>

product/src/gui/plugin/AlarmWidget/CAiAlarmTreeView.cpp

@@ -1,4 +1,4 @@
-#include "CAiAlarmTreeView.h"
+#include "CAiAlarmTreeView.h"
 #include <QHeaderView>
 #include <QScrollBar>
 #include <QStyleFactory>

product/src/gui/plugin/AlarmWidget/CAiAlarmTreeView.h

@@ -1,4 +1,4 @@
-#ifndef CAIALARMTREEVIEW_H
+#ifndef CAIALARMTREEVIEW_H
 #define CAIALARMTREEVIEW_H
 
 #include <QTreeView>

product/src/gui/plugin/AlarmWidget/CAlarmBaseData.cpp

@@ -1,8 +1,20 @@
-#include "CAlarmBaseData.h"
+#include "CAlarmBaseData.h"
 #include "perm_mng_api/PermMngApi.h"
 #include "CAlarmCommon.h"
 #include "pub_logger_api/logger.h"
+
+//< 屏蔽xml_parser编译告警
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-copy"
+#endif
+
 #include "boost/property_tree/xml_parser.hpp"
+
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
+
 #include "boost/typeof/typeof.hpp"
 #include "boost/filesystem.hpp"
 #include "pub_utility_api/FileUtil.h"
@@ -139,7 +151,7 @@ int CAlarmBaseData::queryDomainIdByLocId(int loactionId)
     if(m_ptrSysInfo)
     {
         SLocationInfo stLocationInfo;
-        if(kbdSuccess == m_ptrSysInfo->getLocationInfoById(loactionId, stLocationInfo))
+        if(iotSuccess == m_ptrSysInfo->getLocationInfoById(loactionId, stLocationInfo))
         {
             return stLocationInfo.nDomainId;
         }
@@ -154,7 +166,7 @@ bool CAlarmBaseData::queryAllPointDevGroup(int nDomainId, int nSubsystemId, cons
         return false;
     }
     SAppInfo stAppInfo;
-    if(kbdSuccess != m_ptrSysInfo->getAppInfoBySubsystemId(nSubsystemId, stAppInfo))
+    if(iotSuccess != m_ptrSysInfo->getAppInfoBySubsystemId(nSubsystemId, stAppInfo))
     {
         LOGERROR("queryAllPointDevGroup 获取应用ID失败");
         return false;

product/src/gui/plugin/AlarmWidget/CAlarmBaseData.h

@@ -1,4 +1,4 @@
-#ifndef CALARMBASEDATA_H
+#ifndef CALARMBASEDATA_H
 #define CALARMBASEDATA_H
 
 #include <QObject>

product/src/gui/plugin/AlarmWidget/CAlarmColorInfo.h

@@ -1,4 +1,4 @@
-#ifndef CALARMCOLORINFO_H
+#ifndef CALARMCOLORINFO_H
 #define CALARMCOLORINFO_H
 
 #include <QColor>

product/src/gui/plugin/AlarmWidget/CAlarmColorWidget.cpp

@@ -1,4 +1,4 @@
-#include "CAlarmColorWidget.h"
+#include "CAlarmColorWidget.h"
 #include "ui_CAlarmColorWidget.h"
 #include <QColorDialog>
 #include "CAlarmSetMng.h"

product/src/gui/plugin/AlarmWidget/CAlarmColorWidget.h

@@ -1,4 +1,4 @@
-#ifndef CALARMCOLORWIDGET_H
+#ifndef CALARMCOLORWIDGET_H
 #define CALARMCOLORWIDGET_H
 
 #include <QWidget>

product/src/gui/plugin/AlarmWidget/CAlarmCommon.h

@@ -1,4 +1,4 @@
-#ifndef CALARMCOMMON_H
+#ifndef CALARMCOMMON_H
 #define CALARMCOMMON_H
 
 #include <QSharedPointer>

product/src/gui/plugin/AlarmWidget/CAlarmDataCollect.cpp

@@ -1,4 +1,4 @@
-#include "CAlarmDataCollect.h"
+#include "CAlarmDataCollect.h"
 #include <QDateTime>
 #include "pub_logger_api/logger.h"
 #include "CAlarmMsgManage.h"

product/src/gui/plugin/AlarmWidget/CAlarmDataCollect.h

@@ -1,4 +1,4 @@
-#ifndef CALARMDATACOLLECT_H
+#ifndef CALARMDATACOLLECT_H
 #define CALARMDATACOLLECT_H
 
 #include <QObject>

product/src/gui/plugin/AlarmWidget/CAlarmDelegate.cpp

@@ -1,4 +1,4 @@
-#include <QFile>
+#include <QFile>
 #include <QPainter>
 #include <QDomDocument>
 #include "CAlarmDelegate.h"

product/src/gui/plugin/AlarmWidget/CAlarmDelegate.h

@@ -1,4 +1,4 @@
-#ifndef CALARMDELEGATE_H
+#ifndef CALARMDELEGATE_H
 #define CALARMDELEGATE_H
 
 #include <QStyledItemDelegate>

product/src/gui/plugin/AlarmWidget/CAlarmDeviceTreeItem.cpp

@@ -1,4 +1,4 @@
-#include <QStringList>
+#include <QStringList>
 #include "CAlarmDeviceTreeItem.h"
 #include "pub_logger_api/logger.h"
 #include "Common.h"

product/src/gui/plugin/AlarmWidget/CAlarmDeviceTreeItem.h

@@ -1,4 +1,4 @@
-/****************************************************************************
+/****************************************************************************
 **
 ** Copyright (C) 2016 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/

product/src/gui/plugin/AlarmWidget/CAlarmDeviceTreeModel.cpp

@@ -1,4 +1,4 @@
-#include "CAlarmDeviceTreeItem.h"
+#include "CAlarmDeviceTreeItem.h"
 #include "CAlarmDeviceTreeModel.h"
 #include "CAlarmMsgManage.h"
 #include "CAlarmBaseData.h"
@@ -37,6 +37,20 @@ void CAlarmDeviceTreeModel::setupModelData(const QMap<int, QVector<SDevGroupInfo
             QModelIndex modelIndex = createIndex(nDevIndex, 0, device);
             m_devTagIndex.insert(vec.at(nDevIndex).tag_name, modelIndex);
             m_devNameIndex.insert(locDesc + "." + vec.at(nDevIndex).description, modelIndex);
+
+            if(nDevIndex == vec.size() - 1)
+            {
+                CAlarmDeviceTreeItem * sys_device = new CAlarmDeviceTreeItem(".系统", location);
+                sys_device->setData("", Qt::ItemDataRole(TagRole));
+                sys_device->setData(TYPE_DEVGROUP, Qt::ItemDataRole(TypeRole));
+                sys_device->setData(vec.at(nDevIndex).domain, Qt::ItemDataRole(DomainRole));
+                sys_device->setData(vec.at(nDevIndex).location, Qt::ItemDataRole(LocationRole));
+                sys_device->setData(vec.at(nDevIndex).sub_system, Qt::ItemDataRole(SubsystemRole));
+                sys_device->setData(vec.at(nDevIndex).region, Qt::ItemDataRole(RegionRole));
+                QModelIndex sys_modelIndex = createIndex(nDevIndex+1, 0, sys_device);
+                m_devTagIndex.insert("", sys_modelIndex);
+                m_devNameIndex.insert("", sys_modelIndex);
+            }
         }
     }
 }
@@ -160,9 +174,11 @@ QVariant CAlarmDeviceTreeModel::data(const QModelIndex &index, int role) const
     if (Qt::DisplayRole == role)
     {
         const QString &deviceGroup = item->data(Qt::ItemDataRole(TagRole)).toString();
-        if(deviceGroup.isEmpty())
+        int nType = item->data(Qt::ItemDataRole(TypeRole)).toInt();
+        if(deviceGroup.isEmpty() && nType == TYPE_LOCATION)
         {
-           return item->data(Qt::DisplayRole).toString();
+            //区域后面不加数量
+            return item->data(Qt::DisplayRole).toString();
         }
         return  item->data(Qt::DisplayRole).toString() + QString("  [%1]").arg(m_alarmDeviceGroupStatistical.value(deviceGroup,0));
     }

product/src/gui/plugin/AlarmWidget/CAlarmDeviceTreeModel.h

@@ -1,4 +1,4 @@
-/****************************************************************************
+/****************************************************************************
 **
 ** Copyright (C) 2016 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/

product/src/gui/plugin/AlarmWidget/CAlarmDeviceTreeView.cpp

@@ -1,4 +1,4 @@
-#include "CAlarmDeviceTreeView.h"
+#include "CAlarmDeviceTreeView.h"
 #include "CAlarmDeviceTreeModel.h"
 #include "CAlarmDeviceTreeItem.h"
 #include <QMenu>
@@ -10,6 +10,7 @@ CAlarmDeviceTreeView::CAlarmDeviceTreeView(QWidget *parent)
 
 }
 
+/*
 void CAlarmDeviceTreeView::contextMenuEvent(QContextMenuEvent *event)
 {
     CAlarmDeviceTreeModel * pModel = dynamic_cast<CAlarmDeviceTreeModel *>(model());
@@ -33,25 +34,26 @@ void CAlarmDeviceTreeView::contextMenuEvent(QContextMenuEvent *event)
     }
     return;
 }
+*/
 
-//void CAlarmDeviceTreeView::contextMenuEvent(QContextMenuEvent *event)
+void CAlarmDeviceTreeView::contextMenuEvent(QContextMenuEvent *event)
-//{
+{
-//    CAlarmDeviceTreeModel * pModel = dynamic_cast<CAlarmDeviceTreeModel *>(model());
+    CAlarmDeviceTreeModel * pModel = dynamic_cast<CAlarmDeviceTreeModel *>(model());
-//    if(Q_NULLPTR != pModel)
+    if(Q_NULLPTR != pModel)
-//    {
+    {
-//        QMenu menu;
+        QMenu menu;
-//        CAlarmDeviceTreeItem * pItem = static_cast<CAlarmDeviceTreeItem*>(indexAt(event->pos()).internalPointer());
+        CAlarmDeviceTreeItem * pItem = static_cast<CAlarmDeviceTreeItem*>(indexAt(event->pos()).internalPointer());
-//        if (Q_NULLPTR == pItem)
+        if (Q_NULLPTR == pItem)
-//        {
+        {
-//            menu.addAction(tr("全选"), [=](){ pModel->setAllDeviceCheckState(Qt::Checked); });
+            menu.addAction(tr("全选"), [=](){ pModel->setAllDeviceCheckState(Qt::Checked); });
-//            menu.addAction(tr("清空"), [=](){ pModel->setAllDeviceCheckState(Qt::Unchecked); });
+            menu.addAction(tr("清空"), [=](){ pModel->setAllDeviceCheckState(Qt::Unchecked); });
-//        }
+        }
-//        else if (Q_NULLPTR != pItem && pItem->childCount() > 0)
+        else if (Q_NULLPTR != pItem && pItem->childCount() > 0)
-//        {
+        {
-//            menu.addAction(tr("选择"), [=](){ pModel->setDeviceCheckState(indexAt(event->pos()), Qt::Checked); });
+            menu.addAction(tr("选择"), [=](){ pModel->setDeviceCheckState(indexAt(event->pos()), Qt::Checked); });
-//            menu.addAction(tr("清除"), [=](){ pModel->setDeviceCheckState(indexAt(event->pos()), Qt::Unchecked); });
+            menu.addAction(tr("清除"), [=](){ pModel->setDeviceCheckState(indexAt(event->pos()), Qt::Unchecked); });
-//        }
+        }
-//        menu.exec(event->globalPos());
+        menu.exec(event->globalPos());
-//    }
+    }
-//    return;
+    return;
-//}
+}

product/src/gui/plugin/AlarmWidget/CAlarmDeviceTreeView.h

@@ -1,4 +1,4 @@
-#ifndef CALARMDEVICETREEVIEW_H
+#ifndef CALARMDEVICETREEVIEW_H
 #define CALARMDEVICETREEVIEW_H
 
 #include <QTreeView>

product/src/gui/plugin/AlarmWidget/CAlarmFilterDialog.cpp

@@ -1,4 +1,4 @@
-#include "CAlarmFilterDialog.h"
+#include "CAlarmFilterDialog.h"
 #include "ui_CAlarmFilterDialog.h"
 #include "public/pub_sysinfo_api/SysInfoApi.h"
 #include "pub_utility_api/FileStyle.h"

product/src/gui/plugin/AlarmWidget/CAlarmFilterDialog.h

@@ -1,4 +1,4 @@
-#ifndef CALARMFILTERDIALOG_H
+#ifndef CALARMFILTERDIALOG_H
 #define CALARMFILTERDIALOG_H
 
 #include <QMap>

product/src/gui/plugin/AlarmWidget/CAlarmFilterDialog.ui

@@ -6,13 +6,13 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>657</width>
+    <width>1000</width>
-    <height>510</height>
+    <height>546</height>
    </rect>
   </property>
   <property name="minimumSize">
    <size>
-    <width>530</width>
+    <width>1000</width>
     <height>0</height>
    </size>
   </property>

product/src/gui/plugin/AlarmWidget/CAlarmForm.cpp

@@ -1,4 +1,4 @@
-#include "CAlarmForm.h"
+#include "CAlarmForm.h"
 #include <QMenu>
 #include <QMessageBox>
 #include <QFileDialog>
@@ -38,6 +38,7 @@
 #include "CAlarmBaseData.h"
 #include "CAlarmShiledDialog.h"
 #include "CAccidentReviewDialog.h"
+#include "pub_utility_api/FileStyle.h"
 CAlarmForm::CAlarmForm(QWidget *parent) :
     QWidget(parent),
     m_ptrSysInfo(Q_NULLPTR),
@@ -63,7 +64,7 @@ CAlarmForm::CAlarmForm(QWidget *parent) :
     ui->alarmView->setObjectName("alarmView");
     ui->splitter->setStretchFactor(0,1);
     ui->splitter->setStretchFactor(1,6);
-
+    initStyle();
     QHBoxLayout * pHBoxLayout = new QHBoxLayout(ui->deviceView->header());
     m_pSearchTextEdit = new QLineEdit(ui->deviceView->header());
     m_pSearchTextEdit->setObjectName("searchTextEdit");
@@ -132,6 +133,24 @@ CAlarmForm::CAlarmForm(QWidget *parent) :
     m_thread->start();
 }
 
+void CAlarmForm::initStyle(){
+    QString qss = QString();
+    std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("alarmForm.qss") ;
+    QFile qssfile2(QString::fromStdString(strFullPath));
+    qssfile2.open(QFile::ReadOnly);
+    if (qssfile2.isOpen())
+    {
+        qss += QLatin1String(qssfile2.readAll());
+        qssfile2.close();
+    }
+    if(!qss.isEmpty())
+    {
+        setStyleSheet(qss);
+    }
+
+}
+
+
 CAlarmForm::~CAlarmForm()
 {
     if(m_communicator != Q_NULLPTR)
@@ -207,7 +226,7 @@ void CAlarmForm::initialize()
 
     //< lingdaoyaoqiu
     {
-        QSettings columFlags("KBD_HMI", "alarm config");
+        QSettings columFlags("IOT_HMI", "alarm config");
         if(!columFlags.contains(QString("alarm/colum_0")))
         {
             columFlags.setValue(QString("alarm/colum_0"), false);   //< 时间
@@ -216,8 +235,8 @@ void CAlarmForm::initialize()
             columFlags.setValue(QString("alarm/colum_3"), true);    //< 责任区
             columFlags.setValue(QString("alarm/colum_4"), true);    //< 告警类型
             columFlags.setValue(QString("alarm/colum_5"), false);   //< 告警状态
-            columFlags.setValue(QString("alarm/colum_6"), false);   //< 确认状态
+            columFlags.setValue(QString("alarm/colum_6"), true);   //< 确认状态
-            columFlags.setValue(QString("alarm/colum_7"), false);   //<
+            columFlags.setValue(QString("alarm/colum_7"), true);   //<
         }
     }
     ui->comboBox->setModel(m_pListWidget1->model());
@@ -692,7 +711,8 @@ void CAlarmForm::setAlarmModel(CAlarmItemModel *model,CAiAlarmTreeModel *treeMod
 
     connect(ui->alarmView->horizontalHeader(), SIGNAL(sortIndicatorChanged(int,Qt::SortOrder)), m_pModel, SLOT(sortColumn(int,Qt::SortOrder)));
     connect(ui->aiAlarmTreeView->header(),&QHeaderView::sortIndicatorChanged, m_treeModel,&CAiAlarmTreeModel::sortColumn);
-    connect(ui->aiAlarmTreeView,&CAiAlarmTreeView::doubleClicked, this,&CAlarmForm::aiAlmDoubleClicked);
+    //先注释掉，想启用的话可以通过脚本绑定
+    //connect(ui->aiAlarmTreeView,&CAiAlarmTreeView::doubleClicked, this,&CAlarmForm::aiAlmDoubleClicked);
     ui->confirm->setEnabled(true);
     ui->remove->setEnabled(true);
     //原始告警窗
@@ -703,7 +723,7 @@ void CAlarmForm::setAlarmModel(CAlarmItemModel *model,CAiAlarmTreeModel *treeMod
     ui->alarmView->setColumnWidth(5, 150);
     ui->alarmView->setColumnWidth(6, 120);
 
-    QSettings columFlags("KBD_HMI", "alarm config");
+    QSettings columFlags("IOT_HMI", "alarm config");
     for(int nColumnIndex(0); nColumnIndex < m_pModel->columnCount() - 1; nColumnIndex++)
     {
         bool visible = columFlags.value(QString("alarm/colum_%1").arg(nColumnIndex)).toBool();
@@ -761,7 +781,7 @@ void CAlarmForm::setAlarmModel(CAlarmItemModel *model)
     ui->alarmView->setColumnWidth(6, 120);
 
 
-    QSettings columFlags("KBD_HMI", "alarm config");
+    QSettings columFlags("IOT_HMI", "alarm config");
     for(int nColumnIndex(0); nColumnIndex < m_pModel->columnCount() - 1; nColumnIndex++)
     {
         bool visible = columFlags.value(QString("alarm/colum_%1").arg(nColumnIndex)).toBool();
@@ -774,6 +794,7 @@ void CAlarmForm::setAlarmModel(CAlarmItemModel *model)
     {
         connect(m_pDeviceModel, &CAlarmDeviceTreeModel::itemCheckStateChanged, this, &CAlarmForm::deviceGroupFilterChanged);
         connect(m_pDeviceModel, &CAlarmDeviceTreeModel::inhibitDevGroupAlm, this, &CAlarmForm::slotInhibitDevGroupAlm);
+        connect(CAlarmDataCollect::instance(),&CAlarmDataCollect::sigDevTreeUpdate,m_pDeviceModel,&CAlarmDeviceTreeModel::slotDevTreeUpdate);
     }
     initFilter();
 }
@@ -1337,7 +1358,7 @@ void CAlarmForm::contextMenuStack0Event(QContextMenuEvent *event)
             connect(action, &QAction::triggered, [=](){
                 ui->alarmView->setColumnHidden(nColumnIndex, !action->isChecked());
                 ui->aiAlarmTreeView->setColumnHidden(nColumnIndex, !action->isChecked());
-                QSettings columFlags("KBD_HMI", "alarm config");
+                QSettings columFlags("IOT_HMI", "alarm config");
                 columFlags.setValue(QString("alarm/colum_%1").arg(nColumnIndex), !action->isChecked());
             });
         }
@@ -1460,7 +1481,7 @@ void CAlarmForm::contextMenuStack1Event(QContextMenuEvent *event)
             connect(action, &QAction::triggered, [=](){
                 ui->alarmView->setColumnHidden(nColumnIndex, !action->isChecked());
                 ui->aiAlarmTreeView->setColumnHidden(nColumnIndex, !action->isChecked());
-                QSettings columFlags("KBD_HMI", "alarm config");
+                QSettings columFlags("IOT_HMI", "alarm config");
                 columFlags.setValue(QString("alarm/colum_%1").arg(nColumnIndex), !action->isChecked());
             });
         }
@@ -2902,17 +2923,15 @@ void CAlarmForm::inhibitAlm(const AlarmMsgPtr &alm)
     msg.setSubject(alm->sub_system, CH_HMI_TO_OPT_OPTCMD_DOWN);
     SOptTagSet sOptTagSet;
     SOptTagQueue optTagQueue;
-    COptTagSet cOptTagSet;
 
-    if(createReqHead(sOptTagSet.stHead,alm)!= kbdSuccess)
+    if(createReqHead(sOptTagSet.stHead,alm)!= iotSuccess)
     {
         return ;
     }
     QString keyIdTag = alm->key_id_tag;
     if(keyIdTag.endsWith(".value"))
     {
-        //禁止告警和实时数据代码一致，要不实时数据 插件取消告警会失败；
+        keyIdTag.replace(QString(".value"),QString(".status"));
-       // keyIdTag.replace(QString(".value"),QString(".status"));
     }else
     {
         return ;
@@ -2927,7 +2946,7 @@ void CAlarmForm::inhibitAlm(const AlarmMsgPtr &alm)
     optTagQueue.nSubSystem = alm->sub_system;
 
     sOptTagSet.vecTagQueue.push_back(optTagQueue);
-    std::string content = cOptTagSet.generate(sOptTagSet);
+    std::string content = COptTagSet::generate(sOptTagSet);
 
     msg.setMsgType(MT_OPT_PINHIBIT_ALARM);
 
@@ -2998,7 +3017,7 @@ int CAlarmForm::createReqHead(SOptReqHead &head, const AlarmMsgPtr &alm)
         if(!createSysInfoInstance(m_ptrSysInfo))
         {
             LOGERROR("创建系统信息访问库实例失败!");
-            return kbdFailed;
+            return iotFailed;
         }
     }
 
@@ -3014,13 +3033,13 @@ int CAlarmForm::createReqHead(SOptReqHead &head, const AlarmMsgPtr &alm)
         if(permMng->PermDllInit() != PERM_NORMAL)
         {
             LOGERROR("权限接口初始化失败!");
-            return kbdFailed;
+            return iotFailed;
         }else
         {
             if(PERM_NORMAL != permMng->CurUser(userID, usergID, level, loginSec, instanceName))
             {
                 userID = -1;
-                return kbdFailed;
+                return iotFailed;
             }
         }
     }
@@ -3044,7 +3063,7 @@ int CAlarmForm::createReqHead(SOptReqHead &head, const AlarmMsgPtr &alm)
     head.nUserGroupID = usergID;
     head.nOptTime = QDateTime::currentDateTime().toMSecsSinceEpoch();
 
-    return kbdSuccess;
+    return iotSuccess;
 }
 
 void CAlarmForm::reloadDevTree()

product/src/gui/plugin/AlarmWidget/CAlarmForm.h

@@ -1,4 +1,4 @@
-#ifndef CALARMFORM_H
+#ifndef CALARMFORM_H
 #define CALARMFORM_H
 
 #include <QWidget>
@@ -49,7 +49,7 @@ public:
     void initialize();
 
     void init();
-
+    void initStyle();
     void setAlarmModel(CAlarmItemModel * model, CAiAlarmTreeModel *treeModel);
 
     void setAlarmModel(CAlarmItemModel * model);

product/src/gui/plugin/AlarmWidget/CAlarmForm.ui

@@ -40,25 +40,55 @@
      <property name="lineWidth">
       <number>0</number>
      </property>
-     <layout class="QGridLayout" name="gridLayout_4">
+     <layout class="QGridLayout" name="gridLayout">
+      <property name="leftMargin">
+       <number>9</number>
+      </property>
       <property name="topMargin">
        <number>0</number>
       </property>
-      <property name="bottomMargin">
+      <property name="rightMargin">
        <number>9</number>
       </property>
-      <property name="verticalSpacing">
+      <property name="bottomMargin">
        <number>0</number>
       </property>
-      <item row="0" column="0">
+      <property name="horizontalSpacing">
-       <widget class="QFrame" name="frame_2">
+       <number>0</number>
+      </property>
+      <property name="verticalSpacing">
+       <number>6</number>
+      </property>
+      <item row="3" column="0">
+       <widget class="QFrame" name="frame_3">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize">
+         <size>
+          <width>0</width>
+          <height>40</height>
+         </size>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>16777215</width>
+          <height>16777215</height>
+         </size>
+        </property>
         <property name="frameShape">
          <enum>QFrame::StyledPanel</enum>
         </property>
         <property name="frameShadow">
          <enum>QFrame::Raised</enum>
         </property>
-        <layout class="QGridLayout" name="gridLayout_3">
+        <layout class="QHBoxLayout" name="horizontalLayout">
+         <property name="spacing">
+          <number>6</number>
+         </property>
          <property name="leftMargin">
           <number>0</number>
          </property>
@@ -66,414 +96,141 @@
           <number>0</number>
          </property>
          <property name="rightMargin">
-          <number>9</number>
+          <number>0</number>
          </property>
          <property name="bottomMargin">
           <number>0</number>
          </property>
-         <property name="verticalSpacing">
+         <item>
-          <number>0</number>
+          <layout class="QHBoxLayout" name="horizontalLayout_3">
-         </property>
+           <property name="leftMargin">
-         <item row="0" column="0">
+            <number>0</number>
-          <layout class="QHBoxLayout" name="horizontalLayout">
+           </property>
-           <property name="spacing">
+           <property name="bottomMargin">
-            <number>6</number>
+            <number>0</number>
            </property>
            <item>
-            <widget class="QPushButton" name="inhibit">
+            <widget class="QLabel" name="label">
+             <property name="text">
+              <string>当前显示数量：</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLabel" name="showRow">
              <property name="minimumSize">
               <size>
-               <width>100</width>
+               <width>55</width>
                <height>0</height>
               </size>
              </property>
-             <property name="maximumSize">
-              <size>
-               <width>100</width>
-               <height>26</height>
-              </size>
-             </property>
              <property name="text">
-              <string>禁止列表</string>
+              <string>0</string>
              </property>
             </widget>
            </item>
            <item>
-            <widget class="QPushButton" name="filter">
+            <widget class="QLabel" name="label_2">
-             <property name="sizePolicy">
+             <property name="text">
-              <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+              <string>过滤告警数量：</string>
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
              </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLabel" name="filterRow">
              <property name="minimumSize">
               <size>
-               <width>45</width>
+               <width>55</width>
                <height>0</height>
               </size>
              </property>
-             <property name="maximumSize">
-              <size>
-               <width>45</width>
-               <height>26</height>
-              </size>
-             </property>
              <property name="text">
-              <string>过滤</string>
+              <string>0</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QPushButton" name="print">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="minimumSize">
-              <size>
-               <width>45</width>
-               <height>0</height>
-              </size>
-             </property>
-             <property name="maximumSize">
-              <size>
-               <width>45</width>
-               <height>26</height>
-              </size>
-             </property>
-             <property name="text">
-              <string>导出</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QLabel" name="label_3">
-             <property name="minimumSize">
-              <size>
-               <width>0</width>
-               <height>0</height>
-              </size>
-             </property>
-             <property name="maximumSize">
-              <size>
-               <width>16777215</width>
-               <height>26</height>
-              </size>
-             </property>
-             <property name="layoutDirection">
-              <enum>Qt::RightToLeft</enum>
-             </property>
-             <property name="text">
-              <string>优先级:</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QComboBox" name="comboBox">
-             <property name="minimumSize">
-              <size>
-               <width>125</width>
-               <height>0</height>
-              </size>
-             </property>
-             <property name="maximumSize">
-              <size>
-               <width>16777215</width>
-               <height>26</height>
-              </size>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QLabel" name="label_4">
-             <property name="minimumSize">
-              <size>
-               <width>0</width>
-               <height>0</height>
-              </size>
-             </property>
-             <property name="maximumSize">
-              <size>
-               <width>16777215</width>
-               <height>26</height>
-              </size>
-             </property>
-             <property name="layoutDirection">
-              <enum>Qt::RightToLeft</enum>
-             </property>
-             <property name="text">
-              <string>位置:</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QComboBox" name="comboBox_2">
-             <property name="minimumSize">
-              <size>
-               <width>113</width>
-               <height>0</height>
-              </size>
-             </property>
-             <property name="maximumSize">
-              <size>
-               <width>16777215</width>
-               <height>26</height>
-              </size>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QLabel" name="label_5">
-             <property name="minimumSize">
-              <size>
-               <width>0</width>
-               <height>0</height>
-              </size>
-             </property>
-             <property name="maximumSize">
-              <size>
-               <width>16777215</width>
-               <height>26</height>
-              </size>
-             </property>
-             <property name="layoutDirection">
-              <enum>Qt::RightToLeft</enum>
-             </property>
-             <property name="text">
-              <string>告警状态:</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QComboBox" name="comboBox_3">
-             <property name="minimumSize">
-              <size>
-               <width>138</width>
-               <height>0</height>
-              </size>
-             </property>
-             <property name="maximumSize">
-              <size>
-               <width>16777215</width>
-               <height>26</height>
-              </size>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QLabel" name="label_6">
-             <property name="minimumSize">
-              <size>
-               <width>0</width>
-               <height>0</height>
-              </size>
-             </property>
-             <property name="maximumSize">
-              <size>
-               <width>16777215</width>
-               <height>26</height>
-              </size>
-             </property>
-             <property name="text">
-              <string>时间:</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QLineEdit" name="lineEdit">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="minimumSize">
-              <size>
-               <width>200</width>
-               <height>0</height>
-              </size>
-             </property>
-             <property name="maximumSize">
-              <size>
-               <width>200</width>
-               <height>26</height>
-              </size>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <layout class="QGridLayout" name="gridLayout">
-             <property name="leftMargin">
-              <number>0</number>
-             </property>
-             <property name="horizontalSpacing">
-              <number>2</number>
-             </property>
-             <property name="verticalSpacing">
-              <number>3</number>
-             </property>
-             <item row="0" column="1">
-              <widget class="QLabel" name="showRow">
-               <property name="minimumSize">
-                <size>
-                 <width>55</width>
-                 <height>0</height>
-                </size>
-               </property>
-               <property name="text">
-                <string>0</string>
-               </property>
-              </widget>
-             </item>
-             <item row="1" column="0">
-              <widget class="QLabel" name="label_2">
-               <property name="text">
-                <string>过滤告警数量：</string>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="0">
-              <widget class="QLabel" name="label">
-               <property name="text">
-                <string>当前显示数量：</string>
-               </property>
-              </widget>
-             </item>
-             <item row="1" column="1">
-              <widget class="QLabel" name="filterRow">
-               <property name="minimumSize">
-                <size>
-                 <width>55</width>
-                 <height>0</height>
-                </size>
-               </property>
-               <property name="text">
-                <string>0</string>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </item>
-           <item>
-            <widget class="QCheckBox" name="checkBox">
-             <property name="minimumSize">
-              <size>
-               <width>80</width>
-               <height>26</height>
-              </size>
-             </property>
-             <property name="maximumSize">
-              <size>
-               <width>16777215</width>
-               <height>26</height>
-              </size>
-             </property>
-             <property name="text">
-              <string>智能告警</string>
-             </property>
-             <property name="checkable">
-              <bool>true</bool>
-             </property>
-             <property name="checked">
-              <bool>false</bool>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <spacer name="horizontalSpacer">
-             <property name="orientation">
-              <enum>Qt::Horizontal</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>13</width>
-               <height>20</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-           <item>
-            <widget class="QPushButton" name="confirm">
-             <property name="enabled">
-              <bool>false</bool>
-             </property>
-             <property name="maximumSize">
-              <size>
-               <width>45</width>
-               <height>26</height>
-              </size>
-             </property>
-             <property name="styleSheet">
-              <string notr="true"/>
-             </property>
-             <property name="text">
-              <string>确认</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QPushButton" name="remove">
-             <property name="enabled">
-              <bool>false</bool>
-             </property>
-             <property name="maximumSize">
-              <size>
-               <width>45</width>
-               <height>26</height>
-              </size>
-             </property>
-             <property name="text">
-              <string>删除</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QPushButton" name="inhiAlarm">
-             <property name="minimumSize">
-              <size>
-               <width>45</width>
-               <height>26</height>
-              </size>
-             </property>
-             <property name="text">
-              <string>禁止告警</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QPushButton" name="set">
-             <property name="maximumSize">
-              <size>
-               <width>45</width>
-               <height>26</height>
-              </size>
-             </property>
-             <property name="text">
-              <string>设置</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QPushButton" name="closeBtn">
-             <property name="maximumSize">
-              <size>
-               <width>45</width>
-               <height>26</height>
-              </size>
-             </property>
-             <property name="text">
-              <string>关闭</string>
              </property>
             </widget>
            </item>
           </layout>
          </item>
+         <item>
+          <widget class="QCheckBox" name="checkBox">
+           <property name="enabled">
+            <bool>true</bool>
+           </property>
+           <property name="minimumSize">
+            <size>
+             <width>80</width>
+             <height>26</height>
+            </size>
+           </property>
+           <property name="maximumSize">
+            <size>
+             <width>1000</width>
+             <height>26</height>
+            </size>
+           </property>
+           <property name="text">
+            <string>智能告警</string>
+           </property>
+           <property name="checked">
+            <bool>false</bool>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="horizontalSpacer">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeType">
+            <enum>QSizePolicy::Preferred</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>800</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="QPushButton" name="set">
+           <property name="enabled">
+            <bool>true</bool>
+           </property>
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="maximumSize">
+            <size>
+             <width>60</width>
+             <height>26</height>
+            </size>
+           </property>
+           <property name="text">
+            <string>设置</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="closeBtn">
+           <property name="maximumSize">
+            <size>
+             <width>60</width>
+             <height>26</height>
+            </size>
+           </property>
+           <property name="text">
+            <string>关闭</string>
+           </property>
+          </widget>
+         </item>
         </layout>
        </widget>
       </item>
-      <item row="1" column="0">
+      <item row="2" column="0">
        <widget class="QSplitter" name="splitter">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
@@ -503,7 +260,7 @@
         </widget>
         <widget class="QStackedWidget" name="stackedWidget">
          <property name="currentIndex">
-          <number>1</number>
+          <number>0</number>
          </property>
          <widget class="QWidget" name="page">
           <layout class="QGridLayout" name="gridLayout_2">
@@ -522,7 +279,7 @@
            <property name="bottomMargin">
             <number>0</number>
            </property>
-           <item row="0" column="0">
+           <item row="1" column="0">
             <widget class="CAlarmView" name="alarmView">
              <property name="minimumSize">
               <size>
@@ -578,6 +335,332 @@
         </widget>
        </widget>
       </item>
+      <item row="1" column="0">
+       <layout class="QGridLayout" name="gridLayout_3">
+        <property name="leftMargin">
+         <number>0</number>
+        </property>
+        <property name="topMargin">
+         <number>9</number>
+        </property>
+        <property name="rightMargin">
+         <number>0</number>
+        </property>
+        <property name="bottomMargin">
+         <number>9</number>
+        </property>
+        <item row="0" column="11">
+         <widget class="QPushButton" name="inhibit">
+          <property name="minimumSize">
+           <size>
+            <width>100</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>100</width>
+            <height>26</height>
+           </size>
+          </property>
+          <property name="text">
+           <string>禁止列表</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="0">
+         <widget class="QLabel" name="label_3">
+          <property name="minimumSize">
+           <size>
+            <width>0</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>16777215</width>
+            <height>26</height>
+           </size>
+          </property>
+          <property name="layoutDirection">
+           <enum>Qt::RightToLeft</enum>
+          </property>
+          <property name="text">
+           <string>优先级:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="3">
+         <widget class="QLabel" name="label_4">
+          <property name="minimumSize">
+           <size>
+            <width>0</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>16777215</width>
+            <height>26</height>
+           </size>
+          </property>
+          <property name="layoutDirection">
+           <enum>Qt::RightToLeft</enum>
+          </property>
+          <property name="text">
+           <string>位置:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="10">
+         <widget class="QPushButton" name="filter">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize">
+           <size>
+            <width>65</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>65</width>
+            <height>26</height>
+           </size>
+          </property>
+          <property name="text">
+           <string>过滤</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="12">
+         <widget class="QPushButton" name="print">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize">
+           <size>
+            <width>65</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>65</width>
+            <height>26</height>
+           </size>
+          </property>
+          <property name="text">
+           <string>导出</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="13">
+         <widget class="QPushButton" name="remove">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>65</width>
+            <height>26</height>
+           </size>
+          </property>
+          <property name="text">
+           <string>删除</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="4">
+         <widget class="QComboBox" name="comboBox_2">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize">
+           <size>
+            <width>150</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>1000</width>
+            <height>26</height>
+           </size>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="1">
+         <widget class="QComboBox" name="comboBox">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize">
+           <size>
+            <width>150</width>
+            <height>26</height>
+           </size>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>1000</width>
+            <height>26</height>
+           </size>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="15">
+         <widget class="QPushButton" name="inhiAlarm">
+          <property name="minimumSize">
+           <size>
+            <width>45</width>
+            <height>26</height>
+           </size>
+          </property>
+          <property name="text">
+           <string>禁止告警</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="14">
+         <widget class="QPushButton" name="confirm">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>65</width>
+            <height>26</height>
+           </size>
+          </property>
+          <property name="styleSheet">
+           <string notr="true"/>
+          </property>
+          <property name="text">
+           <string>确认</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="9">
+         <spacer name="horizontalSpacer_2">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeType">
+           <enum>QSizePolicy::Preferred</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>200</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item row="1" column="0">
+         <widget class="QLabel" name="label_6">
+          <property name="minimumSize">
+           <size>
+            <width>0</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>16777215</width>
+            <height>26</height>
+           </size>
+          </property>
+          <property name="text">
+           <string>时间:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="3">
+         <widget class="QLabel" name="label_5">
+          <property name="minimumSize">
+           <size>
+            <width>0</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>16777215</width>
+            <height>26</height>
+           </size>
+          </property>
+          <property name="layoutDirection">
+           <enum>Qt::RightToLeft</enum>
+          </property>
+          <property name="text">
+           <string>告警状态:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="1">
+         <widget class="QLineEdit" name="lineEdit">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize">
+           <size>
+            <width>150</width>
+            <height>26</height>
+           </size>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="4">
+         <widget class="QComboBox" name="comboBox_3">
+          <property name="minimumSize">
+           <size>
+            <width>250</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>16777215</width>
+            <height>26</height>
+           </size>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="2">
+         <spacer name="horizontalSpacer_3">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeType">
+           <enum>QSizePolicy::Preferred</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </item>
      </layout>
     </widget>
    </item>

product/src/gui/plugin/AlarmWidget/CAlarmInhibitDialog.cpp

@@ -1,4 +1,4 @@
-#include "CAlarmInhibitDialog.h"
+#include "CAlarmInhibitDialog.h"
 #include "ui_CAlarmInhibitDialog.h"
 #include <QDateTime>
 #include <QFile>

product/src/gui/plugin/AlarmWidget/CAlarmInhibitDialog.h

@@ -1,4 +1,4 @@
-#ifndef CALARMINHIBITDIALOG_H
+#ifndef CALARMINHIBITDIALOG_H
 #define CALARMINHIBITDIALOG_H
 
 #include <QMap>

product/src/gui/plugin/AlarmWidget/CAlarmItemModel.cpp

@@ -1,4 +1,4 @@
-#include "CAlarmItemModel.h"
+#include "CAlarmItemModel.h"
 #include "CAlarmMsgInfo.h"
 #include <QModelIndex>
 #include <QHeaderView>
@@ -8,7 +8,19 @@
 #include "CAlarmMsgManage.h"
 #include "perm_mng_api/PermMngApi.h"
 #include <QDebug>
+
+//< 屏蔽xml_parser编译告警
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-copy"
+#endif
+
 #include "boost/property_tree/xml_parser.hpp"
+
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
+
 #include "boost/typeof/typeof.hpp"
 #include "boost/filesystem.hpp"
 #include "Common.h"
@@ -351,11 +363,11 @@ void CAlarmItemModel::sortColumn(int column, Qt::SortOrder order)
 {
     if(order == Qt::AscendingOrder)
     {
-        m_order = Qt::DescendingOrder;
+        m_order = Qt::AscendingOrder;
     }
     else
     {
-        m_order = Qt::AscendingOrder;
+        m_order = Qt::DescendingOrder;
     }
     m_sortKey = (E_ALARM_SORTKEY)column;
     beginResetModel();

product/src/gui/plugin/AlarmWidget/CAlarmItemModel.h

@@ -1,4 +1,4 @@
-#ifndef CALARMITEMMODEL_H
+#ifndef CALARMITEMMODEL_H
 #define CALARMITEMMODEL_H
 
 #include <QSet>

product/src/gui/plugin/AlarmWidget/CAlarmMediaPlayer.cpp

@@ -1,4 +1,4 @@
-
+
 #ifdef OS_WINDOWS
 //< 为了检测可用声卡
 #include <mmdeviceapi.h>
@@ -16,11 +16,6 @@
 #include "CAlarmSetMng.h"
 #include "service/alarm_server_api/AlarmCommonDef.h"
 #include "CAlarmMsgManage.h"
-#include <QDomDocument>
-#include <QDomElement>
-#include <QDomNode>
-#include <QDomNodeList>
-#include <QRegExp>
 
 using namespace iot_public;
 CAlarmMediaPlayer * CAlarmMediaPlayer::m_pInstance = NULL;
@@ -183,40 +178,6 @@ void CAlarmMediaPlayer::initSpeech()
             }
         }
     }
-    //添加语音转文本处理条件
-    QFile file(iot_public::CFileUtil::getPathOfCfgFile("alarmSpeechTextTrans.xml" , CN_DIR_PRODUCT).c_str());
-    if (!file.open(QFile::ReadWrite))
-    {
-        LOGERROR("打开语音文本转换文件失败,默认不进行语音转换");
-        return;
-    }
-
-    QDomDocument doc;
-    if (!doc.setContent(&file))
-    {
-         file.close();
-         LOGERROR("打开语音文本转换文件失败,默认不进行语音转换");
-         return;
-     }
-     file.close();
-
-    QDomElement root = doc.documentElement();
-    if(root.isElement())
-    {
-        QDomNodeList nodeList = root.childNodes();
-        for(int i = 0 ; i < nodeList.count() ; i++)
-        {
-            QDomNode node = nodeList.at(i);
-            if(node.isElement())
-            {
-                QDomElement element = node.toElement();
-                if(element.tagName() == "Condition" && element.attribute("enable") == "true")
-                {
-                    m_mapSpeechTxtTrans.insert(element.attribute("key"),element.attribute("value"));
-                }
-            }
-        }
-    }
 
 }
 
@@ -263,17 +224,6 @@ void CAlarmMediaPlayer::insertAudioCuesStop(const AlarmMsgPtr &info)
     }
 }
 
-void CAlarmMediaPlayer::speechTextTrans(QString &strContent)
-{
-//    strContent = "110KV回路503弹簧开关10A保护A线";
-    //文本转换处理
-    auto iter = m_mapSpeechTxtTrans.begin();
-    for(;iter != m_mapSpeechTxtTrans.end() ; iter++)
-    {
-        strContent.replace(QRegExp(iter.key() , Qt::CaseInsensitive) , iter.value());
-    }
-}
-
 void CAlarmMediaPlayer::setVolumeEnable(bool bEnable)
 {
     if(bEnable)
@@ -467,8 +417,6 @@ void CAlarmMediaPlayer::updateAudioCuesSpeech()
 
     if(!alarmContent.isEmpty())
     {
-        //读取配置文件，更改读取方式
-        speechTextTrans(alarmContent);
         m_pTextToSpeech->say(alarmContent);
     }
 }

product/src/gui/plugin/AlarmWidget/CAlarmMediaPlayer.h

@@ -1,4 +1,4 @@
-#ifndef CALARMMEDIAPLAYER_H
+#ifndef CALARMMEDIAPLAYER_H
 #define CALARMMEDIAPLAYER_H
 
 #include <QObject>
@@ -53,8 +53,6 @@ private:
 
     void insertAudioCuesStop(const AlarmMsgPtr &info);
 
-    void speechTextTrans(QString &strContent);//读取配置文件，调整文本语音输出
-
 private slots:
     /**
      * @brief playerStateChanged 播放器状态变化
@@ -92,7 +90,6 @@ private:
     QString m_engine;
     QString m_language;
     QString m_voiceName;
-    QMap<QString,QString> m_mapSpeechTxtTrans;
 
     bool m_readFlag;
 

product/src/gui/plugin/AlarmWidget/CAlarmMsgInfo.cpp

@@ -1,4 +1,4 @@
-#include "CAlarmMsgInfo.h"
+#include "CAlarmMsgInfo.h"
 #include <QDateTime>
 #include "CAlarmDataCollect.h"
 #include <QDebug>

product/src/gui/plugin/AlarmWidget/CAlarmMsgInfo.h

@@ -1,4 +1,4 @@
-#ifndef ALARMMSGINFO_H
+#ifndef ALARMMSGINFO_H
 #define ALARMMSGINFO_H
 
 #include <QMetaType>

product/src/gui/plugin/AlarmWidget/CAlarmMsgManage.cpp

@@ -1,4 +1,4 @@
-#include "CAlarmMsgManage.h"
+#include "CAlarmMsgManage.h"
 #include <QMutex>
 #include <QMutexLocker>
 #include <QDateTime>
@@ -8,7 +8,18 @@
 #include <QDebug>
 #include "perm_mng_api/PermMngApi.h"
 
+//< 屏蔽xml_parser编译告警
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-copy"
+#endif
+
 #include "boost/property_tree/xml_parser.hpp"
+
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
+
 #include "boost/typeof/typeof.hpp"
 #include "boost/filesystem.hpp"
 #include "Common.h"
@@ -201,12 +212,18 @@ void CAlarmMsgManage::updataDevGroupByDev(QString devGroup, QString device)
     }
 }
 
-QHash<int, QMap<QString, QSet<QString> > > CAlarmMsgManage::getLocNotConfirmAlmInfo()
+const QHash<int, QMap<QString, QSet<QString> > > &CAlarmMsgManage::getLocNotConfirmAlmInfo() const
 {
     QMutexLocker locker(mutex);
     return m_alarmLNCAlm;
 }
 
+const QHash<int, QMap<int, QSet<QString> > > &CAlarmMsgManage::getLocPriorityNotConfirmAlmInfo() const
+{
+    QMutexLocker locker(mutex);
+    return m_alarmLNCPAlm;
+}
+
 void CAlarmMsgManage::getAllInhibitAlm(QList<AlarmMsgPtr> &almList)
 {
     QMutexLocker locker(mutex);
@@ -929,42 +946,80 @@ void CAlarmMsgManage::locSubStats(const AlarmMsgPtr &msg)
     }
 }
 
-void CAlarmMsgManage::addNotConfirmAlm(int locId, const QString &devg, const QString &uuid)
+void CAlarmMsgManage::addNotConfirmAlm(const AlarmMsgPtr &msg)
 {
-    QHash<int,QMap<QString,QSet<QString> > >::iterator it =m_alarmLNCAlm.find(locId);
+    //< 按设备组
+    QHash<int,QMap<QString,QSet<QString> > >::iterator it =m_alarmLNCAlm.find(msg->location_id);
     if(it != m_alarmLNCAlm.end())
     {
         QMap<QString,QSet<QString> > &devgMap = it.value();
-        QMap<QString,QSet<QString> >::iterator pos = devgMap.find(devg);
+        QMap<QString,QSet<QString> >::iterator pos = devgMap.find(msg->dev_group_tag);
         if(pos != devgMap.end())
         {
-            pos.value().insert(uuid);
+            pos.value().insert(msg->uuid_base64);
         }else
         {
             QSet<QString> uuidSet;
-            uuidSet.insert(uuid);
+            uuidSet.insert(msg->uuid_base64);
-            devgMap[devg] = uuidSet;
+            devgMap[msg->dev_group_tag] = uuidSet;
         }
     }else
     {
         QMap<QString,QSet<QString> >  devgMap;
         QSet<QString> uuidSet;
-        uuidSet.insert(uuid);
+        uuidSet.insert(msg->uuid_base64);
-        devgMap[devg] = uuidSet;
+        devgMap[msg->dev_group_tag] = uuidSet;
-        m_alarmLNCAlm[locId] = devgMap;
+        m_alarmLNCAlm[msg->location_id] = devgMap;
+    }
+
+    //< 按告警等级
+    QHash<int,QMap<int,QSet<QString> > >::iterator pIt =m_alarmLNCPAlm.find(msg->location_id);
+    if(pIt != m_alarmLNCPAlm.end())
+    {
+        QMap<int,QSet<QString> > &pMap = pIt.value();
+        QMap<int,QSet<QString> >::iterator pos = pMap.find(msg->priority);
+        if(pos != pMap.end())
+        {
+            pos.value().insert(msg->uuid_base64);
+        }else
+        {
+            QSet<QString> uuidSet;
+            uuidSet.insert(msg->uuid_base64);
+            pMap[msg->priority] = uuidSet;
+        }
+    }else
+    {
+        QMap<int,QSet<QString> >  pMap;
+        QSet<QString> uuidSet;
+        uuidSet.insert(msg->uuid_base64);
+        pMap[msg->priority] = uuidSet;
+        m_alarmLNCPAlm[msg->location_id] = pMap;
     }
 }
 
-void CAlarmMsgManage::delNotConfirmAlm(int locId, const QString &devg, const QString &uuid)
+void CAlarmMsgManage::delNotConfirmAlm(const AlarmMsgPtr &msg)
 {
-    QHash<int,QMap<QString,QSet<QString> > >::iterator it =m_alarmLNCAlm.find(locId);
+    //< 按设备组
+    QHash<int,QMap<QString,QSet<QString> > >::iterator it =m_alarmLNCAlm.find(msg->location_id);
     if(it != m_alarmLNCAlm.end())
     {
         QMap<QString,QSet<QString> > &devgMap = it.value();
-        QMap<QString,QSet<QString> >::iterator pos = devgMap.find(devg);
+        QMap<QString,QSet<QString> >::iterator pos = devgMap.find(msg->dev_group_tag);
         if(pos != devgMap.end())
         {
-            pos.value().remove(uuid);
+            pos.value().remove(msg->uuid_base64);
+        }
+    }
+
+    //< 按告警等级
+    QHash<int,QMap<int,QSet<QString> > >::iterator pIt =m_alarmLNCPAlm.find(msg->location_id);
+    if(pIt != m_alarmLNCPAlm.end())
+    {
+        QMap<int,QSet<QString> > &pMap = pIt.value();
+        QMap<int,QSet<QString> >::iterator pos = pMap.find(msg->priority);
+        if(pos != pMap.end())
+        {
+            pos.value().remove(msg->uuid_base64);
         }
     }
 }
@@ -1080,7 +1135,7 @@ void CAlarmMsgManage::initAlarm()
 
         if(E_ALS_ALARM == (*itpos)->logic_state ||  E_ALS_RETURN == (*itpos)->logic_state )//未确认数量(界面显示未确认)
         {
-            addNotConfirmAlm((*itpos)->location_id,(*itpos)->dev_group_tag,(*itpos)->uuid_base64);
+            addNotConfirmAlm(*itpos);
             ++m_nNDelComAlarmCount;
         }
         updateMsgAction((*itpos));
@@ -1314,7 +1369,7 @@ void CAlarmMsgManage::addAlarmMsg(const QList<AlarmMsgPtr> &msgList)
         }
         if(E_ALS_ALARM == (*itpos)->logic_state ||  E_ALS_RETURN == (*itpos)->logic_state )//未确认数量(界面显示未确认)
         {
-            addNotConfirmAlm((*itpos)->location_id,(*itpos)->dev_group_tag,(*itpos)->uuid_base64);
+            addNotConfirmAlm(*itpos);
             ++m_nNDelComAlarmCount;
         }
         updateMsgAction(*itpos);
@@ -1390,7 +1445,7 @@ void CAlarmMsgManage::confirmAlarmMsg(const QList<QString> &uuidList)
                 oldMsg->logic_state = E_ALS_RETURN_CFM;
                 --m_nNDelComAlarmCount;
             }
-            delNotConfirmAlm(oldMsg->location_id,oldMsg->dev_group_tag,oldMsg->uuid_base64);
+            delNotConfirmAlm(oldMsg);
         }else
         {
             AlarmMsgPtr oldMsg_ = m_all.value(uuid, NULL);
@@ -1447,7 +1502,7 @@ int CAlarmMsgManage::removeAlarmMsg(const QList<QString> &uuidList)
             }
             if(E_ALS_ALARM == oldMsg->logic_state)
             {
-                delNotConfirmAlm(oldMsg->location_id,oldMsg->dev_group_tag,oldMsg->uuid_base64);
+                delNotConfirmAlm(oldMsg);
                 --m_nNDelComAlarmCount;
                 oldMsg->logic_state = E_ALS_ALARM_DEL;
             }
@@ -1457,7 +1512,7 @@ int CAlarmMsgManage::removeAlarmMsg(const QList<QString> &uuidList)
             }
             else if(E_ALS_RETURN == oldMsg->logic_state)
             {
-                delNotConfirmAlm(oldMsg->location_id,oldMsg->dev_group_tag,oldMsg->uuid_base64);
+                delNotConfirmAlm(oldMsg);
                 --m_nNDelComAlarmCount;
                 oldMsg->logic_state = E_ALS_RETURN_DEL;
             }
@@ -1574,7 +1629,7 @@ void CAlarmMsgManage::removeAlarmMsgByDomainID(const int &domainId)
         {
             if(E_ALS_ALARM == (*it)->logic_state || E_ALS_RETURN == (*it)->logic_state)
             {
-                delNotConfirmAlm((*it)->location_id,(*it)->dev_group_tag,(*it)->uuid_base64);
+                delNotConfirmAlm(*it);
                 --m_nNDelComAlarmCount;
             }
             removeAudioCues(it.value());
@@ -1788,7 +1843,7 @@ void CAlarmMsgManage::msgArrived()
 
         if(E_ALS_ALARM == m_listMsgAddCache.at(num)->logic_state ||  E_ALS_RETURN == m_listMsgAddCache.at(num)->logic_state )//未删除未确认数量(界面显示未确认)
         {
-            addNotConfirmAlm(m_listMsgAddCache.at(num)->location_id,m_listMsgAddCache.at(num)->dev_group_tag,m_listMsgAddCache.at(num)->uuid_base64);
+            addNotConfirmAlm(m_listMsgAddCache.at(num));
             ++m_nNDelComAlarmCount;
         }
         updateMsgAction(m_listMsgAddCache.at(num));

product/src/gui/plugin/AlarmWidget/CAlarmMsgManage.h

@@ -1,4 +1,4 @@
-#ifndef CALARMMSGMANAGE_H
+#ifndef CALARMMSGMANAGE_H
 #define CALARMMSGMANAGE_H
 
 #include <QObject>
@@ -79,7 +79,8 @@ public:
     QHash<int,QMap<int,int> > getLocAlmInfo();
     void updataDevGroupByDev(QString devGroup, QString device);
 
-    QHash<int,QMap<QString,QSet<QString> > > getLocNotConfirmAlmInfo();
+    const QHash<int,QMap<QString,QSet<QString> > > &getLocNotConfirmAlmInfo() const;
+    const QHash<int, QMap<int, QSet<QString> > > &getLocPriorityNotConfirmAlmInfo() const;
 
     void getAllInhibitAlm(QList<AlarmMsgPtr> &almList);
 signals:
@@ -267,18 +268,14 @@ private:
     void locSubStats(const AlarmMsgPtr &msg);
     /**
      * @brief addNotConfirmAlm 添加未确认的告警uuid
-     * @param locId
+     * @param msg
-     * @param devg
-     * @param uuid
      */
-    void addNotConfirmAlm(int locId,const QString &devg,const QString &uuid);
+    void addNotConfirmAlm(const AlarmMsgPtr &msg);
     /**
      * @brief delNotConfirmAlm 从未确认的告警uuid集合中删除（删除的不一定被确认 可能是数据重发）
-     * @param locId
+     * @param msg
-     * @param devg
-     * @param uuid
      */
-    void delNotConfirmAlm(int locId,const QString &devg,const QString &uuid);
+    void delNotConfirmAlm(const AlarmMsgPtr &msg);
 signals:
     /**
      * @brief sigAiMsgRemove 通知智能告警模型删除智能告警
@@ -406,6 +403,7 @@ private:
     QHash<int,QMap<int,int > > m_alarmLPAlm; //<        <车站id,<告警等级,告警数量> >
 
     QHash<int,QMap<QString,QSet<QString> > > m_alarmLNCAlm;//<        <车站id,<设备组,<未确认告警uuid> > >
+    QHash<int,QMap<int,QSet<QString> > > m_alarmLNCPAlm;//<        <车站id,<告警等级,<未确认告警uuid> > >
 
     QList<AiAlarmMsgPtr> m_delaydeal;  //延迟处理的智能告警
 

product/src/gui/plugin/AlarmWidget/CAlarmPlugin.cpp

@@ -1,4 +1,4 @@
-#include "CAlarmPlugin.h"
+#include "CAlarmPlugin.h"
 #include <QMediaPlaylist>
 #include <QHBoxLayout>
 #include <QFile>
@@ -693,13 +693,13 @@ int CAlarmPlugin::getLocNotConfirmAlmCount(int loc)
     {
         return count;
     }
-    QHash<int,QMap<QString,QSet<QString> > > locCountMap = CAlarmMsgManage::instance()->getLocNotConfirmAlmInfo();
+    const QHash<int,QMap<QString,QSet<QString> > > &locCountMap = CAlarmMsgManage::instance()->getLocNotConfirmAlmInfo();
 
-    QHash<int,QMap<QString,QSet<QString> > >::iterator it = locCountMap.find(loc);
+    QHash<int,QMap<QString,QSet<QString> > >::const_iterator it = locCountMap.find(loc);
     if(it !=locCountMap.end())
     {
         QMap<QString,QSet<QString> > devgCountMap = it.value();
-        QMap<QString,QSet<QString> >::iterator pos = devgCountMap.begin();
+        QMap<QString,QSet<QString> >::const_iterator pos = devgCountMap.begin();
         while (pos != devgCountMap.end()) {
 
             count += pos.value().count();
@@ -710,6 +710,28 @@ int CAlarmPlugin::getLocNotConfirmAlmCount(int loc)
     return count;
 }
 
+QStringList CAlarmPlugin::getLocNotConfirmAlmInfo(int loc)
+{
+    QStringList result;
+    result.clear();
+    if(loc < 0){
+        return result;
+    }
+    const QHash<int, QMap<int,QSet<QString> > > &locCountMap = CAlarmMsgManage::instance()->getLocPriorityNotConfirmAlmInfo();
+    QHash<int, QMap<int,QSet<QString> > >::const_iterator it = locCountMap.find(loc);
+    if(it != locCountMap.end())
+    {
+        const QMap<int,QSet<QString> > &pMap = it.value();
+        QMap<int,QSet<QString> >::const_iterator pos = pMap.constBegin();
+        while (pos != pMap.constEnd())
+        {
+            result.append( QString("%1_%2").arg(pos.key()).arg(pos.value().count()) );
+            pos++;
+        }
+    }
+    return result;
+}
+
 int CAlarmPlugin::getDevgNotConfirmAlmCount(const QString &devg)
 {
     int count =0;
@@ -717,13 +739,13 @@ int CAlarmPlugin::getDevgNotConfirmAlmCount(const QString &devg)
     {
         return count;
     }
-    QHash<int,QMap<QString,QSet<QString> > > locCountMap = CAlarmMsgManage::instance()->getLocNotConfirmAlmInfo();
+    const QHash<int,QMap<QString,QSet<QString> > > &locCountMap = CAlarmMsgManage::instance()->getLocNotConfirmAlmInfo();
 
-    QHash<int,QMap<QString,QSet<QString> > >::iterator it = locCountMap.begin();
+    QHash<int,QMap<QString,QSet<QString> > >::const_iterator it = locCountMap.begin();
     while (it !=locCountMap.end())
     {
         QMap<QString,QSet<QString> > devgCountMap = it.value();
-        QMap<QString,QSet<QString> >::iterator pos = devgCountMap.find(devg);
+        QMap<QString,QSet<QString> >::const_iterator pos = devgCountMap.find(devg);
         if(pos != devgCountMap.end())
         {
             count = pos.value().count();
@@ -903,6 +925,18 @@ void CAlarmPlugin::setDeviceGroup(const QString &deviceGroup)
 
 }
 
+
+void CAlarmPlugin::setPriorityFilter(int PriorityFilter)
+{
+    bool isCheck = true;
+    QList<int> priorityList;
+    priorityList.append(PriorityFilter);
+    if(m_pModel)
+    {
+        m_pModel->setPriorityFilter(isCheck,priorityList);
+    }
+}
+
 void CAlarmPlugin::setPointTag(const QString &pointList)
 {
     if(m_bIsEditMode || E_Alarm_Pop != m_mode)

product/src/gui/plugin/AlarmWidget/CAlarmPlugin.h

@@ -1,4 +1,4 @@
-#ifndef CALARMPLUGIN_H
+#ifndef CALARMPLUGIN_H
 #define CALARMPLUGIN_H
 
 #include <QWidget>
@@ -102,6 +102,12 @@ public slots:
      * @return 未确认告警条数
      */
     int getLocNotConfirmAlmCount(int loc);
+    /**
+     * @brief getLocNotConfirmAlmInfo 获取车站未确认告警数量（优先级分组）
+     * @param loc 位置id
+     * @return QString 格式为： 告警等级_告警数量 ex:1_23 含义为 告警等级为1的告警数量为23
+     */
+    QStringList getLocNotConfirmAlmInfo(int loc);
     /**
      * @brief getDevgNotConfirmAlmCount 获取设备组的未确认告警条数
      * @param devg 设备组
@@ -207,11 +213,20 @@ public slots:
      * @param device 设备
      */
     void setDevice(const QString &device);
+    
+    
     /**
      * @brief setDeviceGroup 设置设备组显示
      * @param deviceGroup 设备组
      */
     void setDeviceGroup(const QString &deviceGroup);
+    
+    /**
+     * @brief setPriorityFilter 设置优先级
+     * @param deviceGroup 优先级
+     */
+    void setPriorityFilter(int PriorityFilter);
+    
     /**
      * @brief setPointTag 设置点过滤(已无效，保留只为兼容)
      * @param pointList 点集合

product/src/gui/plugin/AlarmWidget/CAlarmPluginWidget.cpp

@@ -1,4 +1,4 @@
-#include <QWidget>
+#include <QWidget>
 #include "CAlarmPluginWidget.h"
 #include "CAlarmPlugin.h"
 #include "pub_logger_api/logger.h"

product/src/gui/plugin/AlarmWidget/CAlarmPluginWidget.h

@@ -1,4 +1,4 @@
-#ifndef CALARMPLUGINWIDGET_H
+#ifndef CALARMPLUGINWIDGET_H
 #define CALARMPLUGINWIDGET_H
 
 #include <QObject>
@@ -7,7 +7,7 @@
 class CAlarmPluginWidget : public QObject, public CPluginWidgetInterface
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "kbd.PluginWidgetInterface/1.0")
+    Q_PLUGIN_METADATA(IID HMI_WidgetPlugin_IID)
     Q_INTERFACES(CPluginWidgetInterface)
 
 public:

product/src/gui/plugin/AlarmWidget/CAlarmSetDlg.cpp

@@ -1,4 +1,4 @@
-#include "CAlarmSetDlg.h"
+#include "CAlarmSetDlg.h"
 #include "ui_CAlarmSetDlg.h"
 #include <QDomDocument>
 #include "pub_utility_api/FileUtil.h"

product/src/gui/plugin/AlarmWidget/CAlarmSetDlg.h

@@ -1,4 +1,4 @@
-#ifndef CALARMSETDLG_H
+#ifndef CALARMSETDLG_H
 #define CALARMSETDLG_H
 
 #include <QDialog>

product/src/gui/plugin/AlarmWidget/CAlarmSetMng.cpp

@@ -1,4 +1,4 @@
-#include "CAlarmSetMng.h"
+#include "CAlarmSetMng.h"
 #include <QDomDocument>
 #include "pub_logger_api/logger.h"
 #include <QFile>

product/src/gui/plugin/AlarmWidget/CAlarmSetMng.h

@@ -1,4 +1,4 @@
-#ifndef CALARMSETMNG_H
+#ifndef CALARMSETMNG_H
 #define CALARMSETMNG_H
 
 #include <QObject>

product/src/gui/plugin/AlarmWidget/CAlarmShiledDialog.cpp

@@ -1,4 +1,4 @@
-#include "CAlarmShiledDialog.h"
+#include "CAlarmShiledDialog.h"
 #include "ui_CAlarmShiledDialog.h"
 #include <QPluginLoader>
 #include <QDir>

product/src/gui/plugin/AlarmWidget/CAlarmTaskMngDlg.cpp

@@ -1,4 +1,4 @@
-#include "CAlarmTaskMngDlg.h"
+#include "CAlarmTaskMngDlg.h"
 #include "ui_CAlarmTaskMngDlg.h"
 #include <QMessageBox>
 #include <CAlarmMsgInfo.h>

product/src/gui/plugin/AlarmWidget/CAlarmTaskMngDlg.h

@@ -1,4 +1,4 @@
-#ifndef CALARMTASKMNGDLG_H
+#ifndef CALARMTASKMNGDLG_H
 #define CALARMTASKMNGDLG_H
 
 #include <QDialog>

product/src/gui/plugin/AlarmWidget/CAlarmView.cpp

@@ -1,4 +1,4 @@
-#include <QHeaderView>
+#include <QHeaderView>
 #include <QMouseEvent>
 #include "CAlarmView.h"
 #include <QScrollBar>

product/src/gui/plugin/AlarmWidget/CAlarmView.h

@@ -1,4 +1,4 @@
-#ifndef CALARMVIEW_H
+#ifndef CALARMVIEW_H
 #define CALARMVIEW_H
 
 #include <QTableView>

product/src/gui/plugin/AlarmWidget/CAlarmWidget.cpp

@@ -1,4 +1,4 @@
-#include "CAlarmWidget.h"
+#include "CAlarmWidget.h"
 #include <QVBoxLayout>
 #include <QTableView>
 #include <QHeaderView>

product/src/gui/plugin/AlarmWidget/CAlarmWidget.h

@@ -1,4 +1,4 @@
-#ifndef CALARMWINDOW_H
+#ifndef CALARMWINDOW_H
 #define CALARMWINDOW_H
 
 #include <QWidget>

product/src/gui/plugin/AlarmWidget/CDisposalPlanDialog.cpp

@@ -1,4 +1,4 @@
-#include "CDisposalPlanDialog.h"
+#include "CDisposalPlanDialog.h"
 #include "ui_CDisposalPlanDialog.h"
 #include "CAiAlarmMsgInfo.h"
 #include <QDate>

product/src/gui/plugin/AlarmWidget/CDisposalPlanDialog.h

@@ -1,4 +1,4 @@
-#ifndef CDISPOSALPLANDIALOG_H
+#ifndef CDISPOSALPLANDIALOG_H
 #define CDISPOSALPLANDIALOG_H
 
 #include <QDialog>

product/src/gui/plugin/AlarmWidget/CMyCalendar.cpp

@@ -1,4 +1,4 @@
-#include "CMyCalendar.h"
+#include "CMyCalendar.h"
 #include "ui_CMyCalendar.h"
 #include <pub_logger_api/logger.h>
 #include <QMessageBox>

product/src/gui/plugin/AlarmWidget/CMyCalendar.h

@@ -1,4 +1,4 @@
-#ifndef CMYCALENDAR_H
+#ifndef CMYCALENDAR_H
 #define CMYCALENDAR_H
 
 #include <QWidget>

product/src/gui/plugin/AlarmWidget/CMyCheckBox.cpp

@@ -1,4 +1,4 @@
-#include "CMyCheckBox.h"
+#include "CMyCheckBox.h"
 #include <QMouseEvent>
 
 CMyCheckBox::CMyCheckBox(QString text, QWidget *parent)

product/src/gui/plugin/AlarmWidget/CMyCheckBox.h

@@ -1,4 +1,4 @@
-#ifndef MYCHECKBOX_H
+#ifndef MYCHECKBOX_H
 #define MYCHECKBOX_H
 
 #include <QCheckBox>

product/src/gui/plugin/AlarmWidget/CMyListWidget.cpp

@@ -1,4 +1,4 @@
-#include "CMyListWidget.h"
+#include "CMyListWidget.h"
 
 CMyListWidget::CMyListWidget(QWidget *parent):QListWidget(parent)
 {

product/src/gui/plugin/AlarmWidget/CMyListWidget.h

@@ -1,4 +1,4 @@
-#ifndef CMYLISTWIDGET_H
+#ifndef CMYLISTWIDGET_H
 #define CMYLISTWIDGET_H
 
 #include <QListWidget>

product/src/gui/plugin/AlarmWidget/CPdfPrinter.cpp

@@ -1,4 +1,4 @@
-#include "CPdfPrinter.h"
+#include "CPdfPrinter.h"
 #include <QDebug>
 #include <QHeaderView>
 #include <QMessageBox>

product/src/gui/plugin/AlarmWidget/CPdfPrinter.h

@@ -1,4 +1,4 @@
-/**
+/**
 * @file          AlarmWidget   之前是做pdf打印，因需求修改，现在改为excel ，但是类名不变，维护请注意
 * @brief
 * @author        jxd

product/src/gui/plugin/AlarmWidget/CTableViewPrinter.cpp

@@ -1,4 +1,4 @@
-#include "CTableViewPrinter.h"
+#include "CTableViewPrinter.h"
 #include "CAlarmCommon.h"
 #include "CAlarmBaseData.h"
 CTableViewPrinter::CTableViewPrinter(CAlarmItemModel *model):

product/src/gui/plugin/AlarmWidget/CTableViewPrinter.h

@@ -1,4 +1,4 @@
-#ifndef CTABLEVIEWPRINTER_H
+#ifndef CTABLEVIEWPRINTER_H
 #define CTABLEVIEWPRINTER_H
 #include "CAlarmItemModel.h"
 class QVariant;

product/src/gui/plugin/AlarmWidget/CTreeViewPrinter.cpp

@@ -1,4 +1,4 @@
-#include "CTreeViewPrinter.h"
+#include "CTreeViewPrinter.h"
 #include "CAiAlarmTreeItem.h"
 CTreeViewPrinter::CTreeViewPrinter(CAiAlarmTreeModel *model):
     m_pModel(model)

product/src/gui/plugin/AlarmWidget/CTreeViewPrinter.h

@@ -1,4 +1,4 @@
-#ifndef CTREEVIEWPRINTER_H
+#ifndef CTREEVIEWPRINTER_H
 #define CTREEVIEWPRINTER_H
 #include "CAiAlarmTreeModel.h"
 class QVariant;

product/src/gui/plugin/AlarmWidget/main.cpp

@@ -1,4 +1,4 @@
-#include <QApplication>
+#include <QApplication>
 #include "CAlarmPlugin.h"
 #include "pub_logger_api/logger.h"
 #include "net_msg_bus_api/MsgBusApi.h"
@@ -12,7 +12,7 @@ int main(int argc, char *argv[])
     //<初始化消息总线
     QStringList arguments=QCoreApplication::arguments();
     std::string name="admin";
-    std::string password ="kbdct";
+    std::string password ="admin";
     int group =1;
     for(int index(0);index<arguments.size();index++)
     {