使能通道配置的供电配置

BoardSetting.cpp

@@ -348,7 +348,7 @@ void CBoardSetting::PushData()
                 QString str = QString(" values('%1','%2','%3','%4',%5,'%6','%7',%8,'%9',%10,'%11',%12,'%13',%14,'%15',%16,'%17',%18,%19,%20,'%21',%22,'%23',%24,\
                                         '%25',%26,'%27','%28','%29','%30',%31,'%32',%33,'%34','%35',%36,'%37',%38,'%39','%40',%41,'%42',%43,'%44',\
                                         '%45','%46',%47,%48,%49,'%50','%51','%52',%53,'%54','%55',%56,%57,'%58','%59',%60,'%61','%62','%63',%64,'%65','%66','%67',\
-                                        '%68','%69','%70',%71,%72,%73,'%74','%75','%76','%77','%78','%79','%80','%81','%82','%83','%84',%85,'%86','%87','%88','%89','%90','%91','%92','%93','%94','%95','',98,1,'','',0);").\
+                                        '%68','%69','%70',%71,%72,%73,'%74','%75','%76','%77','%78','%79','%80','%81','%82','%83','%84',%85,'%86','%87','%88','%89','%90','%91','%92','%93','%94','%95','',95,8,'','',0);").\
                 arg("NULL").arg(0).arg("true").arg("ACCELEROMETER").arg("0").arg("Bottom").arg("false").arg(0).arg("false").arg(0).arg("false").arg(0).arg("false").arg(0).arg("false").arg(0).arg("false").arg(0).arg(0).arg(0).arg("false").
                 arg(0).arg("false").arg(0).arg("false").arg(0).arg(strChannelID).arg("NONE").arg(strChannelName).arg("false").arg(0).arg("false").arg(0).arg("RMSValue").arg("").arg(0).arg("false").arg(0).arg("CTC-AC102").arg("false").arg(0).arg("false").arg(0).arg("").\
                 arg("true").arg(strMAC).arg(0).arg(1000).arg(0).arg("Hamming").arg("15000").arg("0.5").arg(30).arg("5000").arg("").arg(0).arg(0).arg("0").arg("60000").arg(0).arg("NONE").arg("").arg("0").arg(1024).arg("").arg("").arg(timeStamp).\
@@ -368,7 +368,7 @@ void CBoardSetting::PushData()
                 QString str = QString(" values('%1','%2','%3','%4',%5,'%6','%7',%8,'%9',%10,'%11',%12,'%13',%14,'%15',%16,'%17',%18,%19,%20,'%21',%22,'%23',%24,\
                                         '%25',%26,'%27','%28','%29','%30',%31,'%32',%33,'%34','%35',%36,'%37',%38,'%39','%40',%41,'%42',%43,'%44',\
                                         '%45','%46',%47,%48,%49,'%50','%51','%52',%53,'%54','%55',%56,%57,'%58','%59',%60,'%61','%62','%63',%64,'%65','%66','%67',\
-                                        '%68','%69','%70',%71,%72,%73,'%74','%75','%76','%77','%78','%79','%80','%81','%82','%83','%84',%85,'%86','%87','%88','%89','%90','%91','%92','%93','%94','%95','',98,1,'','',0);").\
+                                        '%68','%69','%70',%71,%72,%73,'%74','%75','%76','%77','%78','%79','%80','%81','%82','%83','%84',%85,'%86','%87','%88','%89','%90','%91','%92','%93','%94','%95','',95,8,'','',0);").\
                 arg("NULL").arg(0).arg("true").arg("ACCELEROMETER").arg("0").arg("Bottom").arg("false").arg(0).arg("false").arg(0).arg("false").arg(0).arg("false").arg(0).arg("false").arg(0).arg("false").arg(0).arg(0).arg(0).arg("false").
                 arg(0).arg("false").arg(0).arg("false").arg(0).arg(strChannelID).arg("NONE").arg(strChannelName).arg("false").arg(0).arg("false").arg(0).arg("RMSValue").arg("").arg(0).arg("false").arg(0).arg("CTC-AC102").arg("false").arg(0).arg("false").arg(0).arg("").\
                 arg("true").arg(strMAC).arg(0).arg(1000).arg(0).arg("Hamming").arg("15000").arg("0.5").arg(12).arg("5000").arg("").arg(0).arg(0).arg("0").arg("60000").arg(0).arg("NONE").arg("").arg("0").arg(1024).arg("").arg("").arg(timeStamp).\
