GZHM/HM-SPMS
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

问题单修改汇总提交

Browse Source
This commit is contained in:
jxder 2025-08-04 23:01:29 +08:00
parent 0a493c432e
commit 85de21dbb5
9 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platform/src/tools/model_plugin/FESWidget/kbddevimportdlg.cpp
View File

@ -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);

2
platform/src/tools/model_plugin/TempPlugin/temppluginwidget.cpp
View File

@ -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();

1
product/common/sysconfig/setup_config.xml
View File

@ -11,6 +11,7 @@
<param desc="数据库安装路径" key="DbPath" value="D:/EnergyHub/database"/>
<param desc="主程序安装路径(Linux)" key="MainPathLinux" value="/opt/EnergyHub"/>
<param desc="主界面名称" key="ProjectName" value="SPMS电力监控系统"/>
<param desc="主界面图片" key="ProjectPng" value="../../data/back_pixmap/hmlogo.png"/>
</module>
</root>

2
product/src/gui/plugin/AlarmWidget/CAlarmForm.cpp
View File

@ -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();
}

6
product/src/gui/plugin/TrendCurves/CTrendInfoManage.cpp
View File

@ -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);

1
product/src/gui/plugin/TrendCurves/CTrendTreeModel.cpp
View File

@ -34,6 +34,7 @@ void CTrendTreeModel::initTrendTagInfo()
//< load location
QList<int> locList = CTrendInfoManage::instance()->locationOrderList();
LOGINFO("--------------------------%d-----------------",locList.count());
foreach (const int &locId, locList) {
QString desc = CTrendInfoManage::instance()->getLocationDesc(locId);
QList<QPair<QString,QString> > devGroupInfoList = CTrendInfoManage::instance()->devGroupInfoList(locId);

6
product/src/sys/sys_startup/DataMng.cpp
View File

@ -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<int,sys_startup::SButtonGroup> DataMng::getPage3ButtonInfo()
{

3
product/src/sys/sys_startup/DataMng.h
View File

@ -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<QString> m_nodeVec; //< 所有启用的节点名称
QMap<int,sys_startup::SSysModelAppInfo> m_modelAppInfoMap; //< 系统建模应用信息

3
product/src/sys/sys_startup/MainWindow.cpp
View File

@ -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()