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

Compare commits

base: GZHM:3a998aa8ad54e48459c9469cdbd65d20a9a5aaf1
Branches Tags
GZHM:master
..
compare: GZHM:d39b02b2265d95af6af9516256fd60d378a1ba56
Branches Tags
GZHM:master

No commits in common. "3a998aa8ad54e48459c9469cdbd65d20a9a5aaf1" and "d39b02b2265d95af6af9516256fd60d378a1ba56" have entirely different histories.
3a998aa8ad ... d39b02b226

15 changed files with 31 additions and 70 deletions
Show Stats 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,7 +11,6 @@
<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>

63
product/common/sysconfig/sys_startup.json
View File

@ -6,104 +6,91 @@
"en":"HMI",
"cmd":"hmi_explorer.bat",
"param":"",
"icon":"../../resource/zh/sys_startup/MonitInterface.png",
"enable":false
"icon":"../../resource/zh/sys_startup/MonitInterface.png"
},
"num1":{
"zh":"加密狗检测",
"en":"Supper\nDog Check",
"cmd":"DogCheck",
"param":"",
"icon":"../../resource/zh/sys_startup/DogCheck.png",
"enable":true
"icon":"../../resource/zh/sys_startup/DogCheck.png"
},
"num2":{
"zh":"数据库检测",
"en":"Database\ndetection",
"cmd":"DbCheck",
"param":"",
"icon":"../../resource/zh/sys_startup/DatabaseCheck.png",
"enable":true
"icon":"../../resource/zh/sys_startup/DatabaseCheck.png"
},
"num3":{
"zh":"自启动设置",
"en":"Self-starting\nsettings",
"cmd":"AutoStart",
"param":"",
"icon":"../../resource/zh/sys_startup/SysStart.png",
"enable":true
"icon":"../../resource/zh/sys_startup/SysStart.png"
},
"num4":{
"zh":"系统建模",
"en":"System\nmodeling",
"cmd":"model_system_config.exe",
"param":"",
"icon":"../../resource/zh/sys_startup/SystemModeling.png",
"enable":true
"icon":"../../resource/zh/sys_startup/SystemModeling.png"
},
"num5":{
"zh":"设备建模",
"en":"Device\nmodeling",
"cmd":"model_studio.exe",
"param":"",
"icon":"../../resource/zh/sys_startup/DevModeling.png",
"enable":true
"icon":"../../resource/zh/sys_startup/DevModeling.png"
},
"num6":{
"zh":"组态制作",
"en":"Graphic\ndesign",
"cmd":"hmi.exe",
"param":"",
"icon":"../../resource/zh/sys_startup/PictureConfiguration.png",
"enable":true
"icon":"../../resource/zh/sys_startup/PictureConfiguration.png"
},
"num7":{
"zh":"工程备份",
"en":"Project\nmanagement",
"cmd":"db_manager.exe",
"param":"",
"icon":"../../resource/zh/sys_startup/EngineeringManagement.png",
"enable":true
"icon":"../../resource/zh/sys_startup/EngineeringManagement.png"
},
"num8":{
"zh":"逻辑编程",
"en":"FBD",
"cmd":"fbd_designer.exe",
"param":"",
"icon":"../../resource/zh/sys_startup/LogicProgramming.png",
"enable":true
"icon":"../../resource/zh/sys_startup/LogicProgramming.png"
},
"num9":{
"zh":"预置点配置",
"en":"Preset\nconfig",
"cmd":"camera_statistics.exe",
"param":"",
"icon":"../../resource/zh/sys_startup/preset_config.png",
"enable":true
"icon":"../../resource/zh/sys_startup/preset_config.png"
},
"num10":{
"zh":"工程调试",
"en":"Debug\ntool",
"cmd":"debug_tool.exe",
"param":"",
"icon":"../../resource/zh/sys_startup/EngineeringDebug.png",
"enable":true
"icon":"../../resource/zh/sys_startup/EngineeringDebug.png"
},
"num11":{
"zh":"平台终端",
"en":"Command\nwindow",
"cmd":"sys_command-platform.bat",
"param":"",
"icon":"../../resource/zh/sys_startup/CommandWindow.png",
"enable":true
"icon":"../../resource/zh/sys_startup/CommandWindow.png"
},
"num12":{
"zh":"产品终端",
"en":"Command\nwindow",
"cmd":"sys_command.bat",
"param":"",
"icon":"../../resource/zh/sys_startup/CommandWindow.png",
"enable":true
"icon":"../../resource/zh/sys_startup/CommandWindow.png"
},
"num13":{
@ -111,56 +98,49 @@
"en":"Push\ndebug",
"cmd":"push_debug.exe",
"param":"",
"icon":"../../resource/zh/sys_startup/push_debug.png",
"enable":true
"icon":"../../resource/zh/sys_startup/push_debug.png"
},
"num14":{
"zh":"文件同步",
"en":"File\nsync tool",
"cmd":"file_sync_tool.exe",
"param":"",
"icon":"../../resource/zh/sys_startup/FileSync.png",
"enable":true
"icon":"../../resource/zh/sys_startup/FileSync.png"
},
"num15":{
"zh":"报表编辑",
"en":"Report Edit",
"cmd":"ReportEdit.exe",
"param":"",
"icon":"../../resource/zh/sys_startup/ReportEdit.png",
"enable":true
"icon":"../../resource/zh/sys_startup/ReportEdit.png"
},
"num16":{
"zh":"网络监测",
"en":"Network Monitor",
"cmd":"NetMonite.exe",
"param":"",
"icon":"../../resource/zh/sys_startup/NetMonite.png",
"enable":true
"icon":"../../resource/zh/sys_startup/NetMonite.png"
},
"num17":{
"zh":"时序数据",
"en":"TSDB Management",
"cmd":"tsdb_data_manager.exe",
"param":"",
"icon":"../../resource/zh/sys_startup/DatabaseCheck.png",
"enable":true
"icon":"../../resource/zh/sys_startup/DatabaseCheck.png"
},
"num18":{
"zh":"数据导出",
"en":"TSDB Export Management",
"cmd":"tsdb_data_export.exe",
"param":"",
"icon":"../../resource/zh/sys_startup/DatabaseCheck.png",
"enable":true
"icon":"../../resource/zh/sys_startup/DatabaseCheck.png"
},
"num19":{
"zh":"启动/停止",
"en":"Start/Stop",
"cmd":"SysCtrl",
"param":"",
"icon":"../../resource/zh/sys_startup/DatabaseCheck.png",
"enable":true
"icon":"../../resource/zh/sys_startup/DatabaseCheck.png"
}
},
"page1":
@ -172,8 +152,7 @@
"num6",
"num2",
"num10",
"num7",
"num3"
"num7"
],
"page3":{
"count":3,

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()-260,QCursor::pos().y()+15);
QPoint point(QCursor::pos().x()-500,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");
QString sqlSequenceQuery = QStringLiteral("select tag_name, description, location_id from dev_group where sub_system > 3 order by tag_name");
if(!strLoctionFilter.isEmpty())
{
sqlSequenceQuery.append(QString(" %1 asc,dev_group_no asc,tag_name;").arg(strLoctionFilter));
sqlSequenceQuery.append(QString(" and %1 order by dev_group_no asc;").arg(strLoctionFilter));
}else
{
sqlSequenceQuery.append(QStringLiteral(" dev_group_no asc,tag_name;"));
sqlSequenceQuery.append(QStringLiteral(" order by dev_group_no asc;"));
}
query.setForwardOnly(true);
pReadDb->execute(sqlSequenceQuery, query);

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

@ -34,7 +34,6 @@ 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);

