Merge branch 'master' of http://47.103.159.168:10012/GZHM/HM-SPMS

platform/src/tools/model_plugin/FESWidget/kbddevimportdlg.cpp

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

platform/src/tools/model_plugin/TempPlugin/temppluginwidget.cpp

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

product/common/sysconfig/setup_config.xml

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

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,49 +111,56 @@
 			"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":
@@ -152,7 +172,8 @@
 		"num6",
 		"num2",
         "num10",
-		"num7"
+		"num7",
+		"num3"
 	],
 	"page3":{
 		"count":3,

product/src/gui/plugin/AlarmWidget/CAlarmForm.cpp

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

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

product/src/gui/plugin/TrendCurves/CTrendTreeModel.cpp

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

product/src/sys/sys_startup/ButtonForm.cpp

@@ -73,8 +73,9 @@ 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);
         });

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;
     }
@@ -191,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()
@@ -457,6 +460,10 @@ QString DataMng::getTitle()
 {
     return m_title;
 }
+QString DataMng::getPng()
+{
+    return m_png;
+}
 
 QMap<int,sys_startup::SButtonGroup> DataMng::getPage3ButtonInfo()
 {

product/src/sys/sys_startup/DataMng.h

@@ -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;               //< 系统建模应用信息

product/src/sys/sys_startup/MainWindow.cpp

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

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

product/src/tools/workBench/ButtonForm.cpp

@@ -84,6 +84,7 @@ 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)
         {

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

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;
     }