diff --git a/installer/registry_software.bat b/installer/registry_software.bat index acfb1275..1b533125 100644 --- a/installer/registry_software.bat +++ b/installer/registry_software.bat @@ -11,7 +11,7 @@ REM set "softwarePath=%parentDir%" REM 定义注册表项路径 -set "REG_PATH=HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\EnergyHub" +set "REG_PATH=HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\HMEnergy" REM 删除现有的注册表项(如果存在) reg query "%REG_PATH%" >nul 2>&1 @@ -21,11 +21,11 @@ if %errorlevel%==0 ( ) REM 添加注册表项和值 -reg add "%REG_PATH%" /v DisplayName /t REG_SZ /d "EnergyHub" /f +reg add "%REG_PATH%" /v DisplayName /t REG_SZ /d "HMEnergy" /f reg add "%REG_PATH%" /v UninstallString /t REG_SZ /d "%softwarePath%\uninst.exe" /f reg add "%REG_PATH%" /v DisplayIcon /t REG_SZ /d "%scriptPath%\rqeh6000.ico" /f reg add "%REG_PATH%" /v DisplayVersion /t REG_SZ /d "1.0.0" /f -reg add "%REG_PATH%" /v Publisher /t REG_SZ /d "RelyEZ" /f +reg add "%REG_PATH%" /v Publisher /t REG_SZ /d "GZHM" /f ::reg add "%REG_PATH%" /v InstallLocation /t REG_SZ /d "%softwarePath%" /f echo 注册表项已添加 diff --git a/platform/src/sys/sys.pro b/platform/src/sys/sys.pro index cb84797c..a0b4e323 100644 --- a/platform/src/sys/sys.pro +++ b/platform/src/sys/sys.pro @@ -28,3 +28,4 @@ sys_proc_mng.depends = sys_network_check_api sys_proc_mng_api sys_node_mng.depends = sys_network_check_api sys_proc_mng_api sys_network_check.depends = sys_network_check_api sys_proc_mng_api sys_nodeinfo_tran.depends = sys_proc_mng_api sys_node_mng_api +file_sync_auto.depends = sys_proc_mng_api sys_node_mng_api diff --git a/product/src/gui/plugin/TrendCurves/CTrendInfoManage.cpp b/product/src/gui/plugin/TrendCurves/CTrendInfoManage.cpp index 0668a061..f04b6d44 100644 --- a/product/src/gui/plugin/TrendCurves/CTrendInfoManage.cpp +++ b/product/src/gui/plugin/TrendCurves/CTrendInfoManage.cpp @@ -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"); if(!strLoctionFilter.isEmpty()) { - sqlSequenceQuery.append(QString(" %1 asc,dev_group_no asc,tag_name;").arg(strLoctionFilter)); + sqlSequenceQuery.append(QString(" and %1 order by location_id , rtu_no , dev_group_no ,tag_name;").arg(strLoctionFilter)); }else { - sqlSequenceQuery.append(QStringLiteral(" dev_group_no asc,tag_name;")); + sqlSequenceQuery.append(QStringLiteral(" order by location_id , rtu_no , dev_group_no ,tag_name;")); } query.setForwardOnly(true); pReadDb->execute(sqlSequenceQuery, query); @@ -423,9 +423,10 @@ void CTrendInfoManage::loadDeviceInfo(CDbApi *pReadDb) 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(QString(" where %1 ").arg(strLoctionFilter)); } - sqlSequenceQuery.append(" order by tag_name"); + sqlSequenceQuery.append(" order by location_id, tag_name;"); + query.setForwardOnly(true); pReadDb->execute(sqlSequenceQuery, query); while(query.next()) diff --git a/product/src/sys/sys_startup/res/CommandWindow.png b/product/src/sys/sys_startup/res/CommandWindow.png index 63850a46..9b4d279b 100644 Binary files a/product/src/sys/sys_startup/res/CommandWindow.png and b/product/src/sys/sys_startup/res/CommandWindow.png differ diff --git a/product/src/sys/sys_startup/res/DatabaseCheck.png b/product/src/sys/sys_startup/res/DatabaseCheck.png index ba4650f3..b0ebe3c1 100644 Binary files a/product/src/sys/sys_startup/res/DatabaseCheck.png and b/product/src/sys/sys_startup/res/DatabaseCheck.png differ diff --git a/product/src/sys/sys_startup/res/DevModeling.png b/product/src/sys/sys_startup/res/DevModeling.png index 1ecc37f3..3620be17 100644 Binary files a/product/src/sys/sys_startup/res/DevModeling.png and b/product/src/sys/sys_startup/res/DevModeling.png differ diff --git a/product/src/sys/sys_startup/res/DogCheck.png b/product/src/sys/sys_startup/res/DogCheck.png index 416fd7ec..7df07f9c 100644 Binary files a/product/src/sys/sys_startup/res/DogCheck.png and b/product/src/sys/sys_startup/res/DogCheck.png differ diff --git a/product/src/sys/sys_startup/res/EngineeringDebug.png b/product/src/sys/sys_startup/res/EngineeringDebug.png index 2abbef32..0926d672 100644 Binary files a/product/src/sys/sys_startup/res/EngineeringDebug.png and b/product/src/sys/sys_startup/res/EngineeringDebug.png differ diff --git a/product/src/sys/sys_startup/res/EngineeringManagement.png b/product/src/sys/sys_startup/res/EngineeringManagement.png index 0b443a38..8635b5d0 100644 Binary files a/product/src/sys/sys_startup/res/EngineeringManagement.png and b/product/src/sys/sys_startup/res/EngineeringManagement.png differ diff --git a/product/src/sys/sys_startup/res/HmiStart.png b/product/src/sys/sys_startup/res/HmiStart.png index 6e29700b..18d9d921 100644 Binary files a/product/src/sys/sys_startup/res/HmiStart.png and b/product/src/sys/sys_startup/res/HmiStart.png differ diff --git a/product/src/sys/sys_startup/res/KBD_30.png b/product/src/sys/sys_startup/res/KBD_30.png index 63fb5bf5..99b2332a 100644 Binary files a/product/src/sys/sys_startup/res/KBD_30.png and b/product/src/sys/sys_startup/res/KBD_30.png differ diff --git a/product/src/sys/sys_startup/res/LogicProgramming.png b/product/src/sys/sys_startup/res/LogicProgramming.png index 909b2b31..a32716df 100644 Binary files a/product/src/sys/sys_startup/res/LogicProgramming.png and b/product/src/sys/sys_startup/res/LogicProgramming.png differ diff --git a/product/src/sys/sys_startup/res/MonitInterface.png b/product/src/sys/sys_startup/res/MonitInterface.png index 3c371df8..0a604e8a 100644 Binary files a/product/src/sys/sys_startup/res/MonitInterface.png and b/product/src/sys/sys_startup/res/MonitInterface.png differ diff --git a/product/src/sys/sys_startup/res/PictureConfiguration.png b/product/src/sys/sys_startup/res/PictureConfiguration.png index 8ad6f876..97581a5a 100644 Binary files a/product/src/sys/sys_startup/res/PictureConfiguration.png and b/product/src/sys/sys_startup/res/PictureConfiguration.png differ diff --git a/product/src/sys/sys_startup/res/PreEmulation.png b/product/src/sys/sys_startup/res/PreEmulation.png index 8cf70ea7..7f3b3220 100644 Binary files a/product/src/sys/sys_startup/res/PreEmulation.png and b/product/src/sys/sys_startup/res/PreEmulation.png differ diff --git a/product/src/sys/sys_startup/res/SysStart.png b/product/src/sys/sys_startup/res/SysStart.png index 96714133..4980c26f 100644 Binary files a/product/src/sys/sys_startup/res/SysStart.png and b/product/src/sys/sys_startup/res/SysStart.png differ diff --git a/product/src/sys/sys_startup/res/SystemModeling.png b/product/src/sys/sys_startup/res/SystemModeling.png index 2f55dc8b..82539a98 100644 Binary files a/product/src/sys/sys_startup/res/SystemModeling.png and b/product/src/sys/sys_startup/res/SystemModeling.png differ diff --git a/product/src/sys/sys_startup/res/db_studio.png b/product/src/sys/sys_startup/res/db_studio.png index ad1cc345..c469bf96 100644 Binary files a/product/src/sys/sys_startup/res/db_studio.png and b/product/src/sys/sys_startup/res/db_studio.png differ diff --git a/product/src/sys/sys_startup/res/icon.png b/product/src/sys/sys_startup/res/icon.png index 7874d6e6..ae177c8a 100644 Binary files a/product/src/sys/sys_startup/res/icon.png and b/product/src/sys/sys_startup/res/icon.png differ diff --git a/product/src/sys/sys_startup/res/preset_config.png b/product/src/sys/sys_startup/res/preset_config.png index b8e02ec2..4a493b61 100644 Binary files a/product/src/sys/sys_startup/res/preset_config.png and b/product/src/sys/sys_startup/res/preset_config.png differ diff --git a/product/src/sys/sys_startup/res/push_debug.png b/product/src/sys/sys_startup/res/push_debug.png index ffde08f8..4b23de21 100644 Binary files a/product/src/sys/sys_startup/res/push_debug.png and b/product/src/sys/sys_startup/res/push_debug.png differ diff --git a/product/src/sys/sys_startup/res/reset.png b/product/src/sys/sys_startup/res/reset.png index 8a6ad3a1..0d97386b 100644 Binary files a/product/src/sys/sys_startup/res/reset.png and b/product/src/sys/sys_startup/res/reset.png differ diff --git a/product/src/sys/sys_startup/res/restart.png b/product/src/sys/sys_startup/res/restart.png index a5acc66b..21e55e0a 100644 Binary files a/product/src/sys/sys_startup/res/restart.png and b/product/src/sys/sys_startup/res/restart.png differ