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 444d4420..0d701164 100644
Binary files a/platform/common/database/initdata/zh/basedata/alarm_keyword_define.xlsx and b/platform/common/database/initdata/zh/basedata/alarm_keyword_define.xlsx differ
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 00000000..41760bc5
Binary files /dev/null and b/product/common/sysconfig/hmlogo.png differ
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 @@