@@ -387,7 +387,7 @@ void CBoardSetting::PushData()
                 QString str = QString(" values('%1','%2','%3','%4',%5,'%6','%7',%8,'%9',%10,'%11',%12,'%13',%14,'%15',%16,'%17',%18,%19,%20,'%21',%22,'%23',%24,\
                                         '%25',%26,'%27','%28','%29','%30',%31,'%32',%33,'%34','%35',%36,'%37',%38,'%39','%40',%41,'%42',%43,'%44',\
                                         '%45','%46',%47,%48,%49,'%50','%51','%52',%53,'%54','%55',%56,%57,'%58','%59',%60,'%61','%62','%63',%64,'%65','%66','%67',\
-                                        '%68','%69','%70',%71,%72,%73,'%74','%75','%76','%77','%78','%79','%80','%81','%82','%83','%84',%85,'%86','%87','%88','%89','%90','%91','%92','%93','%94','%95','',98,1,'','',0);").\
+                                        '%68','%69','%70',%71,%72,%73,'%74','%75','%76','%77','%78','%79','%80','%81','%82','%83','%84',%85,'%86','%87','%88','%89','%90','%91','%92','%93','%94','%95','',97,8,'','',0);").\
                 arg("NULL").arg(0).arg("true").arg("PULSE_CURRENT").arg("0").arg("Bottom").arg("false").arg(0).arg("false").arg(0).arg("false").arg(0).arg("false").arg(0).arg("false").arg(0).arg("false").arg(0).arg(0).arg(0).arg("false").
                 arg(0).arg("false").arg(0).arg("false").arg(0).arg(strChannelID).arg("NONE").arg(strChannelName).arg("false").arg(0).arg("false").arg(0).arg("RMSValue").arg("").arg(0).arg("false").arg(0).arg("电流变送器").arg("false").arg(0).arg("false").arg(0).arg("").\
                 arg("true").arg(MAC).arg(0).arg(1000).arg(0).arg("Hamming").arg("").arg("").arg(20).arg("5000").arg("").arg(0).arg(0).arg("0").arg("60000").arg(0).arg("NONE").arg("").arg("0").arg(1024).arg("").arg("").arg(timeStamp).\
@@ -407,7 +407,7 @@ void CBoardSetting::PushData()
                 QString str = QString(" values('%1','%2','%3','%4',%5,'%6','%7',%8,'%9',%10,'%11',%12,'%13',%14,'%15',%16,'%17',%18,%19,%20,'%21',%22,'%23',%24,\
                                         '%25',%26,'%27','%28','%29','%30',%31,'%32',%33,'%34','%35',%36,'%37',%38,'%39','%40',%41,'%42',%43,'%44',\
                                         '%45','%46',%47,%48,%49,'%50','%51','%52',%53,'%54','%55',%56,%57,'%58','%59',%60,'%61','%62','%63',%64,'%65','%66','%67',\
-                                        '%68','%69','%70',%71,%72,%73,'%74','%75','%76','%77','%78','%79','%80','%81','%82','%83','%84',%85,'%86','%87','%88','%89','%90','%91','%92','%93','%94','%95','',98,1,'','',0);").\
+                                        '%68','%69','%70',%71,%72,%73,'%74','%75','%76','%77','%78','%79','%80','%81','%82','%83','%84',%85,'%86','%87','%88','%89','%90','%91','%92','%93','%94','%95','',97,8,'','',0);").\
                 arg("NULL").arg(0).arg("true").arg("SLOW_CURRENT").arg("0").arg("Bottom").arg("false").arg(0).arg("false").arg(0).arg("false").arg(0).arg("false").arg(0).arg("false").arg(0).arg("false").arg(0).arg(0).arg(0).arg("false").
                 arg(0).arg("false").arg(0).arg("false").arg(0).arg(strChannelID).arg("NONE").arg(strChannelName).arg("false").arg(0).arg("false").arg(0).arg("RMSValue").arg("").arg(0).arg("false").arg(0).arg("电流变送器").arg("false").arg(0).arg("false").arg(0).arg("").\
                 arg("true").arg(MAC).arg(0).arg(1000).arg(0).arg("Hamming").arg("").arg("").arg(20).arg("5000").arg("").arg(0).arg(0).arg("0").arg("60000").arg(0).arg("NONE").arg("").arg("0").arg(64).arg("").arg("").arg(timeStamp).\
