diff --git a/product/common/sysconfig/sys_startup.json b/product/common/sysconfig/sys_startup.json index d7e6c518..3c4d6daa 100644 --- a/product/common/sysconfig/sys_startup.json +++ b/product/common/sysconfig/sys_startup.json @@ -6,91 +6,104 @@ "en":"HMI", "cmd":"hmi_explorer.bat", "param":"", - "icon":"../../resource/zh/sys_startup/MonitInterface.png" + "icon":"../../resource/zh/sys_startup/MonitInterface.png", + "enable":false }, "num1":{ "zh":"加密狗检测", "en":"Supper\nDog Check", "cmd":"DogCheck", "param":"", - "icon":"../../resource/zh/sys_startup/DogCheck.png" + "icon":"../../resource/zh/sys_startup/DogCheck.png", + "enable":true }, "num2":{ "zh":"数据库检测", "en":"Database\ndetection", "cmd":"DbCheck", "param":"", - "icon":"../../resource/zh/sys_startup/DatabaseCheck.png" + "icon":"../../resource/zh/sys_startup/DatabaseCheck.png", + "enable":true }, "num3":{ "zh":"自启动设置", "en":"Self-starting\nsettings", "cmd":"AutoStart", "param":"", - "icon":"../../resource/zh/sys_startup/SysStart.png" + "icon":"../../resource/zh/sys_startup/SysStart.png", + "enable":true }, "num4":{ "zh":"系统建模", "en":"System\nmodeling", "cmd":"model_system_config.exe", "param":"", - "icon":"../../resource/zh/sys_startup/SystemModeling.png" + "icon":"../../resource/zh/sys_startup/SystemModeling.png", + "enable":true }, "num5":{ "zh":"设备建模", "en":"Device\nmodeling", "cmd":"model_studio.exe", "param":"", - "icon":"../../resource/zh/sys_startup/DevModeling.png" + "icon":"../../resource/zh/sys_startup/DevModeling.png", + "enable":true }, "num6":{ "zh":"组态制作", "en":"Graphic\ndesign", "cmd":"hmi.exe", "param":"", - "icon":"../../resource/zh/sys_startup/PictureConfiguration.png" + "icon":"../../resource/zh/sys_startup/PictureConfiguration.png", + "enable":true }, "num7":{ "zh":"工程备份", "en":"Project\nmanagement", "cmd":"db_manager.exe", "param":"", - "icon":"../../resource/zh/sys_startup/EngineeringManagement.png" + "icon":"../../resource/zh/sys_startup/EngineeringManagement.png", + "enable":true }, "num8":{ "zh":"逻辑编程", "en":"FBD", "cmd":"fbd_designer.exe", "param":"", - "icon":"../../resource/zh/sys_startup/LogicProgramming.png" + "icon":"../../resource/zh/sys_startup/LogicProgramming.png", + "enable":true }, "num9":{ "zh":"预置点配置", "en":"Preset\nconfig", "cmd":"camera_statistics.exe", "param":"", - "icon":"../../resource/zh/sys_startup/preset_config.png" + "icon":"../../resource/zh/sys_startup/preset_config.png", + "enable":true }, "num10":{ "zh":"工程调试", "en":"Debug\ntool", "cmd":"debug_tool.exe", "param":"", - "icon":"../../resource/zh/sys_startup/EngineeringDebug.png" + "icon":"../../resource/zh/sys_startup/EngineeringDebug.png", + "enable":true }, "num11":{ "zh":"平台终端", "en":"Command\nwindow", "cmd":"sys_command-platform.bat", "param":"", - "icon":"../../resource/zh/sys_startup/CommandWindow.png" + "icon":"../../resource/zh/sys_startup/CommandWindow.png", + "enable":true }, "num12":{ "zh":"产品终端", "en":"Command\nwindow", "cmd":"sys_command.bat", "param":"", - "icon":"../../resource/zh/sys_startup/CommandWindow.png" + "icon":"../../resource/zh/sys_startup/CommandWindow.png", + "enable":true }, "num13":{ @@ -98,54 +111,62 @@ "en":"Push\ndebug", "cmd":"push_debug.exe", "param":"", - "icon":"../../resource/zh/sys_startup/push_debug.png" + "icon":"../../resource/zh/sys_startup/push_debug.png", + "enable":true }, "num14":{ "zh":"文件同步", "en":"File\nsync tool", "cmd":"file_sync_tool.exe", "param":"", - "icon":"../../resource/zh/sys_startup/FileSync.png" + "icon":"../../resource/zh/sys_startup/FileSync.png", + "enable":true }, "num15":{ "zh":"报表编辑", "en":"Report Edit", "cmd":"ReportEdit.exe", "param":"", - "icon":"../../resource/zh/sys_startup/ReportEdit.png" + "icon":"../../resource/zh/sys_startup/ReportEdit.png", + "enable":true }, "num16":{ "zh":"网络监测", "en":"Network Monitor", "cmd":"NetMonite.exe", "param":"", - "icon":"../../resource/zh/sys_startup/NetMonite.png" + "icon":"../../resource/zh/sys_startup/NetMonite.png", + "enable":true }, "num17":{ "zh":"时序数据", "en":"TSDB Management", "cmd":"tsdb_data_manager.exe", "param":"", - "icon":"../../resource/zh/sys_startup/DatabaseCheck.png" + "icon":"../../resource/zh/sys_startup/DatabaseCheck.png", + "enable":true }, "num18":{ "zh":"数据导出", "en":"TSDB Export Management", "cmd":"tsdb_data_export.exe", "param":"", - "icon":"../../resource/zh/sys_startup/DatabaseCheck.png" + "icon":"../../resource/zh/sys_startup/DatabaseCheck.png", + "enable":true }, "num19":{ "zh":"启动/停止", "en":"Start/Stop", "cmd":"SysCtrl", "param":"", - "icon":"../../resource/zh/sys_startup/DatabaseCheck.png" + "icon":"../../resource/zh/sys_startup/DatabaseCheck.png", + "enable":true } }, "page1": [ "num19", + "num0", "num4", "num5", "num6", diff --git a/product/src/sys/sys_startup/ButtonForm.cpp b/product/src/sys/sys_startup/ButtonForm.cpp index a2f1ef50..116acdb7 100644 --- a/product/src/sys/sys_startup/ButtonForm.cpp +++ b/product/src/sys/sys_startup/ButtonForm.cpp @@ -73,7 +73,7 @@ void ButtonForm::addToolButtons(QVector &buttonVec) toolBtn->setMinimumWidth(80); //toolBtn->setIcon(icon); toolBtn->setText(m_bIsZh?buttonInfo.m_zh:buttonInfo.m_en); - + toolBtn->setEnabled(buttonInfo.m_enable); connect(toolBtn,&QToolButton::clicked,[=](){ executeTask(buttonInfo.m_cmd,buttonInfo.m_param); diff --git a/product/src/sys/sys_startup/DataMng.cpp b/product/src/sys/sys_startup/DataMng.cpp index 34610fd1..b633f9fa 100644 --- a/product/src/sys/sys_startup/DataMng.cpp +++ b/product/src/sys/sys_startup/DataMng.cpp @@ -92,6 +92,7 @@ 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; } diff --git a/product/src/sys/sys_startup/MonitorCommon.h b/product/src/sys/sys_startup/MonitorCommon.h index 9ba7b5b3..d04b321b 100644 --- a/product/src/sys/sys_startup/MonitorCommon.h +++ b/product/src/sys/sys_startup/MonitorCommon.h @@ -100,6 +100,7 @@ struct SButtonInfo QString m_cmd; QString m_param; QString m_icon; + bool m_enable; SButtonInfo() { m_name = QString(); m_zh = QString(); @@ -107,6 +108,7 @@ struct SButtonInfo m_cmd = QString(); m_param = QString(); m_icon = QString(); + m_enable = true; } }; struct SButtonGroup diff --git a/product/src/tools/workBench/ButtonForm.cpp b/product/src/tools/workBench/ButtonForm.cpp index 4a49d1ce..1a3aa013 100644 --- a/product/src/tools/workBench/ButtonForm.cpp +++ b/product/src/tools/workBench/ButtonForm.cpp @@ -84,6 +84,7 @@ void ButtonForm::addToolButtons(QVector &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) { diff --git a/product/src/tools/workBench/MonitorCommon.h b/product/src/tools/workBench/MonitorCommon.h index c99c9784..257654a7 100644 --- a/product/src/tools/workBench/MonitorCommon.h +++ b/product/src/tools/workBench/MonitorCommon.h @@ -101,12 +101,14 @@ 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 diff --git a/product/src/tools/workBench/tool/DataMng.cpp b/product/src/tools/workBench/tool/DataMng.cpp index dfb7b485..28d742ae 100644 --- a/product/src/tools/workBench/tool/DataMng.cpp +++ b/product/src/tools/workBench/tool/DataMng.cpp @@ -95,6 +95,7 @@ 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; }