From 85de21dbb5ac499db07ccedf864ceba4227e584d Mon Sep 17 00:00:00 2001 From: jxder <1907979632@qq.com> Date: Mon, 4 Aug 2025 23:01:29 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=8D=95=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=B1=87=E6=80=BB=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/tools/model_plugin/FESWidget/kbddevimportdlg.cpp | 2 +- .../src/tools/model_plugin/TempPlugin/temppluginwidget.cpp | 2 +- product/common/sysconfig/setup_config.xml | 1 + product/src/gui/plugin/AlarmWidget/CAlarmForm.cpp | 2 +- product/src/gui/plugin/TrendCurves/CTrendInfoManage.cpp | 6 +++--- product/src/gui/plugin/TrendCurves/CTrendTreeModel.cpp | 1 + product/src/sys/sys_startup/DataMng.cpp | 6 ++++++ product/src/sys/sys_startup/DataMng.h | 3 ++- product/src/sys/sys_startup/MainWindow.cpp | 3 ++- 9 files changed, 18 insertions(+), 8 deletions(-) diff --git a/platform/src/tools/model_plugin/FESWidget/kbddevimportdlg.cpp b/platform/src/tools/model_plugin/FESWidget/kbddevimportdlg.cpp index 893f82f3..8f136fc0 100644 --- a/platform/src/tools/model_plugin/FESWidget/kbddevimportdlg.cpp +++ b/platform/src/tools/model_plugin/FESWidget/kbddevimportdlg.cpp @@ -18,7 +18,7 @@ kbdDevImportDlg::kbdDevImportDlg(QWidget *parent) : CustomDialog(parent) m_pcsDev = new QRadioButton(tr("PCS3000设备"),this); m_otherDev = new QRadioButton(tr("第三方设备"),this); m_otherDev->setChecked(true); - m_pcsDev->hide(); + //m_pcsDev->hide(); hLayout->addWidget(m_pcsDev); hLayout->addWidget(m_otherDev); hLayout->setMargin(0); diff --git a/platform/src/tools/model_plugin/TempPlugin/temppluginwidget.cpp b/platform/src/tools/model_plugin/TempPlugin/temppluginwidget.cpp index 0f171084..321fd620 100644 --- a/platform/src/tools/model_plugin/TempPlugin/temppluginwidget.cpp +++ b/platform/src/tools/model_plugin/TempPlugin/temppluginwidget.cpp @@ -140,7 +140,7 @@ void TempPluginWidget::initMenu() m_menuPlugin->addAction(tr("添加套件"),this,SLOT(onAddPlugin())); m_menuPlugin->addAction(tr("实例化套件"),this,SLOT(onInstPlugin())); //停用cisco版本的61850功能 - //m_menuPlugin->addAction(tr("实例化61850设备"),this,SLOT(onInst61850Device())); + m_menuPlugin->addAction(tr("实例化61850设备"),this,SLOT(onInst61850Device())); m_menuPlugin->addAction(tr("修改套件"),this,SLOT(onModifyPlugin())); m_menuPlugin->addAction(tr("复制套件"),this,SLOT(onCopyPlugin())); m_menuPlugin->addSeparator(); diff --git a/product/common/sysconfig/setup_config.xml b/product/common/sysconfig/setup_config.xml index a3b57b13..ed520d13 100644 --- a/product/common/sysconfig/setup_config.xml +++ b/product/common/sysconfig/setup_config.xml @@ -11,6 +11,7 @@ + diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmForm.cpp b/product/src/gui/plugin/AlarmWidget/CAlarmForm.cpp index 283e6f26..702359bc 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmForm.cpp +++ b/product/src/gui/plugin/AlarmWidget/CAlarmForm.cpp @@ -1222,7 +1222,7 @@ void CAlarmForm::myCalendarHide(QDate startTime,QDate endTime) void CAlarmForm::myCalendarShow() { - QPoint point(QCursor::pos().x()-500,QCursor::pos().y()+15); + QPoint point(QCursor::pos().x()-260,QCursor::pos().y()+15); m_timeMenu->move(point); m_timeMenu->show(); } diff --git a/product/src/gui/plugin/TrendCurves/CTrendInfoManage.cpp b/product/src/gui/plugin/TrendCurves/CTrendInfoManage.cpp index ea14fa85..0076c1ce 100644 --- a/product/src/gui/plugin/TrendCurves/CTrendInfoManage.cpp +++ b/product/src/gui/plugin/TrendCurves/CTrendInfoManage.cpp @@ -383,13 +383,13 @@ void CTrendInfoManage::loadDevGroupInfo(CDbApi *pReadDb) { return ; } - QString sqlSequenceQuery = QStringLiteral("select tag_name, description, location_id from dev_group where sub_system > 3 order by tag_name"); + QString sqlSequenceQuery = QStringLiteral("select tag_name, description, location_id from dev_group where sub_system > 3 order by"); if(!strLoctionFilter.isEmpty()) { - sqlSequenceQuery.append(QString(" and %1 order by dev_group_no asc;").arg(strLoctionFilter)); + sqlSequenceQuery.append(QString(" %1 asc,dev_group_no asc,tag_name;").arg(strLoctionFilter)); }else { - sqlSequenceQuery.append(QStringLiteral(" order by dev_group_no asc;")); + sqlSequenceQuery.append(QStringLiteral(" dev_group_no asc,tag_name;")); } query.setForwardOnly(true); pReadDb->execute(sqlSequenceQuery, query); diff --git a/product/src/gui/plugin/TrendCurves/CTrendTreeModel.cpp b/product/src/gui/plugin/TrendCurves/CTrendTreeModel.cpp index 52989220..4c5d7234 100644 --- a/product/src/gui/plugin/TrendCurves/CTrendTreeModel.cpp +++ b/product/src/gui/plugin/TrendCurves/CTrendTreeModel.cpp @@ -34,6 +34,7 @@ void CTrendTreeModel::initTrendTagInfo() //< load location QList locList = CTrendInfoManage::instance()->locationOrderList(); + LOGINFO("--------------------------%d-----------------",locList.count()); foreach (const int &locId, locList) { QString desc = CTrendInfoManage::instance()->getLocationDesc(locId); QList > devGroupInfoList = CTrendInfoManage::instance()->devGroupInfoList(locId); diff --git a/product/src/sys/sys_startup/DataMng.cpp b/product/src/sys/sys_startup/DataMng.cpp index b633f9fa..08a6ba99 100644 --- a/product/src/sys/sys_startup/DataMng.cpp +++ b/product/src/sys/sys_startup/DataMng.cpp @@ -192,6 +192,8 @@ void DataMng::loadVersion() m_zhTitle = QString::fromStdString(strValue); config.getStringValue(MODULENAME,"ProjectName",strValue); m_title= QString::fromStdString(strValue); + config.getStringValue(MODULENAME,"ProjectPng",strValue); + m_png= QString::fromStdString(strValue); } void DataMng::loadLocInfo() @@ -458,6 +460,10 @@ QString DataMng::getTitle() { return m_title; } +QString DataMng::getPng() +{ + return m_png; +} QMap DataMng::getPage3ButtonInfo() { diff --git a/product/src/sys/sys_startup/DataMng.h b/product/src/sys/sys_startup/DataMng.h index 1901309d..e362dce3 100644 --- a/product/src/sys/sys_startup/DataMng.h +++ b/product/src/sys/sys_startup/DataMng.h @@ -19,6 +19,7 @@ public: public: QString getTitle(); + QString getPng(); /** * @brief getPage1ButtonInfo 获取首页常用按钮 * @return 常用按钮集合 @@ -278,7 +279,7 @@ private: QString m_stSysIcon; //< 程序图标栏图标 QString m_stRestartPng; //< 重启图标 QString m_title; - + QString m_png; //节点应用相关 QVector m_nodeVec; //< 所有启用的节点名称 QMap m_modelAppInfoMap; //< 系统建模应用信息 diff --git a/product/src/sys/sys_startup/MainWindow.cpp b/product/src/sys/sys_startup/MainWindow.cpp index e3dc09ef..8a612893 100644 --- a/product/src/sys/sys_startup/MainWindow.cpp +++ b/product/src/sys/sys_startup/MainWindow.cpp @@ -388,6 +388,7 @@ void MainWindow::initVariables() void MainWindow::initUi() { QString title = DataMng::instance()->getTitle(); + QString png = DataMng::instance()->getPng(); setWindowFlags( Qt::Window | Qt::CustomizeWindowHint | Qt::WindowTitleHint | Qt::WindowSystemMenuHint| Qt::WindowCloseButtonHint ); ui->label->setStyleSheet(""); //标题栏 @@ -444,7 +445,7 @@ void MainWindow::initUi() statusLayout->addWidget(m_pStatusMng); m_pStatusMng->setStyleSheet("background-color: #eaf9ea;"); - ui->label->setPixmap(QPixmap(":/images/hmlogo.png")); + ui->label->setPixmap(QPixmap(png)); } void MainWindow::initConn()