@@ -801,7 +801,7 @@ void CBoardSetting::on_pushButton_Init_clicked()
                 QString str = QString(" values('%1','%2','%3','%4',%5,'%6','%7',%8,'%9',%10,'%11',%12,'%13',%14,'%15',%16,'%17',%18,%19,%20,'%21',%22,'%23',%24,\
                                         '%25',%26,'%27','%28','%29','%30',%31,'%32',%33,'%34','%35',%36,'%37',%38,'%39','%40',%41,'%42',%43,'%44',\
                                         '%45','%46',%47,%48,%49,'%50','%51','%52',%53,'%54','%55',%56,%57,'%58','%59',%60,'%61','%62','%63',%64,'%65','%66','%67',\
-                                        '%68','%69','%70',%71,%72,%73,'%74','%75','%76','%77','%78','%79','%80','%81','%82','%83','%84',%85,'%86','%87','%88','%89','%90','%91','%92','%93','%94','%95','',98,1,'','',0);").\
+                                        '%68','%69','%70',%71,%72,%73,'%74','%75','%76','%77','%78','%79','%80','%81','%82','%83','%84',%85,'%86','%87','%88','%89','%90','%91','%92','%93','%94','%95','',95,8,'','',0);").\
                 arg("NULL").arg(0).arg("true").arg("ACCELEROMETER").arg("0").arg("Bottom").arg("false").arg(0).arg("false").arg(0).arg("false").arg(0).arg("false").arg(0).arg("false").arg(0).arg("false").arg(0).arg(0).arg(0).arg("false").
                 arg(0).arg("false").arg(0).arg("false").arg(0).arg(strChannelID).arg("NONE").arg(strChannelName).arg("false").arg(0).arg("false").arg(0).arg("RMSValue").arg("").arg(0).arg("false").arg(0).arg("CTC-AC102").arg("false").arg(0).arg("false").arg(0).arg("").\
                 arg("true").arg(strMAC).arg(0).arg(1000).arg(0).arg("Hamming").arg("15000").arg("0.5").arg(10).arg("5000").arg("").arg(1).arg(1).arg("0").arg("60000").arg(0).arg("NONE").arg("").arg("0").arg(1024).arg("").arg("").arg(timeStamp).\
@@ -820,7 +820,7 @@ void CBoardSetting::on_pushButton_Init_clicked()
                 QString str = QString(" values('%1','%2','%3','%4',%5,'%6','%7',%8,'%9',%10,'%11',%12,'%13',%14,'%15',%16,'%17',%18,%19,%20,'%21',%22,'%23',%24,\
                                         '%25',%26,'%27','%28','%29','%30',%31,'%32',%33,'%34','%35',%36,'%37',%38,'%39','%40',%41,'%42',%43,'%44',\
                                         '%45','%46',%47,%48,%49,'%50','%51','%52',%53,'%54','%55',%56,%57,'%58','%59',%60,'%61','%62','%63',%64,'%65','%66','%67',\
-                                        '%68','%69','%70',%71,%72,%73,'%74','%75','%76','%77','%78','%79','%80','%81','%82','%83','%84',%85,'%86','%87','%88','%89','%90','%91','%92','%93','%94','%95','',98,1,'','',0);").\
+                                        '%68','%69','%70',%71,%72,%73,'%74','%75','%76','%77','%78','%79','%80','%81','%82','%83','%84',%85,'%86','%87','%88','%89','%90','%91','%92','%93','%94','%95','',97,8,'','',0);").\
                 arg("NULL").arg(0).arg("true").arg("PULSE_CURRENT").arg("0").arg("Bottom").arg("false").arg(0).arg("false").arg(0).arg("false").arg(0).arg("false").arg(0).arg("false").arg(0).arg("false").arg(0).arg(0).arg(0).arg("false").
                 arg(0).arg("false").arg(0).arg("false").arg(0).arg(strChannelID).arg("NONE").arg(strChannelName).arg("false").arg(0).arg("false").arg(0).arg("RMSValue").arg("").arg(0).arg("false").arg(0).arg("电流变送器").arg("false").arg(0).arg("false").arg(0).arg("").\
                 arg("true").arg(MAC).arg(0).arg(1000).arg(0).arg("Hamming").arg("").arg("").arg(20).arg("5000").arg("").arg(1).arg(1).arg("0").arg("60000").arg(0).arg("NONE").arg("").arg("0").arg(1024).arg("").arg("").arg(timeStamp).\