5
product/src/sys/sys_startup/ButtonForm.cpp
View File

@ -73,9 +73,8 @@ void ButtonForm::addToolButtons(QVector<QString> &buttonVec)
toolBtn->setMinimumWidth(80);
//toolBtn->setIcon(icon);
toolBtn->setText(m_bIsZh?buttonInfo.m_zh:buttonInfo.m_en);
#ifdef Q_PROCESSOR_ARM_64
toolBtn->setEnabled(buttonInfo.m_enable);
#endif
connect(toolBtn,&QToolButton::clicked,[=](){
executeTask(buttonInfo.m_cmd,buttonInfo.m_param);
});

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

@ -92,7 +92,6 @@ bool DataMng::loadJson()
buttonInfo.m_cmd = button["cmd"].toString();
buttonInfo.m_param = button["param"].toString();
buttonInfo.m_icon = button["icon"].toString();
buttonInfo.m_enable = button["enable"].toBool();
buttonInfo.m_name = name;
m_buttonInfoMap[name] = buttonInfo;
}
@ -192,8 +191,6 @@ 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()
@ -460,10 +457,6 @@ 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,7 +19,6 @@ public:
public:
QString getTitle();
QString getPng();
/**
* @brief getPage1ButtonInfo 获取首页常用按钮
* @return 常用按钮集合
@ -279,7 +278,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,7 +388,6 @@ 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("");
//标题栏
@ -445,7 +444,7 @@ void MainWindow::initUi()
statusLayout->addWidget(m_pStatusMng);
m_pStatusMng->setStyleSheet("background-color: #eaf9ea;");
ui->label->setPixmap(QPixmap(png));
ui->label->setPixmap(QPixmap(":/images/hmlogo.png"));
}
void MainWindow::initConn()

2
product/src/sys/sys_startup/MonitorCommon.h
View File

@ -100,7 +100,6 @@ struct SButtonInfo
QString m_cmd;
QString m_param;
QString m_icon;
bool m_enable;
SButtonInfo() {
m_name = QString();
m_zh = QString();
@ -108,7 +107,6 @@ struct SButtonInfo
m_cmd = QString();
m_param = QString();
m_icon = QString();
m_enable = true;
}
};
struct SButtonGroup

1
product/src/tools/workBench/ButtonForm.cpp
View File

@ -84,7 +84,6 @@ void ButtonForm::addToolButtons(QVector<QString> &buttonVec ,int groupIndex)
toolBtn->setMaximumWidth(80);
toolBtn->setMinimumWidth(80);
toolBtn->setIcon(icon);
toolBtn->setEnabled(buttonInfo.m_enable);
toolBtn->setText(buttonInfo.m_desc);
if( "custom" == buttonInfo.m_param)
{

2
product/src/tools/workBench/MonitorCommon.h
View File

@ -101,14 +101,12 @@ struct SButtonInfo
QString m_cmd;
QString m_param;
QString m_icon;
bool m_enable;
SButtonInfo() {
m_name = QString();
m_desc = QString();
m_cmd = QString();
m_param = QString();
m_icon = QString();
m_enable = true;
}
};
struct SButtonGroup

1
product/src/tools/workBench/tool/DataMng.cpp
View File

@ -95,7 +95,6 @@ bool DataMng::loadJson()
buttonInfo.m_cmd = button["cmd"].toString();
buttonInfo.m_param = button["param"].toString();
buttonInfo.m_icon = button["icon"].toString();
buttonInfo.m_enable = button["enable"].toBool();
buttonInfo.m_name = name;
m_buttonInfoMap[name] = buttonInfo;
}