From 8445fae81c8c2cc17d1fbbe61380b98e4fa5dd19 Mon Sep 17 00:00:00 2001 From: jxder <1907979632@qq.com> Date: Sat, 16 Aug 2025 21:18:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E7=AC=AC=E4=B8=89=E6=AC=A1=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E9=97=AE=E9=A2=98=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zh/basedata/alarm_keyword_define.xlsx | Bin 13103 -> 11383 bytes .../FESWidget/kbddevimportdlg.cpp | 4 +- .../model_plugin/FESWidget/kbddevimportdlg.h | 1 + .../src/tools/model_studio/mainwindow.cpp | 22 +++--- product/common/sysconfig/hmlogo.png | Bin 0 -> 6982 bytes product/common/sysconfig/setup_config.xml | 14 +++- .../plugin/TrendCurves/CTrendInfoManage.cpp | 3 +- product/src/sys/sys_startup/ButtonForm.cpp | 4 +- product/src/sys/sys_startup/DataMng.cpp | 66 ++++++++++++++++++ product/src/sys/sys_startup/DataMng.h | 22 ++++++ product/src/sys/sys_startup/MainWindow.cpp | 23 +++++- product/src/sys/sys_startup/mainwindow.ui | 15 +--- .../src/tools/model_plugin/model_plugin.pro | 2 +- .../model_studio/setting/tree/mainWindow.xml | 2 +- resource/zh/style/dark/alarm.qss | 3 +- resource/zh/style/light/alarm.qss | 1 + 16 files changed, 147 insertions(+), 35 deletions(-) create mode 100644 product/common/sysconfig/hmlogo.png diff --git a/platform/common/database/initdata/zh/basedata/alarm_keyword_define.xlsx b/platform/common/database/initdata/zh/basedata/alarm_keyword_define.xlsx index 444d4420400f3eaf29046f2dbc3468f85fbd264b..0d70116468febf69d47e823191850e942d36b3b1 100644 GIT binary patch literal 11383 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≧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 literal 13103 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 NC_ym3VEpawe*j3mRgC}u diff --git a/platform/src/tools/model_plugin/FESWidget/kbddevimportdlg.cpp b/platform/src/tools/model_plugin/FESWidget/kbddevimportdlg.cpp index 8f136fc0..f66f8bbf 100644 --- a/platform/src/tools/model_plugin/FESWidget/kbddevimportdlg.cpp +++ b/platform/src/tools/model_plugin/FESWidget/kbddevimportdlg.cpp @@ -15,10 +15,12 @@ kbdDevImportDlg::kbdDevImportDlg(QWidget *parent) : CustomDialog(parent) QVBoxLayout* vLayout = new QVBoxLayout; QHBoxLayout* hLayout = new QHBoxLayout; - m_pcsDev = new QRadioButton(tr("PCS3000设备"),this); + m_syncDev =new QPushButton(tr("同步设备"),this); + m_pcsDev = new QRadioButton(tr("网关设备"),this); m_otherDev = new QRadioButton(tr("第三方设备"),this); m_otherDev->setChecked(true); //m_pcsDev->hide(); + hLayout->addWidget(m_syncDev); hLayout->addWidget(m_pcsDev); hLayout->addWidget(m_otherDev); hLayout->setMargin(0); diff --git a/platform/src/tools/model_plugin/FESWidget/kbddevimportdlg.h b/platform/src/tools/model_plugin/FESWidget/kbddevimportdlg.h index 147f64e3..d76b4bce 100644 --- a/platform/src/tools/model_plugin/FESWidget/kbddevimportdlg.h +++ b/platform/src/tools/model_plugin/FESWidget/kbddevimportdlg.h @@ -22,6 +22,7 @@ public slots: private: QRadioButton* m_pcsDev; QRadioButton* m_otherDev; + QPushButton* m_syncDev; QLineEdit* m_linePath; }; diff --git a/platform/src/tools/model_studio/mainwindow.cpp b/platform/src/tools/model_studio/mainwindow.cpp index 010a6052..081e64dd 100644 --- a/platform/src/tools/model_studio/mainwindow.cpp +++ b/platform/src/tools/model_studio/mainwindow.cpp @@ -207,17 +207,17 @@ void MainWindow::readToolBarSetting(const QString &path) connect(m_toolBar,SIGNAL(buttonClicked(int)),this,SLOT(onMenuFrameChecked(int))); //增加一个退出的Action - QPushButton* btn = m_toolBar->addToolBtn(exitDesc); - btn->setStyleSheet(QString("\ - MenuFrame QPushButton{ \ - background-image:url(%1);\ - }\ - MenuFrame QPushButton:hover{\ - background-image:url(%1) ;\ - }\ - MenuFrame QPushButton:pressed, MenuFrame QPushButton:checked,MenuFrame QPushButton:focus{\ - background-image:url(%1) ;\ - }").arg(exitIconPath)); +// QPushButton* btn = m_toolBar->addToolBtn(exitDesc); +// btn->setStyleSheet(QString("\ +// MenuFrame QPushButton{ \ +// background-image:url(%1);\ +// }\ +// MenuFrame QPushButton:hover{\ +// background-image:url(%1) ;\ +// }\ +// MenuFrame QPushButton:pressed, MenuFrame QPushButton:checked,MenuFrame QPushButton:focus{\ +// background-image:url(%1) ;\ +// }").arg(exitIconPath)); if (xml.hasError()) { diff --git a/product/common/sysconfig/hmlogo.png b/product/common/sysconfig/hmlogo.png new file mode 100644 index 0000000000000000000000000000000000000000..41760bc5b4bd6a3a10f8208ba7c9ebdfc72ad594 GIT binary patch literal 6982 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 literal 0 HcmV?d00001 diff --git a/product/common/sysconfig/setup_config.xml b/product/common/sysconfig/setup_config.xml index ed520d13..2ab68332 100644 --- a/product/common/sysconfig/setup_config.xml +++ b/product/common/sysconfig/setup_config.xml @@ -10,8 +10,18 @@ - - + + + + + + + + + + + + diff --git a/product/src/gui/plugin/TrendCurves/CTrendInfoManage.cpp b/product/src/gui/plugin/TrendCurves/CTrendInfoManage.cpp index 0076c1ce..0668a061 100644 --- a/product/src/gui/plugin/TrendCurves/CTrendInfoManage.cpp +++ b/product/src/gui/plugin/TrendCurves/CTrendInfoManage.cpp @@ -420,11 +420,12 @@ void CTrendInfoManage::loadDeviceInfo(CDbApi *pReadDb) } strLoctionFilter = QString("(group_tag_name in ('%1'))").arg(listLocation.join("','")); } - QString sqlSequenceQuery = QStringLiteral("select tag_name, description, group_tag_name, location_id from dev_info order by tag_name"); + QString sqlSequenceQuery = QStringLiteral("select tag_name, description, group_tag_name, location_id from dev_info "); if(!strLoctionFilter.isEmpty()) { sqlSequenceQuery.append(QString(" where %1;").arg(strLoctionFilter)); } + sqlSequenceQuery.append(" order by tag_name"); query.setForwardOnly(true); pReadDb->execute(sqlSequenceQuery, query); while(query.next()) diff --git a/product/src/sys/sys_startup/ButtonForm.cpp b/product/src/sys/sys_startup/ButtonForm.cpp index 5415d058..9a0933df 100644 --- a/product/src/sys/sys_startup/ButtonForm.cpp +++ b/product/src/sys/sys_startup/ButtonForm.cpp @@ -65,12 +65,12 @@ void ButtonForm::addToolButtons(QVector &buttonVec) toolBtn->setToolButtonStyle(Qt::ToolButtonTextOnly); //QIcon icon = QIcon(buttonInfo.m_icon); //QSize size(45,45); - QSize size(20,45); + QSize size(10,30); toolBtn->setIconSize(size); toolBtn->setMaximumHeight(30); toolBtn->setMinimumHeight(30); toolBtn->setMaximumWidth(100); - toolBtn->setMinimumWidth(80); + toolBtn->setMinimumWidth(40); //toolBtn->setIcon(icon); toolBtn->setText(m_bIsZh?buttonInfo.m_zh:buttonInfo.m_en); #ifdef Q_PROCESSOR_ARM_64 diff --git a/product/src/sys/sys_startup/DataMng.cpp b/product/src/sys/sys_startup/DataMng.cpp index 08a6ba99..78fb49d2 100644 --- a/product/src/sys/sys_startup/DataMng.cpp +++ b/product/src/sys/sys_startup/DataMng.cpp @@ -194,6 +194,22 @@ void DataMng::loadVersion() m_title= QString::fromStdString(strValue); config.getStringValue(MODULENAME,"ProjectPng",strValue); m_png= QString::fromStdString(strValue); + + config.getStringValue(MODULENAME,"FontSize",strValue); + m_titleSize= QString::fromStdString(strValue); + config.getStringValue(MODULENAME,"Font",strValue); + m_titleFont= QString::fromStdString(strValue); + config.getStringValue(MODULENAME,"NameColor",strValue); + m_titleColor= QString::fromStdString(strValue); + + config.getIntValue(MODULENAME,"PngWidth",m_pngWidth); + config.getIntValue(MODULENAME,"FontWidth",m_titleWidth); + config.getIntValue(MODULENAME,"Height",m_height); + config.getIntValue(MODULENAME,"Left",m_left); + config.getIntValue(MODULENAME,"Right",m_right); + config.getIntValue(MODULENAME,"Top",m_top); + config.getIntValue(MODULENAME,"Buttom",m_buttom); + } void DataMng::loadLocInfo() @@ -460,6 +476,56 @@ QString DataMng::getTitle() { return m_title; } + +QString DataMng::getTitleSize() +{ + return m_titleSize; +} + +QString DataMng::getTitleColor() +{ + return m_titleColor; +} + +int DataMng::getHeight() +{ + return m_height; +} + +int DataMng::getTitleWidth() +{ + return m_titleWidth; +} + +int DataMng::getLeft() +{ + return m_left; +} + +int DataMng::getRight() +{ + return m_right; +} + +int DataMng::getButtom() +{ + return m_buttom; +} + +int DataMng::getTop() +{ + return m_top; +} + +int DataMng::getPngWidth() +{ + return m_pngWidth; +} + +QString DataMng::getTitleFont() +{ + return m_titleFont; +} QString DataMng::getPng() { return m_png; diff --git a/product/src/sys/sys_startup/DataMng.h b/product/src/sys/sys_startup/DataMng.h index e362dce3..367dfa9f 100644 --- a/product/src/sys/sys_startup/DataMng.h +++ b/product/src/sys/sys_startup/DataMng.h @@ -19,6 +19,17 @@ public: public: QString getTitle(); + QString getTitleSize(); + QString getTitleFont(); + QString getTitleColor(); + + int getHeight(); + int getPngWidth(); + int getTitleWidth(); + int getLeft(); + int getRight(); + int getButtom(); + int getTop(); QString getPng(); /** * @brief getPage1ButtonInfo 获取首页常用按钮 @@ -280,6 +291,17 @@ private: QString m_stRestartPng; //< 重启图标 QString m_title; QString m_png; + QString m_titleSize; + QString m_titleFont; + QString m_titleColor; + + int m_height; + int m_titleWidth; + int m_pngWidth; + int m_left; + int m_right; + int m_top; + int m_buttom; //节点应用相关 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 8a612893..60bf7532 100644 --- a/product/src/sys/sys_startup/MainWindow.cpp +++ b/product/src/sys/sys_startup/MainWindow.cpp @@ -388,9 +388,21 @@ void MainWindow::initVariables() void MainWindow::initUi() { QString title = DataMng::instance()->getTitle(); + QString titleSize = DataMng::instance()->getTitleSize(); + QString titleFont = DataMng::instance()->getTitleFont(); + QString titleColor = DataMng::instance()->getTitleColor(); + + int height = DataMng::instance()->getHeight(); + int titleWidth = DataMng::instance()->getTitleWidth(); + int pngWidth = DataMng::instance()->getPngWidth(); + int right = DataMng::instance()->getRight(); + int left = DataMng::instance()->getLeft(); + int buttom = DataMng::instance()->getButtom(); + int top = DataMng::instance()->getTop(); QString png = DataMng::instance()->getPng(); setWindowFlags( Qt::Window | Qt::CustomizeWindowHint | Qt::WindowTitleHint | Qt::WindowSystemMenuHint| Qt::WindowCloseButtonHint ); ui->label->setStyleSheet(""); + ui->label->setSizeIncrement(QSize(pngWidth,height)); //标题栏 if(m_bIsZh) { @@ -403,8 +415,17 @@ void MainWindow::initUi() setWindowTitle("Run Manager"); m_pSysTrayIcon->setToolTip("Run Manager"); } - ui->label_2->setStyleSheet("font-size:20pt; color:#52a6ff"); + QString sheet=QString("font-size:%1px;color:%2;font:%3;min-width: %4px; max-width: %5px;min-height:%6px;max-height:%7px;").arg(titleSize).arg(titleColor) + .arg(titleFont).arg(titleWidth).arg(titleWidth).arg(height).arg(height); + //ui->label_2->setStyleSheet("font-size:20pt; color:#52a6ff"); + ui->label_2->setStyleSheet(sheet); ui->label_2->setText(title); + //QString sheet3=QString("min-width: %1px; max-width: %2px;min-height:%3px;max-height:%4px;").arg(left).arg(left).arg(height).arg(height); + //QString sheet4=QString("min-width: %1px; max-width: %2px;min-height:%3px;max-height:%4px;").arg(right).arg(right).arg(height).arg(height); + //ui->label_3->setStyleSheet(sheet3); + //ui->label_4->setStyleSheet(sheet4); + + ui->horizontalLayout->setContentsMargins(left,top,right,buttom); //进度条 QGridLayout *startUpLayout = new QGridLayout(ui->startUpFrame); startUpLayout->setSpacing(6); diff --git a/product/src/sys/sys_startup/mainwindow.ui b/product/src/sys/sys_startup/mainwindow.ui index b9f556e0..4ac13aa0 100644 --- a/product/src/sys/sys_startup/mainwindow.ui +++ b/product/src/sys/sys_startup/mainwindow.ui @@ -54,7 +54,7 @@ Qt::Horizontal - QSizePolicy::Preferred + QSizePolicy::Expanding @@ -77,19 +77,6 @@ - - - - Qt::Horizontal - - - - 40 - 20 - - - - diff --git a/product/src/tools/model_plugin/model_plugin.pro b/product/src/tools/model_plugin/model_plugin.pro index 74a23097..810dd586 100644 --- a/product/src/tools/model_plugin/model_plugin.pro +++ b/product/src/tools/model_plugin/model_plugin.pro @@ -9,7 +9,7 @@ SUBDIRS += \ model_plan_curve \ ExpressionWidget \ StaticsWidget \ -# iec61850InstWizard \ + iec61850InstWizard \ PCPMS_IP_Setting \ PCPMS_Screen_Brightness_Setting diff --git a/resource/zh/model_studio/setting/tree/mainWindow.xml b/resource/zh/model_studio/setting/tree/mainWindow.xml index 8764376d..c35d2eee 100644 --- a/resource/zh/model_studio/setting/tree/mainWindow.xml +++ b/resource/zh/model_studio/setting/tree/mainWindow.xml @@ -15,6 +15,6 @@ - + diff --git a/resource/zh/style/dark/alarm.qss b/resource/zh/style/dark/alarm.qss index ee2cd197..9e706358 100644 --- a/resource/zh/style/dark/alarm.qss +++ b/resource/zh/style/dark/alarm.qss @@ -115,7 +115,8 @@ QTreeView#aiAlarmTreeView { QTableView#alarmView { color:#01a6ec; - border:0px solid #0669af; + font-size:30px; + border:0px solid #0669af; gridline-color:#09304c; alternate-background-color: #09314d; selection-background-color:#d1e3f8; diff --git a/resource/zh/style/light/alarm.qss b/resource/zh/style/light/alarm.qss index 12ed34e3..9cabea8e 100644 --- a/resource/zh/style/light/alarm.qss +++ b/resource/zh/style/light/alarm.qss @@ -54,5 +54,6 @@ QTableView { border: 1px solid #cccfd9; alternate-background-color: #f4f8fb; background-color:white; + font-size:40px; qproperty-showGrid:false; }*/ \ No newline at end of file