@@ -840,7 +840,7 @@ void CBoardSetting::on_pushButton_Init_clicked()
                 QString str = QString(" values('%1','%2','%3','%4',%5,'%6','%7',%8,'%9',%10,'%11',%12,'%13',%14,'%15',%16,'%17',%18,%19,%20,'%21',%22,'%23',%24,\
                                         '%25',%26,'%27','%28','%29','%30',%31,'%32',%33,'%34','%35',%36,'%37',%38,'%39','%40',%41,'%42',%43,'%44',\
                                         '%45','%46',%47,%48,%49,'%50','%51','%52',%53,'%54','%55',%56,%57,'%58','%59',%60,'%61','%62','%63',%64,'%65','%66','%67',\
-                                        '%68','%69','%70',%71,%72,%73,'%74','%75','%76','%77','%78','%79','%80','%81','%82','%83','%84',%85,'%86','%87','%88','%89','%90','%91','%92','%93','%94','%95','',98,1,'','',0);").\
+                                        '%68','%69','%70',%71,%72,%73,'%74','%75','%76','%77','%78','%79','%80','%81','%82','%83','%84',%85,'%86','%87','%88','%89','%90','%91','%92','%93','%94','%95','',97,8,'','',0);").\
                 arg("NULL").arg(0).arg("true").arg("SLOW_CURRENT").arg("0").arg("Bottom").arg("false").arg(0).arg("false").arg(0).arg("false").arg(0).arg("false").arg(0).arg("false").arg(0).arg("false").arg(0).arg(0).arg(0).arg("false").
                 arg(0).arg("false").arg(0).arg("false").arg(0).arg(strChannelID).arg("NONE").arg(strChannelName).arg("false").arg(0).arg("false").arg(0).arg("RMSValue").arg("").arg(0).arg("false").arg(0).arg("电流变送器").arg("false").arg(0).arg("false").arg(0).arg("").\
                 arg("true").arg(MAC).arg(0).arg(1000).arg(0).arg("Hamming").arg("").arg("").arg(20).arg("5000").arg("").arg(0).arg(0).arg("0").arg("60000").arg(0).arg("NONE").arg("").arg("0").arg(64).arg("").arg("").arg(timeStamp).\

ChannelList.cpp

@@ -166,7 +166,6 @@ void CChannelList::iniUi()
             ui->tableView->setColumnWidth(i, 130);
         }
     }
-
 }
 
 void CChannelList::iniConnect()
@@ -497,7 +496,6 @@ void CChannelList::putJson()
     QVector<channelBaseInfo>().swap(g_ChannelBaseInfo);
     QMap<QString,QMap<QString,QString>>().swap(g_MapChannel);
 
