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

8.26提交8.19的问题

Browse Source
This commit is contained in:
jxder 2025-08-26 23:55:59 +08:00
parent 13780d7b83
commit 27e9c16b03
39 changed files with 167 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
platform/src/application/app_bio_identify/app_bio_identify_srv/CBioIdentifySrv.cpp
View File

@ -66,10 +66,10 @@ bool CBioIdentifySrv::start(int argc, char *argv[], int & /*nStatus*/)
return false;
}
//< 加载系统建模信息
//< 加载系统拓扑信息
if (!loadSysInfo())
{
LOGFATAL("加载系统建模信息失败，程序启动失败！");
LOGFATAL("加载系统拓扑信息失败，程序启动失败！");
return false;
}

2
platform/src/dbms/db_manager/pj_manager.cpp
View File

@ -146,7 +146,7 @@ void pj_manager::loadQss()
void pj_manager::initUi()
{
setWindowTitle(tr("工程备份"));
setWindowTitle(tr("工程管理"));
#ifdef OS_LINUX
setWindowIcon( QIcon( ":res/db_manager.png" ) );
#endif

2
platform/src/dbms/db_sync_server/CDbSynService.cpp
View File

@ -79,7 +79,7 @@ bool CDbSynService::start( int argc, char *argv[], int & /*nStatus*/)
m_ptrRedunSw.reset( new CDbSynSrvRedunSw( this ));
if ( !m_ptrRedunSw->loadSysInfo())
{
LOGFATAL( "加载系统建模信息失败，程序启动失败！" );
LOGFATAL( "加载系统拓扑信息失败，程序启动失败！" );
return false;
}

4
platform/src/dbms/tsdb_local_save/CNodeMng.cpp
View File

@ -133,7 +133,7 @@ bool CNodeMng::init(const iot_public::SRunAppInfo &stRunAppInfo)
//< todo 端口号、数据库名、用户名、密码 暂时写死
/* 为以后搜索方便，保留此注释
* 取消默认EMS_DEFAULT_DATABASE，时序库使用系统建模中关系库的首链接的数据库配置
* 取消默认EMS_DEFAULT_DATABASE，时序库使用系统拓扑中关系库的首链接的数据库配置
* 时序库用户名用的数据库名称
*/
CNodeThreadPtr ptrNodeThread(new CNodeThread(stDbNodeInfo.strName,
@ -176,7 +176,7 @@ bool CNodeMng::init(const iot_public::SRunAppInfo &stRunAppInfo)
//< todo 端口号、数据库名、用户名、密码 暂时写死
/* 为以后搜索方便，保留此注释
* 取消默认EMS_DEFAULT_DATABASE，时序库使用系统建模中关系库的首链接的数据库配置
* 取消默认EMS_DEFAULT_DATABASE，时序库使用系统拓扑中关系库的首链接的数据库配置
* 时序库用户名用的数据库名称
*/
CNodeThreadPtr ptrNodeThread(new CNodeThread(stDbNodeInfo.strName,

4
platform/src/dbms/tsdb_save/CNodeMng.cpp
View File

@ -131,7 +131,7 @@ bool CNodeMng::init()
//< todo 端口号、数据库名、用户名、密码 暂时写死
/* 为以后搜索方便，保留此注释
* 取消默认EMS_DEFAULT_DATABASE，时序库使用系统建模中关系库的首链接的数据库配置
* 取消默认EMS_DEFAULT_DATABASE，时序库使用系统拓扑中关系库的首链接的数据库配置
* 时序库用户名用的数据库名称
*/
CNodeThreadPtr ptrNodeThread(new CNodeThread(stDbNodeInfo.strName,
@ -174,7 +174,7 @@ bool CNodeMng::init()
//< todo 端口号、数据库名、用户名、密码 暂时写死
/* 为以后搜索方便，保留此注释
* 取消默认EMS_DEFAULT_DATABASE，时序库使用系统建模中关系库的首链接的数据库配置
* 取消默认EMS_DEFAULT_DATABASE，时序库使用系统拓扑中关系库的首链接的数据库配置
* 时序库用户名用的数据库名称
*/
CNodeThreadPtr ptrNodeThread(new CNodeThread(stDbNodeInfo.strName,

4
platform/src/gui/hmi/CExplorerWnd.cpp
View File

@ -277,7 +277,7 @@ void CExplorerWnd::showCheckDogInfo()
}
else
{
QMessageBox::information(NULL, tr("提示"), tr("加密狗检测正常!"));
QMessageBox::information(NULL, tr("提示"), tr("密钥信息正常!"));
}
return;
}
@ -548,7 +548,7 @@ void CExplorerWnd::setupActions()
connect(m_pWinNewGDWinAction, SIGNAL(triggered()), this, SLOT(fileNewGDWin()));
CBaseInstance()->getFilePathName(CBase::PATH_TYPE_ICONSET, "com_open.png", iconbuf);
m_pDogInfoAction = new QAction(QPixmap(iconbuf), tr("加密狗状态"), this);
m_pDogInfoAction = new QAction(QPixmap(iconbuf), tr("密钥状态"), this);
m_pDogInfoAction->setShortcut(tr("Ctrl+R"));
connect(m_pDogInfoAction, SIGNAL(triggered()), this, SLOT(showCheckDogInfo()));

2
platform/src/gui/hmi/CGraphApp.cpp
View File

@ -995,7 +995,7 @@ void CGraphApp::checkDogStatus()
QMap<int, CExplorerWnd *>::const_iterator iter = m_explorerWndMap.cbegin();
for(; iter != m_explorerWndMap.cend(); iter++)
{
if(QMessageBox::Ok == QMessageBox::warning(iter.value(), tr("提示"), tr("加密狗检测异常!")))
if(QMessageBox::Ok == QMessageBox::warning(iter.value(), tr("提示"), tr("密钥信息异常!")))
{
sysExit();
}

2
platform/src/gui/hmi/CMenuString.h
View File

@ -2,7 +2,7 @@
#define CMENUSTRING_H
const char *g_designer_action = QT_TR_NOOP("组态制作");
const char *g_designer_action = QT_TR_NOOP("图模编辑");
const char *g_explorer_action = QT_TR_NOOP("图形浏览");
const char *g_file_operation = QT_TR_NOOP("文件(&F)");

2
platform/src/include/tools/model_common/common.h
View File

@ -128,7 +128,7 @@ private:
static QString m_pathTree;
static QString m_pathTranslate;
static QString m_pathStyle;
static QString m_pathSysModelConfig;//系统建模配置导出路径
static QString m_pathSysModelConfig;//系统拓扑配置导出路径
static QString m_pathResource;
static QString m_pathIscsHome;
static QString m_path61850Cfg;

2
platform/src/net/net_msg_bus/CMbServer.cpp
View File

@ -404,7 +404,7 @@ bool CMbServer::loadConfig()
m_nH2hPort, m_nH2hRtTimeout);
}
//< 加载系统建模信息
//< 加载系统拓扑信息
{
iot_public::CSysInfoInterfacePtr ptrSysInfo;
if (!createSysInfoInstance(ptrSysInfo))

2
platform/src/public/pub_sysinfo_api/SysInfoApi.cpp
View File

@ -1,7 +1,7 @@

/******************************************************************************//**
* @file SysInfoInterface.cpp
* @brief 系统建模信息访问库接口
* @brief 系统拓扑信息访问库接口
* @author yikenan
* @version 1.0
* @date

2
platform/src/public/pub_sysinfo_api/SysInfoData.cpp
View File

@ -1,7 +1,7 @@

/******************************************************************************//**
* @file SysInfoData.cpp
* @brief 系统建模信息访问库，配置文件中的数据
* @brief 系统拓扑信息访问库，配置文件中的数据
* @author yikenan
* @version 1.0
* @date

2
platform/src/public/pub_sysinfo_api/SysInfoData.h
View File

@ -1,7 +1,7 @@

/******************************************************************************//**
* @file SysInfoData.h
* @brief 系统建模信息访问库，配置文件中的数据
* @brief 系统拓扑信息访问库，配置文件中的数据
* @author yikenan
* @version 1.0
* @date

2
platform/src/public/pub_sysinfo_api/SysInfoImp.cpp
View File

@ -1,7 +1,7 @@

/******************************************************************************//**
* @file SysInfoImp.h
* @brief 系统建模信息访问库实现
* @brief 系统拓扑信息访问库实现
* @author yikenan
* @version 1.0
* @date

2
platform/src/public/pub_sysinfo_api/SysInfoImp.h
View File

@ -1,7 +1,7 @@

/******************************************************************************//**
* @file SysInfoImp.h
* @brief 系统建模信息访问库实现
* @brief 系统拓扑信息访问库实现
* @author yikenan
* @version 1.0
* @date

4
platform/src/service/alarm_server/CAlarmServer.cpp
View File

@ -99,10 +99,10 @@ bool CAlarmServer::start(int argc, char *argv[], int & /*nStatus*/)
}
}
//< 加载系统建模信息
//< 加载系统拓扑信息
if (!loadSysInfo())
{
LOGFATAL("加载系统建模信息失败，程序启动失败！");
LOGFATAL("加载系统拓扑信息失败，程序启动失败！");
return false;
}

4
platform/src/sys/sys_dog_auth_check/mainwindow.cpp
View File

@ -36,12 +36,12 @@ void MainWindow::slot_recheckBtn()
int nRet = ptrDogAuth->checkAuthStatus();
if (nRet > 0)
{
LOGERROR("加密狗检测错误(FAIL)！");
LOGERROR("密钥信息错误(FAIL)！");
ui->statusLab->setText(tr("异常,错误码[%1]").arg(nRet));
}
else
{
LOGERROR("加密狗检测正确（OK）！");
LOGERROR("密钥信息正确（OK）！");
ui->statusLab->setText(tr("正常"));
}
}

4
platform/src/sys/sys_proc_mng_api/ProcMngApiThread.cpp
View File

@ -63,7 +63,7 @@ void iot_sys::CProcMngApiThread::execute()
}
#ifndef DISABLE_DOG_AUTH
/* @brief 加密狗检测超时退出 */
/* @brief 密钥信息超时退出 */
if(m_bNeedCheckAuth)
{
if(getMonotonicMsec() - m_lLastCheckDogTime >60*1000) //一分钟检查一次狗错误
@ -75,7 +75,7 @@ void iot_sys::CProcMngApiThread::execute()
if((m_nDogTimeOutCount*60) >= DOG_TIMEOUT)
{
notifyProcToQuit();//< 通知进程退出
LOGERROR("加密狗检测超时退出,请检查加密狗！");
LOGERROR("密钥信息超时退出,请检查加密狗！");
}
}
else

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

@ -15,7 +15,8 @@ kbdDevImportDlg::kbdDevImportDlg(QWidget *parent) : CustomDialog(parent)
QVBoxLayout* vLayout = new QVBoxLayout;
QHBoxLayout* hLayout = new QHBoxLayout;
m_syncDev =new QPushButton(tr("同步设备"),this);
m_syncDev =new QPushButton(tr("同步设备"));
m_syncDev->setStyleSheet("QPushButton { border: none; }");
m_pcsDev = new QRadioButton(tr("网关设备"),this);
m_otherDev = new QRadioButton(tr("第三方设备"),this);
m_otherDev->setChecked(true);

2
platform/src/tools/model_plugin/SystemConfigWizard/systemconfigwizard.cpp
View File

@ -21,7 +21,7 @@
SystemConfigWizard::SystemConfigWizard(QWidget *parent) : QWizard(parent)
{
setWindowTitle(tr("系统建模配置向导"));
setWindowTitle(tr("系统拓扑配置向导"));
setWizardStyle(QWizard::ClassicStyle);
addPage(createLocationPage());
addPage(createNodePage());

4
platform/src/tools/model_studio/loginDialog/logindlg.cpp
View File

@ -198,13 +198,13 @@ void LoginDlg::onLoad()
m_leDbName->text(),
(iot_dbms::EDbType)m_comboxDbType->currentData().toInt());
//检查是否系统建模
//检查是否系统拓扑
if(err.isEmpty())
{
QString errMsg;
if(!checkSysModel(errMsg))
{
err = errMsg + tr(",可能未进行系统建模!");
err = errMsg + tr(",可能未进行系统拓扑!");
}
}

2
platform/src/tools/model_system_config/main.cpp
View File

@ -93,7 +93,7 @@ int main(int argc, char *argv[])
QDialog* wid = static_cast<QDialog*>(Common::createPluginWidget(nullptr,"system_config_plugin",ptrVec));
if(wid != nullptr)
{
if(N_MessageBox::information(nullptr,QObject::tr("消息"),QObject::tr("是否进入系统建模配置向导界面？"),N_MessageBox::Yes,N_MessageBox::No) == N_MessageBox::Yes)
if(N_MessageBox::information(nullptr,QObject::tr("消息"),QObject::tr("是否进入系统拓扑配置向导界面？"),N_MessageBox::Yes,N_MessageBox::No) == N_MessageBox::Yes)
wid->exec();
}
settings.setValue("SystemConfigWizard/isShow","false");

4
platform/src/tools/model_system_config/mainwindow.cpp
View File

@ -24,7 +24,7 @@ MainWindow::MainWindow(QWidget *parent) :
{
ui->setupUi(this);
setWindowTitle(tr("系统建模"));
setWindowTitle(tr("系统拓扑"));
QGridLayout *gridLayout = new QGridLayout();
gridLayout->setContentsMargins(5,0,0,0);
gridLayout->setSpacing(0);
@ -93,7 +93,7 @@ void MainWindow::onDbError(const QString &err)
void MainWindow::onVersion()
{
N_MessageBox::about(this,tr("系统建模"),tr("版本号:%1").arg(Common::getSoftwareVersion()));
N_MessageBox::about(this,tr("系统拓扑"),tr("版本号:%1").arg(Common::getSoftwareVersion()));
}
void MainWindow::onConfigWizard()

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

@ -10,7 +10,7 @@
"enable":false
},
"num1":{
"zh":"加密狗检测",
"zh":"密钥信息",
"en":"Supper\nDog Check",
"cmd":"DogCheck",
"param":"",
@ -34,7 +34,7 @@
"enable":true
},
"num4":{
"zh":"系统建模",
"zh":"系统拓扑",
"en":"System\nmodeling",
"cmd":"model_system_config.exe",
"param":"",
@ -50,7 +50,7 @@
"enable":true
},
"num6":{
"zh":"组态制作",
"zh":"图模编辑",
"en":"Graphic\ndesign",
"cmd":"hmi.exe",
"param":"",
@ -58,7 +58,7 @@
"enable":true
},
"num7":{
"zh":"工程备份",
"zh":"工程管理",
"en":"Project\nmanagement",
"cmd":"db_manager.exe",
"param":"",
@ -82,7 +82,7 @@
"enable":true
},
"num10":{
"zh":"工程调试",
"zh":"调试助手",
"en":"Debug\ntool",
"cmd":"debug_tool.exe",
"param":"",

4
product/src/application/apc_if_srv/CApcIfSrv.cpp
View File

@ -114,10 +114,10 @@ bool CApcIfSrv::start(int argc, char *argv[], int & /*nStatus*/)
return false;
}
//< 加载系统建模信息
//< 加载系统拓扑信息
if (!loadSysInfo())
{
LOGFATAL("加载系统建模信息失败，程序启动失败！");
LOGFATAL("加载系统拓扑信息失败，程序启动失败！");
return false;
}

2
product/src/application/application.pro
View File

@ -19,7 +19,7 @@ SUBDIRS += \
idong_task_link \
#opc_server \
#qtts_kbd_iflytek \
#video_server \
video_server \
#app_ats_timetable \
his_amend \
wave_record_server \

4
product/src/application/fault_recall_srv/CFaultRecallSrv.cpp
View File

@ -98,10 +98,10 @@ bool CFaultRecallSrv::start(int argc, char *argv[], int& /*nStatus*/)
return false;
}
//< 加载系统建模信息
//< 加载系统拓扑信息
if (!loadSysInfo())
{
LOGFATAL("加载系统建模信息失败，程序启动失败！");
LOGFATAL("加载系统拓扑信息失败，程序启动失败！");
return false;
}

218
product/src/gui/plugin/AlarmWidget/CAlarmForm.ui
View File

@ -192,28 +192,6 @@
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="set">
<property name="enabled">
<bool>true</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>60</width>
<height>26</height>
</size>
</property>
<property name="text">
<string>设置</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="closeBtn">
<property name="maximumSize">
@ -349,7 +327,7 @@
<property name="bottomMargin">
<number>9</number>
</property>
<item row="0" column="11">
<item row="0" column="12">
<widget class="QPushButton" name="inhibit">
<property name="minimumSize">
<size>
@ -368,25 +346,53 @@
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_3">
<item row="0" column="13">
<widget class="QPushButton" name="print">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<width>65</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<width>65</width>
<height>26</height>
</size>
</property>
<property name="layoutDirection">
<enum>Qt::RightToLeft</enum>
<property name="text">
<string>导出</string>
</property>
</widget>
</item>
<item row="0" column="11">
<widget class="QPushButton" name="filter">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>65</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>65</width>
<height>26</height>
</size>
</property>
<property name="text">
<string>优先级:</string>
<string>过滤</string>
</property>
</widget>
</item>
@ -412,57 +418,42 @@
</property>
</widget>
</item>
<item row="0" column="10">
<widget class="QPushButton" name="filter">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<item row="0" column="0">
<widget class="QLabel" name="label_3">
<property name="minimumSize">
<size>
<width>65</width>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>65</width>
<width>16777215</width>
<height>26</height>
</size>
</property>
<property name="layoutDirection">
<enum>Qt::RightToLeft</enum>
</property>
<property name="text">
<string>过滤</string>
<string>优先级:</string>
</property>
</widget>
</item>
<item row="0" column="12">
<widget class="QPushButton" name="print">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<item row="0" column="16">
<widget class="QPushButton" name="inhiAlarm">
<property name="minimumSize">
<size>
<width>65</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>65</width>
<width>45</width>
<height>26</height>
</size>
</property>
<property name="text">
<string>导出</string>
<string>禁止告警</string>
</property>
</widget>
</item>
<item row="0" column="13">
<item row="0" column="14">
<widget class="QPushButton" name="remove">
<property name="enabled">
<bool>false</bool>
@ -478,26 +469,23 @@
</property>
</widget>
</item>
<item row="0" column="4">
<widget class="QComboBox" name="comboBox_2">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>150</width>
<height>0</height>
</size>
<item row="0" column="15">
<widget class="QPushButton" name="confirm">
<property name="enabled">
<bool>false</bool>
</property>
<property name="maximumSize">
<size>
<width>1000</width>
<width>65</width>
<height>26</height>
</size>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="text">
<string>确认</string>
</property>
</widget>
</item>
<item row="0" column="1">
@ -522,36 +510,26 @@
</property>
</widget>
</item>
<item row="0" column="15">
<widget class="QPushButton" name="inhiAlarm">
<item row="0" column="4">
<widget class="QComboBox" name="comboBox_2">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>45</width>
<height>26</height>
<width>150</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>禁止告警</string>
</property>
</widget>
</item>
<item row="0" column="14">
<widget class="QPushButton" name="confirm">
<property name="enabled">
<bool>false</bool>
</property>
<property name="maximumSize">
<size>
<width>65</width>
<width>1000</width>
<height>26</height>
</size>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="text">
<string>确认</string>
</property>
</widget>
</item>
<item row="0" column="9">
@ -570,6 +548,22 @@
</property>
</spacer>
</item>
<item row="1" column="4">
<widget class="QComboBox" name="comboBox_3">
<property name="minimumSize">
<size>
<width>250</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>26</height>
</size>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_6">
<property name="minimumSize">
@ -627,22 +621,6 @@
</property>
</widget>
</item>
<item row="1" column="4">
<widget class="QComboBox" name="comboBox_3">
<property name="minimumSize">
<size>
<width>250</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>26</height>
</size>
</property>
</widget>
</item>
<item row="1" column="2">
<spacer name="horizontalSpacer_3">
<property name="orientation">
@ -659,6 +637,28 @@
</property>
</spacer>
</item>
<item row="0" column="10">
<widget class="QPushButton" name="set">
<property name="enabled">
<bool>true</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>60</width>
<height>26</height>
</size>
</property>
<property name="text">
<string>设置</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>

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

@ -304,7 +304,7 @@ private:
int m_buttom;
//节点应用相关
QVector<QString> m_nodeVec; //< 所有启用的节点名称
QMap<int,sys_startup::SSysModelAppInfo> m_modelAppInfoMap; //< 系统建模应用信息
QMap<int,sys_startup::SSysModelAppInfo> m_modelAppInfoMap; //< 系统拓扑应用信息
QMap<QString,QMap<int ,sys_startup::SApp> > m_modelDeployInfoMap; //< 所有需要运行的应用信息
std::vector<sys_startup::SProcess> m_modelProcInfoVec; //< 所需要运行的进程信息

2
product/src/sys/sys_startup/DogCheck.cpp
View File

@ -13,7 +13,7 @@ DogCheck::DogCheck(QWidget *parent) :
ui(new Ui::DogCheck)
{
ui->setupUi(this);
this->setWindowTitle(tr("加密狗检测"));
this->setWindowTitle(tr("密钥信息"));
this->setWindowFlags(windowFlags()&~Qt::WindowContextHelpButtonHint);
slot_recheckBtn();
ui->recheckBtn->setText(tr("重新检测"));

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

@ -1052,7 +1052,7 @@ void MainWindow::startSystem(int res,QProcess::ExitStatus exit)
//3.检查模型数据是否导出
if(DataMng::instance()->getLocalProcNum() <= 0)
{
QMessageBox::StandardButton result = QMessageBox::question(this,tr("错误"),tr("系统模型配置信息异常,是否打开系统建模工具检查配置并导出?"));
QMessageBox::StandardButton result = QMessageBox::question(this,tr("错误"),tr("系统模型配置信息异常,是否打开系统拓扑工具检查配置并导出?"));
if(result == QMessageBox::Yes)
{
const std::string strProc = std::move( iot_public::CFileUtil::getPathOfBinFile(

2
product/src/tools/debug_tool/CDebugTool.cpp
View File

@ -14,7 +14,7 @@ CDebugTool::CDebugTool(CSystemResources *pSystemResources, QWidget *parent):
{
ui->setupUi(this);
//setMinimumSize(1200,755);
setWindowTitle(tr("工程调试工具"));
setWindowTitle(tr("调试助手工具"));
setWindowIcon(QIcon(":/debug_tool.ico"));
CommonSheet sheetStyle;
QString sheet;

2
product/src/tools/debug_tool_v2/CDebugTool.cpp
View File

@ -15,7 +15,7 @@ CDebugTool::CDebugTool(CSystemResources *pSystemResources, QWidget *parent):
ui->setupUi(this);
//setMinimumSize(1200,755);
setWindowTitle(tr("工程调试工具"));
setWindowTitle(tr("调试助手工具"));
setWindowIcon(QIcon(":/debug_tool.ico"));
CommonSheet sheetStyle;
QString sheet;

2
product/src/tools/debug_tool_v2/mainwindow.cpp
View File

@ -15,7 +15,7 @@ MainWindow::MainWindow(CSystemResources *pSystemResources, QWidget *parent) :
ui->setupUi(this);
//setMinimumSize(1200,755);
setWindowTitle(tr("工程调试"));
setWindowTitle(tr("调试助手"));
initDebugTool();
setTitleWidget(ui->mainmenu);

8
product/src/tools/file_sync_tool/mainwindow.cpp
View File

@ -272,7 +272,7 @@ void MainWindow::slot_refeshBtnClicked()
QString selectHost = m_hostCbm->currentData().toString();
if (selectHost.isEmpty())
{
showMsg("无法获取到本机主机配置,请检查系统建模配置！");
showMsg("无法获取到本机主机配置,请检查系统拓扑配置！");
return;
}
@ -294,7 +294,7 @@ void MainWindow::slot_rootPathBtnClicked()
QString selectHost = m_hostCbm->currentData().toString();
if (selectHost.isEmpty())
{
showMsg("无法获取到本机主机配置,请检查系统建模配置！");
showMsg("无法获取到本机主机配置,请检查系统拓扑配置！");
return;
}
@ -319,7 +319,7 @@ void MainWindow::slot_upPathBtnClicked()
QString selectHost = m_hostCbm->currentData().toString();
if (selectHost.isEmpty())
{
showMsg("无法获取到本机主机配置,请检查系统建模配置！");
showMsg("无法获取到本机主机配置,请检查系统拓扑配置！");
return;
}
startExeTask();
@ -755,7 +755,7 @@ void MainWindow::slot_treeitemDoubleClicked(
QString selectHost = m_hostCbm->currentData().toString();
if (selectHost.isEmpty())
{
showMsg("无法获取到本机主机配置,请检查系统建模配置！");
showMsg("无法获取到本机主机配置,请检查系统拓扑配置！");
return;
}
startExeTask();

4
product/src/tools/setup/setup_installer/SetupFuncLinux.cpp
View File

@ -350,9 +350,9 @@ bool createStartProgram(QString &strErr,const QString& path)
createDesktopEntry(appDestPath,CDesktopEntry("sys_dog_auth_check", QObject::tr("超级狗检查"), "check system dog authentication",execProdDir+"/sys_dog_auth_check"),strErr);
createDesktopEntry(appDestPath,CDesktopEntry("FesSim", QObject::tr("前置调试"),"fes debug tool",execProdDir+"/FesSim",iconDir + "/fes_sim.ico"),strErr);
createDesktopEntry(appDestPath,CDesktopEntry("debug_tool", QObject::tr("工程调试工具"),"debug tool",execProdDir+"/debug_tool",iconDir + "/debug_tool.ico"),strErr);
createDesktopEntry(appDestPath,CDesktopEntry("debug_tool", QObject::tr("调试助手工具"),"debug tool",execProdDir+"/debug_tool",iconDir + "/debug_tool.ico"),strErr);
createDesktopEntry(appDestPath,CDesktopEntry("sys_command",QObject::tr("命令窗口"),"bin exec environment",execProdDir+"/sys_command.sh"),strErr);
createDesktopEntry(appDestPath,CDesktopEntry("model_system_config",QObject::tr("系统建模"),"system model configuration",execPlatDir+"/model_system_config",iconDir + "/systemConfig.ico"),strErr);
createDesktopEntry(appDestPath,CDesktopEntry("model_system_config",QObject::tr("系统拓扑"),"system model configuration",execPlatDir+"/model_system_config",iconDir + "/systemConfig.ico"),strErr);
createDesktopEntry(appDestPath,CDesktopEntry("model_studio",QObject::tr("设备建模"),"model studio",execPlatDir+"/model_studio",iconDir + "/studio.ico"),strErr);
createDesktopEntry(appDestPath,CDesktopEntry("hmi",QObject::tr("画面组态"),"human machine interface app",execPlatDir+"/hmi",iconDir + "/fes_sim.ico"),strErr);
createDesktopEntry(appDestPath,CDesktopEntry("fbd_editor",QObject::tr("逻辑编程"),"fbd editor",execPlatDir+"/fbd_designer",iconDir + "/fbd_editor.ico"),strErr);

2
product/src/tools/workBench/MainWindow.cpp
View File

@ -1090,7 +1090,7 @@ void MainWindow::startSystem(int res,QProcess::ExitStatus exit)
//3.检查模型数据是否导出
if(DataMng::instance()->getLocalProcNum() <= 0)
{
int result = N_MessageBox::question(this,tr("错误"),tr("系统模型配置信息异常,是否打开系统建模工具检查配置并导出?") ,
int result = N_MessageBox::question(this,tr("错误"),tr("系统模型配置信息异常,是否打开系统拓扑工具检查配置并导出?") ,
N_MessageBox::Yes | N_MessageBox::No, N_MessageBox::Yes);
if(result == N_MessageBox::Yes)
{

2
product/src/tools/workBench/tool/DataMng.h
View File

@ -299,7 +299,7 @@ private:
//节点应用相关
QVector<QString> m_nodeVec; //< 所有启用的节点名称
QMap<int,workBench::SSysModelAppInfo> m_modelAppInfoMap; //< 系统建模应用信息
QMap<int,workBench::SSysModelAppInfo> m_modelAppInfoMap; //< 系统拓扑应用信息
QMap<QString,QMap<int ,workBench::SApp> > m_modelDeployInfoMap; //< 所有需要运行的应用信息
std::vector<workBench::SProcess> m_modelProcInfoVec; //< 所需要运行的进程信息

9
resource/zh/style/light/alarm.qss
View File

@ -47,13 +47,6 @@ CMyCalendar QPushButton{
QTreeWidget#area::item {
height:23px;
}
/*
QTableView {
color:#333333;
outline:0px;
border: 1px solid #cccfd9;
alternate-background-color: #f4f8fb;
background-color:white;
font-size:40px;
qproperty-showGrid:false;
}*/
}