-
     g_channelSetting = g_SqliteDB->GetDataMultiLine("t_ChannelSetting");
     for (int i = 0; i < g_channelSetting.size(); i++)
     {

Configuration.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1052</width>
+    <width>771</width>
-    <height>659</height>
+    <height>581</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -136,7 +136,7 @@ color: rgb(27, 30, 35);</string>
            <item>
             <layout class="QVBoxLayout" name="verticalLayout_6">
              <property name="spacing">
-              <number>18</number>
+              <number>0</number>
              </property>
              <item>
               <widget class="QRadioButton" name="radioButton_11">
@@ -227,6 +227,19 @@ color: rgb(27, 30, 35);</string>
           </layout>
          </widget>
         </item>
+        <item>
+         <spacer name="verticalSpacer">
+          <property name="orientation">
+           <enum>Qt::Vertical</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>20</width>
+            <height>40</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
        </layout>
       </item>
       <item>

CopyChannelSetting.ui

@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string>复制通道</string>
   </property>
   <property name="styleSheet">
    <string notr="true">font: 10pt &quot;黑体&quot;;

CopyDatFile.h

@@ -3,8 +3,6 @@
 
 #include <QWidget>
 #include <QUrl>
-#include <QtFtp/qftp.h>
-#include <QtFtp/qurlinfo.h>
 #include <QTreeWidgetItem>
 #include <QStandardItemModel>
 #include <QFile>
@@ -52,7 +50,6 @@ private:
     Ui::CCopyDatFile *ui;
     QHash<QString, bool> isDirectory;
     void connectToFtp();
-    QFtp *ftp = nullptr;
     QStandardItemModel     *model;
     QString m_strFilePath;
     QString m_strDistPath;

DIO_Board.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>894</width>
-    <height>729</height>
+    <height>613</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -20,13 +20,13 @@ color: rgb(27, 30, 35);
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="topMargin">
-    <number>30</number>
+    <number>10</number>
    </property>
    <property name="rightMargin">
-    <number>30</number>
+    <number>20</number>
    </property>
    <property name="bottomMargin">
-    <number>30</number>
+    <number>5</number>
    </property>
    <item>
     <widget class="QWidget" name="widget" native="true">

DataWatch3500_GUI.pro

@@ -10,7 +10,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets sql printsupport
 
 TARGET = DataWatch3500_GUI
 TEMPLATE = app
-win32:CONFIG += console
+# win32:CONFIG += console
 # The following define makes your compiler emit warnings if you use
 # any feature of Qt which has been marked as deprecated (the exact warnings
 # depend on your compiler). Please consult the documentation of the

FileServerConfig.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>669</width>
+    <width>683</width>
-    <height>531</height>
+    <height>586</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -17,6 +17,9 @@
    <string notr="true">font: 10pt &quot;黑体&quot;;color: rgb(27, 30, 35);</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_17">
+   <property name="spacing">
+    <number>0</number>
+   </property>
    <property name="topMargin">
     <number>10</number>
    </property>
@@ -31,7 +34,7 @@
      <property name="minimumSize">
       <size>
        <width>0</width>
-       <height>50</height>
+       <height>0</height>
       </size>
      </property>
      <property name="maximumSize">

HistoryAlarm.ui

@@ -6,10 +6,16 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1148</width>
+    <width>945</width>
     <height>533</height>
    </rect>
   </property>
+  <property name="maximumSize">
+   <size>
+    <width>945</width>
+    <height>16777215</height>
+   </size>
+  </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
@@ -89,7 +95,7 @@ color: rgb(27, 30, 35);</string>
            <widget class="QComboBox" name="comboBox_channel">
             <property name="minimumSize">
              <size>
-              <width>200</width>
+              <width>150</width>
               <height>0</height>
              </size>
             </property>
@@ -120,7 +126,7 @@ color: rgb(27, 30, 35);</string>
          <widget class="QPushButton" name="pushButton_search">
           <property name="minimumSize">
            <size>
-            <width>96</width>
+            <width>70</width>
             <height>28</height>
            </size>
           </property>
@@ -149,7 +155,7 @@ color: rgb(27, 30, 35);</string>
          <widget class="QPushButton" name="pushButton_delete">
           <property name="minimumSize">
            <size>
-            <width>96</width>
+            <width>70</width>
             <height>28</height>
            </size>
           </property>

RealTimeAlarm.cpp

@@ -24,8 +24,8 @@ CRealTimeAlarm::CRealTimeAlarm(QWidget *parent) :
     ui->tableView->setModel(model);
     ui->tableView->setColumnWidth(0, 50);
     ui->tableView->setColumnWidth(1, 50);
-    ui->tableView->setColumnWidth(2, 370);
+    ui->tableView->setColumnWidth(2, 300);
-    ui->tableView->setColumnWidth(3, 200);
+    ui->tableView->setColumnWidth(3, 150);
     ui->tableView->setAlternatingRowColors(true);
 
     ui->tableView->horizontalHeader()->setSectionResizeMode(QHeaderView::Interactive);
@@ -555,6 +555,7 @@ void CRealTimeAlarm::Details(const QModelIndex &index)
             int y = this->geometry().center().y() - downloadProgressDialog->height() / 2;
             downloadProgressDialog->move(x, y);
         }
+        qDebug() << "strFileName" << strFileName ;
         ScpClient scp;
         connect(downloadProgressDialog, &QProgressDialog::canceled, [&scp]() {
             // 执行停止下载的操作
@@ -564,7 +565,7 @@ void CRealTimeAlarm::Details(const QModelIndex &index)
         connect(&scp, SIGNAL(progress(qint64 , qint64 )), this,SLOT(downloadProcess_Slot(qint64 , qint64 )));
         connect(&scp, SIGNAL(error(const QString &)), this,SLOT(downloadError_Slot(const QString &)));
         connect(&scp, SIGNAL(finished()), this,SLOT(downloadFinished_Slot()));
-        scp.connectToHost(IP, 22, "root", "cidw!@123456");
+        scp.connectToHost(IP, 22, "root", "@#cidw!@123456");
         scp.download(strFileName, strPath);
         qDebug() << "filename_list" << strPath;
     }

RealTimeAlarm.ui

@@ -10,6 +10,12 @@
     <height>405</height>
    </rect>
   </property>
+  <property name="maximumSize">
+   <size>
+    <width>850</width>
+    <height>16777215</height>
+   </size>
+  </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>

SlowSpeedChannelSetting.cpp

@@ -159,6 +159,11 @@ void CSlowSpeedChannelSetting::displayChannelSetting()
     if(channelSetting.samplingRate == 16384)
         ui->comboBox_sampleRate->setCurrentText("16kHz");
 
+    QString string_sectionNum = QString("%1").arg(channelSetting.sectionNum);
+    ui->lineEdit_sectionNum->setText(string_sectionNum);
+    QString string_confidenceDegree = QString("%1").arg(channelSetting.confidenceDegree);
+    ui->lineEdit_confidenceDegree->setText(string_confidenceDegree);
+
 }
 
 void CSlowSpeedChannelSetting::on_lineEdit_engineeringUnit_editingFinished()
@@ -205,7 +210,8 @@ void CSlowSpeedChannelSetting::on_pushButton_submit_clicked()
             channelSetting.speedRefChannelName = "";
         }
     }
-
+    channelSetting.confidenceDegree = ui->lineEdit_confidenceDegree->text().toInt();
+    channelSetting.sectionNum = ui->lineEdit_sectionNum->text().toInt();
     channelSetting.defaultDisplay = ui->comboBox_defaultDisplay->currentText();
     channelSetting.firstPoleNum = ui->lineEdit_poleNum->text();
 

SlowSpeedChannelSetting.ui

@@ -512,8 +512,6 @@ color: rgb(27, 30, 35);</string>
               <property name="title">
                <string>传感器设置</string>
               </property>
-              <layout class="QVBoxLayout" name="verticalLayout_8">
-               <item>
               <layout class="QVBoxLayout" name="verticalLayout_5">
                <item>
                 <layout class="QHBoxLayout" name="horizontalLayout_8">
@@ -1050,6 +1048,97 @@ color: rgb(27, 30, 35);</string>
                  </item>
                 </layout>
                </item>
+               <item>
+                <layout class="QHBoxLayout" name="horizontalLayout_35">
+                 <item>
+                  <widget class="QLabel" name="label_48">
+                   <property name="minimumSize">
+                    <size>
+                     <width>180</width>
+                     <height>0</height>
+                    </size>
+                   </property>
+                   <property name="maximumSize">
+                    <size>
+                     <width>180</width>
+                     <height>16777215</height>
+                    </size>
+                   </property>
+                   <property name="text">
+                    <string>   置信度：</string>
+                   </property>
+                   <property name="alignment">
+                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                   </property>
+                  </widget>
+                 </item>
+                 <item>
+                  <widget class="QLineEdit" name="lineEdit_confidenceDegree">
+                   <property name="minimumSize">
+                    <size>
+                     <width>0</width>
+                     <height>0</height>
+                    </size>
+                   </property>
+                   <property name="text">
+                    <string>97</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item>
+                  <widget class="QLabel" name="label_50">
+                   <property name="minimumSize">
+                    <size>
+                     <width>0</width>
+                     <height>0</height>
+                    </size>
+                   </property>
+                   <property name="text">
+                    <string>%</string>
+                   </property>
+                  </widget>
+                 </item>
+                </layout>
+               </item>
+               <item>
+                <layout class="QHBoxLayout" name="horizontalLayout_34">
+                 <item>
+                  <widget class="QLabel" name="label_49">
+                   <property name="minimumSize">
+                    <size>
+                     <width>180</width>
+                     <height>0</height>
+                    </size>
+                   </property>
+                   <property name="maximumSize">
+                    <size>
+                     <width>180</width>
+                     <height>16777215</height>
+                    </size>
+                   </property>
+                   <property name="text">
+                    <string> 分段数：</string>
+                   </property>
+                   <property name="alignment">
+                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                   </property>
+                  </widget>
+                 </item>
+                 <item>
+                  <widget class="QLineEdit" name="lineEdit_sectionNum">
+                   <property name="minimumSize">
+                    <size>
+                     <width>0</width>
+                     <height>0</height>
+                    </size>
+                   </property>
+                   <property name="text">
+                    <string>8</string>
+                   </property>
+                  </widget>
+                 </item>
+                </layout>
+               </item>
                <item>
                 <spacer name="verticalSpacer">
                  <property name="orientation">
@@ -1058,14 +1147,12 @@ color: rgb(27, 30, 35);</string>
                  <property name="sizeHint" stdset="0">
                   <size>
                    <width>461</width>
-                     <height>33</height>
+                   <height>20</height>
                   </size>
                  </property>
                 </spacer>
                </item>
               </layout>
-               </item>
-              </layout>
              </widget>
             </item>
            </layout>

SystemSelfcheck.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>831</width>
-    <height>618</height>
+    <height>538</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -31,7 +31,7 @@
      <property name="minimumSize">
       <size>
        <width>0</width>
-       <height>50</height>
+       <height>30</height>
       </size>
      </property>
      <property name="maximumSize">
@@ -131,7 +131,7 @@
                 <property name="sizeHint" stdset="0">
                  <size>
                   <width>20</width>
-                  <height>40</height>
+                  <height>30</height>
                  </size>
                 </property>
                </spacer>
@@ -270,7 +270,7 @@
                 <property name="sizeHint" stdset="0">
                  <size>
                   <width>20</width>
-                  <height>40</height>
+                  <height>30</height>
                  </size>
                 </property>
                </spacer>
@@ -303,7 +303,7 @@
                 <property name="sizeHint" stdset="0">
                  <size>
                   <width>20</width>
-                  <height>40</height>
+                  <height>30</height>
                  </size>
                 </property>
                </spacer>
@@ -424,7 +424,7 @@
                 <property name="sizeHint" stdset="0">
                  <size>
                   <width>20</width>
-                  <height>40</height>
+                  <height>30</height>
                  </size>
                 </property>
                </spacer>
@@ -458,7 +458,7 @@
      <property name="minimumSize">
       <size>
        <width>0</width>
-       <height>100</height>
+       <height>40</height>
       </size>
      </property>
      <property name="maximumSize">

WaveDisplay.ui

@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1170</width>
+    <width>875</width>
     <height>525</height>
    </rect>
   </property>
@@ -337,7 +337,7 @@
           <widget class="QPushButton" name="pushButton_1S">
            <property name="minimumSize">
             <size>
-             <width>96</width>
+             <width>70</width>
              <height>28</height>
             </size>
            </property>
@@ -369,7 +369,7 @@
           <widget class="QPushButton" name="pushButton_4S">
            <property name="minimumSize">
             <size>
-             <width>96</width>
+             <width>70</width>
              <height>28</height>
             </size>
            </property>
@@ -401,7 +401,7 @@
           <widget class="QPushButton" name="pushButton_refresh">
            <property name="minimumSize">
             <size>
-             <width>96</width>
+             <width>70</width>
              <height>28</height>
             </size>
            </property>
@@ -430,7 +430,7 @@
           <widget class="QPushButton" name="pushButton_refreshauto">
            <property name="minimumSize">
             <size>
-             <width>96</width>
+             <width>70</width>
              <height>28</height>
             </size>
            </property>

WorkingCondition.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1398</width>
+    <width>916</width>
-    <height>775</height>
+    <height>693</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -71,7 +71,7 @@ color: rgb(27, 30, 35);</string>
            <property name="minimumSize">
             <size>
              <width>0</width>
-             <height>80</height>
+             <height>60</height>
             </size>
            </property>
            <property name="maximumSize">
@@ -151,7 +151,7 @@ color: rgb(27, 30, 35);</string>
             <item>
              <layout class="QVBoxLayout" name="verticalLayout_3">
               <property name="spacing">
-               <number>10</number>
+               <number>3</number>
               </property>
               <item>
                <layout class="QHBoxLayout" name="horizontalLayout_2">
@@ -640,19 +640,6 @@ color: rgb(27, 30, 35);</string>
         </layout>
        </widget>
       </item>
-      <item>
-       <spacer name="horizontalSpacer_13">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>0</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
       <item>
        <widget class="QWidget" name="widget_3" native="true">
         <property name="minimumSize">
@@ -667,7 +654,7 @@ color: rgb(27, 30, 35);</string>
            <property name="minimumSize">
             <size>
              <width>0</width>
-             <height>50</height>
+             <height>30</height>
             </size>
            </property>
            <property name="maximumSize">

channelsetting.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>812</width>
-    <height>754</height>
+    <height>792</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -531,7 +531,7 @@ color: rgb(27, 30, 35);</string>
                    </size>
                   </property>
                   <property name="text">
-                   <string>98</string>
+                   <string>95</string>
                   </property>
                  </widget>
                 </item>
@@ -583,7 +583,7 @@ color: rgb(27, 30, 35);</string>
                    </size>
                   </property>
                   <property name="text">
-                   <string>1</string>
+                   <string>8</string>
                   </property>
                  </widget>
                 </item>
@@ -841,7 +841,7 @@ color: rgb(27, 30, 35);</string>
                        <item>
                         <widget class="QComboBox" name="comboBox_sensorICP">
                          <property name="enabled">
-                          <bool>false</bool>
+                          <bool>true</bool>
                          </property>
                          <property name="minimumSize">
                           <size>
@@ -3029,13 +3029,13 @@ color: rgb(27, 30, 35);</string>
          <widget class="QPushButton" name="pushButton_copy">
           <property name="minimumSize">
            <size>
-            <width>96</width>
+            <width>100</width>
             <height>28</height>
            </size>
           </property>
           <property name="maximumSize">
            <size>
-            <width>96</width>
+            <width>100</width>
             <height>28</height>
            </size>
           </property>

lib/libssh2/linux/pkgconfig/libssh2.pc

@@ -0,0 +1,21 @@
+###########################################################################
+# libssh2 installation details
+#
+# Copyright (C) The libssh2 project and its contributors.
+# SPDX-License-Identifier: BSD-3-Clause
+###########################################################################
+
+prefix=/opt/Tools/libssh2-1.11.1/install
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: libssh2
+URL: https://libssh2.org/
+Description: Library for SSH-based communication
+Version: 1.11.1
+Requires: 
+Requires.private: libcrypto,zlib
+Libs: -L${libdir} -lssh2 
+Libs.private:  -L/opt/Tools/openssl-3.0.18/install/lib64 -lssl -L/opt/Tools/openssl-3.0.18/install/lib64 -lcrypto -R/opt/Tools/openssl-3.0.18/install/lib64 -L/opt/Tools/zlib-1.3.1/install/lib -lz -R/opt/Tools/zlib-1.3.1/install/lib
+Cflags: -I${includedir}

lib/openssl/linux/pkgconfig/libcrypto.pc

@@ -0,0 +1,13 @@
+prefix=/opt/Tools/openssl-3.0.18/install
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib64
+includedir=${prefix}/include
+enginesdir=${libdir}/engines-3
+modulesdir=${libdir}/ossl-modules
+
+Name: OpenSSL-libcrypto
+Description: OpenSSL cryptography library
+Version: 3.0.18
+Libs: -L${libdir} -lcrypto
+Libs.private: -ldl -pthread 
+Cflags: -I${includedir}

lib/openssl/linux/pkgconfig/libssl.pc

@@ -0,0 +1,11 @@
+prefix=/opt/Tools/openssl-3.0.18/install
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib64
+includedir=${prefix}/include
+
+Name: OpenSSL-libssl
+Description: Secure Sockets Layer and cryptography libraries
+Version: 3.0.18
+Requires.private: libcrypto
+Libs: -L${libdir} -lssl
+Cflags: -I${includedir}

lib/openssl/linux/pkgconfig/openssl.pc

@@ -0,0 +1,9 @@
+prefix=/opt/Tools/openssl-3.0.18/install
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib64
+includedir=${prefix}/include
+
+Name: OpenSSL
+Description: Secure Sockets Layer and cryptography libraries and tools
+Version: 3.0.18
+Requires: libssl libcrypto

mainwindow.cpp

@@ -129,7 +129,9 @@ void MainWindow::initWindow()
     ui->widgetLeft4->setProperty("nav", "left");
     ui->widgetLeft4->setProperty("flag", "left");
 
-    this->resize(1024,768);
+
+
+    this->resize(1024,767);
 
     QFont font;
     font.setPixelSize(15);
@@ -701,8 +703,6 @@ void MainWindow::mqttReceive_slot(QString strTopic,QByteArray payload)
         }else if(TriggerObj.contains("cmd")){
             qDebug() << TriggerObj << endl;
         }
-
-
     }else if(strTopic == m_triggerAlarmSatusTopic){
         QString strReceive = QString(payload);
         customLogMessageHandler(QtDebugMsg,strReceive);
@@ -737,7 +737,6 @@ void MainWindow::mqttReceive_slot(QString strTopic,QByteArray payload)
                 }
             }
         }
-
     }
 }
 
@@ -777,10 +776,8 @@ void MainWindow::slotNetMgr(QString sAddr, const QVariant &msg)
 void MainWindow::on_pushButton_detail_clicked()
 {
     QJsonDocument jsonDoc;
-
     QNetworkRequest req;
     QString sUrl = QString("http://%1/cgi-bin/General.cgi/").arg(IP);
-
     QJsonObject allObj,cmdBody;
     allObj.insert("cmd", "87");
     req.setUrl(sUrl);