Browse Source

增加rtc模块后发布新版本:2.2.03

zhoutao 2 months ago
parent
commit
9e9a063b7a
13 changed files with 529 additions and 446 deletions
  1. 38 38
      Makefile
  2. 2 2
      Makefile.Debug
  3. 2 2
      Makefile.Release
  4. 1 1
      gui8000.pro.user
  5. 3 3
      httpreq.cpp
  6. 1 1
      includes.h
  7. 1 1
      main.cpp
  8. 25 3
      oambtsparam.cpp
  9. 2 0
      oambtsparam.h
  10. 297 259
      oamnetworkparam.ui
  11. 34 44
      sysconfig.ui
  12. 97 59
      ui_oamnetworkparam.h
  13. 26 33
      ui_sysconfig.h

+ 38 - 38
Makefile

@@ -3,16 +3,16 @@
 # Generated by qmake (3.1) (Qt 6.6.1)
 # Project:  gui8000.pro
 # Template: app
-# Command: D:\Qt\6.6.1\mingw_64\bin\qmake.exe -o Makefile gui8000.pro -spec win32-g++ "CONFIG+=debug" "CONFIG+=qml_debug"
+# Command: D:\Qt\6.6.1\mingw_64\bin\qmake.exe -o Makefile gui8000.pro -spec win32-g++ "CONFIG+=qtquickcompiler"
 #############################################################################
 
 MAKEFILE      = Makefile
 
 EQ            = =
 
-first: debug
-install: debug-install
-uninstall: debug-uninstall
+first: release
+install: release-install
+uninstall: release-uninstall
 QMAKE         = D:\Qt\6.6.1\mingw_64\bin\qmake.exe
 DEL_FILE      = del
 CHK_DIR_EXISTS= if not exist
@@ -37,24 +37,10 @@ RES_FILE      =
 SED           = $(QMAKE) -install sed
 MOVE          = move
 SUBTARGETS    =  \
-		debug \
-		release
+		release \
+		debug
 
 
-debug: FORCE
-	$(MAKE) -f $(MAKEFILE).Debug
-debug-make_first: FORCE
-	$(MAKE) -f $(MAKEFILE).Debug 
-debug-all: FORCE
-	$(MAKE) -f $(MAKEFILE).Debug all
-debug-clean: FORCE
-	$(MAKE) -f $(MAKEFILE).Debug clean
-debug-distclean: FORCE
-	$(MAKE) -f $(MAKEFILE).Debug distclean
-debug-install: FORCE
-	$(MAKE) -f $(MAKEFILE).Debug install
-debug-uninstall: FORCE
-	$(MAKE) -f $(MAKEFILE).Debug uninstall
 release: FORCE
 	$(MAKE) -f $(MAKEFILE).Release
 release-make_first: FORCE
@@ -69,6 +55,20 @@ release-install: FORCE
 	$(MAKE) -f $(MAKEFILE).Release install
 release-uninstall: FORCE
 	$(MAKE) -f $(MAKEFILE).Release uninstall
+debug: FORCE
+	$(MAKE) -f $(MAKEFILE).Debug
+debug-make_first: FORCE
+	$(MAKE) -f $(MAKEFILE).Debug 
+debug-all: FORCE
+	$(MAKE) -f $(MAKEFILE).Debug all
+debug-clean: FORCE
+	$(MAKE) -f $(MAKEFILE).Debug clean
+debug-distclean: FORCE
+	$(MAKE) -f $(MAKEFILE).Debug distclean
+debug-install: FORCE
+	$(MAKE) -f $(MAKEFILE).Debug install
+debug-uninstall: FORCE
+	$(MAKE) -f $(MAKEFILE).Debug uninstall
 
 Makefile: gui8000.pro D:/Qt/6.6.1/mingw_64/mkspecs/win32-g++/qmake.conf D:/Qt/6.6.1/mingw_64/mkspecs/features/spec_pre.prf \
 		D:/Qt/6.6.1/mingw_64/mkspecs/features/device_config.prf \
@@ -210,7 +210,7 @@ Makefile: gui8000.pro D:/Qt/6.6.1/mingw_64/mkspecs/win32-g++/qmake.conf D:/Qt/6.
 		D:/Qt/6.6.1/mingw_64/mkspecs/features/exclusive_builds_post.prf \
 		D:/Qt/6.6.1/mingw_64/mkspecs/features/default_post.prf \
 		D:/Qt/6.6.1/mingw_64/mkspecs/features/lrelease.prf \
-		D:/Qt/6.6.1/mingw_64/mkspecs/features/qml_debug.prf \
+		D:/Qt/6.6.1/mingw_64/mkspecs/features/qtquickcompiler.prf \
 		D:/Qt/6.6.1/mingw_64/mkspecs/features/precompile_header.prf \
 		D:/Qt/6.6.1/mingw_64/mkspecs/features/warn_on.prf \
 		D:/Qt/6.6.1/mingw_64/mkspecs/features/permissions.prf \
@@ -235,9 +235,9 @@ Makefile: gui8000.pro D:/Qt/6.6.1/mingw_64/mkspecs/win32-g++/qmake.conf D:/Qt/6.
 		D:/Qt/6.6.1/mingw_64/lib/Qt6Core.prl \
 		D:/Qt/6.6.1/mingw_64/lib/Qt6EntryPoint.prl \
 		D:/Qt/6.6.1/mingw_64/mkspecs/features/build_pass.prf \
-		debug/qmake_qmake_qm_files.qrc \
-		release/qmake_qmake_qm_files.qrc
-	$(QMAKE) -o Makefile gui8000.pro -spec win32-g++ "CONFIG+=debug" "CONFIG+=qml_debug"
+		release/qmake_qmake_qm_files.qrc \
+		debug/qmake_qmake_qm_files.qrc
+	$(QMAKE) -o Makefile gui8000.pro -spec win32-g++ "CONFIG+=qtquickcompiler"
 D:/Qt/6.6.1/mingw_64/mkspecs/features/spec_pre.prf:
 D:/Qt/6.6.1/mingw_64/mkspecs/features/device_config.prf:
 D:/Qt/6.6.1/mingw_64/mkspecs/common/sanitize.conf:
@@ -378,7 +378,7 @@ D:/Qt/6.6.1/mingw_64/mkspecs/features/resolve_config.prf:
 D:/Qt/6.6.1/mingw_64/mkspecs/features/exclusive_builds_post.prf:
 D:/Qt/6.6.1/mingw_64/mkspecs/features/default_post.prf:
 D:/Qt/6.6.1/mingw_64/mkspecs/features/lrelease.prf:
-D:/Qt/6.6.1/mingw_64/mkspecs/features/qml_debug.prf:
+D:/Qt/6.6.1/mingw_64/mkspecs/features/qtquickcompiler.prf:
 D:/Qt/6.6.1/mingw_64/mkspecs/features/precompile_header.prf:
 D:/Qt/6.6.1/mingw_64/mkspecs/features/warn_on.prf:
 D:/Qt/6.6.1/mingw_64/mkspecs/features/permissions.prf:
@@ -403,31 +403,31 @@ D:/Qt/6.6.1/mingw_64/lib/Qt6Network.prl:
 D:/Qt/6.6.1/mingw_64/lib/Qt6Core.prl:
 D:/Qt/6.6.1/mingw_64/lib/Qt6EntryPoint.prl:
 D:/Qt/6.6.1/mingw_64/mkspecs/features/build_pass.prf:
-debug/qmake_qmake_qm_files.qrc:
 release/qmake_qmake_qm_files.qrc:
+debug/qmake_qmake_qm_files.qrc:
 qmake: FORCE
-	@$(QMAKE) -o Makefile gui8000.pro -spec win32-g++ "CONFIG+=debug" "CONFIG+=qml_debug"
+	@$(QMAKE) -o Makefile gui8000.pro -spec win32-g++ "CONFIG+=qtquickcompiler"
 
 qmake_all: FORCE
 
-make_first: debug-make_first release-make_first  FORCE
-all: debug-all release-all  FORCE
-clean: debug-clean release-clean  FORCE
-distclean: debug-distclean release-distclean  FORCE
+make_first: release-make_first debug-make_first  FORCE
+all: release-all debug-all  FORCE
+clean: release-clean debug-clean  FORCE
+distclean: release-distclean debug-distclean  FORCE
 	-$(DEL_FILE) Makefile
 	-$(DEL_FILE) .qmake.stash
 
-debug-mocclean:
-	$(MAKE) -f $(MAKEFILE).Debug mocclean
 release-mocclean:
 	$(MAKE) -f $(MAKEFILE).Release mocclean
-mocclean: debug-mocclean release-mocclean
+debug-mocclean:
+	$(MAKE) -f $(MAKEFILE).Debug mocclean
+mocclean: release-mocclean debug-mocclean
 
-debug-mocables:
-	$(MAKE) -f $(MAKEFILE).Debug mocables
 release-mocables:
 	$(MAKE) -f $(MAKEFILE).Release mocables
-mocables: debug-mocables release-mocables
+debug-mocables:
+	$(MAKE) -f $(MAKEFILE).Debug mocables
+mocables: release-mocables debug-mocables
 
 check: first
 
@@ -436,5 +436,5 @@ FORCE:
 
 .SUFFIXES:
 
-$(MAKEFILE).Debug: Makefile
 $(MAKEFILE).Release: Makefile
+$(MAKEFILE).Debug: Makefile

File diff suppressed because it is too large
+ 2 - 2
Makefile.Debug


File diff suppressed because it is too large
+ 2 - 2
Makefile.Release


+ 1 - 1
gui8000.pro.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 12.0.1, 2025-03-07T16:15:03. -->
+<!-- Written by QtCreator 12.0.1, 2025-03-10T15:41:01. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>

+ 3 - 3
httpreq.cpp

@@ -73,11 +73,11 @@ QString HttpReq::sendPostReq(QString strApiName, QJsonObject jsonObject)
     // 检查返回结果
     if (reply->error() == QNetworkReply::NoError)
     {
-        return QString::fromUtf8(reply->readAll());
-        // return QString("上传数据成功");
+        //return QString::fromUtf8(reply->readAll());
+        return QString("上传数据成功");
     }
     else
     {
-        return QString("上传数据失败");
+        return QString("上传数据失败") +  QString::fromUtf8(reply->readAll());
     }
 }

+ 1 - 1
includes.h

@@ -47,7 +47,7 @@
 //2.00.3,2024-10-19,区分设备类型
 //2.1.01,2024-12-18,正式发布版本,修改同步模块、基站参数模块
 //2.2.02,2024-12-20,增加重置参数功能,正式发布网管软件
-//2.2.03,2025-03-06,增加rtc功能
+//2.2.03,2025-03-13,增加rtc功能
 #define MAIN_SOFT_VERSION "2.2.03"
 
 #endif // INCLUDES_H

+ 1 - 1
main.cpp

@@ -8,7 +8,7 @@
 //软件版本
 // #define MAIN_SOFT_TYPE_DEV 1//开发版
 // #define MAIN_SOFT_TYPE_PRO 2//生产版
-quint8 gMain_bySoftType = MAIN_SOFT_TYPE_DEV;
+quint8 gMain_bySoftType = MAIN_SOFT_TYPE_PRO;
 
 int main(int argc, char *argv[])
 {

+ 25 - 3
oambtsparam.cpp

@@ -24,6 +24,8 @@ OamBtsParam::OamBtsParam(QWidget *parent)
     connect(ui->pushButtonUploadParam, &QPushButton::clicked, this,&this->uploadBtsBaseParamAdd);//上传参数
     //connect(ui->pushButtonImportProjectId, &QPushButton::clicked, this,&this->getProjectId);//导入项目编号
 
+    connect(this->ui->comboBoxLocationType, &QComboBox::currentIndexChanged, this,  &this->slotLocationTypeChanged);
+
     //将消息发送到主控模块
     connect(this, &this->SignalSendQueryMsg, m_pMainDlg, &m_pMainDlg->slotOamSendQueryMsg);
     connect(this, &this->SignalSendConfigMsg, m_pMainDlg, &m_pMainDlg->slotOamSendConfigMsg);
@@ -387,7 +389,7 @@ void OamBtsParam::configParam(){
     //两站列表
     if(ui->checkBoxTwoBtsList->isChecked()){
         memset((void*)stLtv.abyData, 0, PS_MCP_A_DATA_LEN);
-        stLtv.wLen = 68;
+        stLtv.wLen = 52;
         stLtv.wTag = ORDER_BTS_TWO_BTS_LIST;
         strText = ui->lineEditTwoBtsList->text();
         strText = strText.trimmed();
@@ -498,8 +500,8 @@ void OamBtsParam::uploadBtsBaseParamAdd(){
         strText = strText.trimmed();
         baData = strText.toLocal8Bit();
         byCharLen = baData.size();
-        if(byCharLen > 64){
-            QMessageBox::information(this, "提示", "两站列表字符长度超过64位");
+        if(byCharLen > 48){
+            QMessageBox::information(this, "提示", "两站列表字符长度超过48位");
             switchBtnFlag(true);
             return;
         }
@@ -519,3 +521,23 @@ void OamBtsParam::uploadBtsBaseParamAdd(){
 quint32 OamBtsParam::GetBtsId(){
     return m_dwBtsId;
 }
+
+//定位类型切换
+void OamBtsParam::slotLocationTypeChanged(int index){
+    if(index == 1 || index == 3){//一维/融合定位
+        ui->checkBoxTwoBtsNum->setEnabled(true);
+        ui->spinBoxTwoBtsNum->setEnabled(true);
+
+        ui->checkBoxTwoBtsList->setEnabled(true);
+        ui->lineEditTwoBtsList->setEnabled(true);
+    }else if(index == 2){//二维定位
+        ui->checkBoxTwoBtsNum->setEnabled(false);
+        ui->checkBoxTwoBtsNum->setChecked(false);
+        ui->spinBoxTwoBtsNum->setEnabled(false);
+
+        ui->checkBoxTwoBtsList->setEnabled(false);
+        ui->checkBoxTwoBtsList->setChecked(false);
+        ui->lineEditTwoBtsList->setEnabled(false);
+    }
+    return;
+}

+ 2 - 0
oambtsparam.h

@@ -43,6 +43,8 @@ private:
     void queryParam();
     void configParam();
     void uploadBtsBaseParamAdd();
+
+    void slotLocationTypeChanged(int index);
 signals:
     void SignalSendQueryMsg(quint8 *pbyData, quint16 wLen);
     void SignalSendConfigMsg(quint8 *pbyData, quint16 wLen,quint16 wCmd);

+ 297 - 259
oamnetworkparam.ui

@@ -19,304 +19,342 @@
   <property name="windowTitle">
    <string>Dialog</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout_2">
-   <item row="0" column="1">
-    <spacer name="verticalSpacer">
+  <layout class="QGridLayout" name="gridLayout_3">
+   <item row="1" column="0">
+    <spacer name="horizontalSpacer">
      <property name="orientation">
-      <enum>Qt::Vertical</enum>
+      <enum>Qt::Horizontal</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
-       <width>20</width>
-       <height>40</height>
+       <width>40</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="1" column="2">
+    <spacer name="horizontalSpacer_2">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>40</width>
+       <height>20</height>
       </size>
      </property>
     </spacer>
    </item>
    <item row="1" column="1">
-    <layout class="QVBoxLayout" name="verticalLayout_2">
+    <layout class="QVBoxLayout" name="verticalLayout_3">
+     <property name="spacing">
+      <number>20</number>
+     </property>
      <item>
       <widget class="QGroupBox" name="groupBox">
        <property name="minimumSize">
         <size>
-         <width>770</width>
+         <width>590</width>
          <height>285</height>
         </size>
        </property>
        <property name="maximumSize">
         <size>
-         <width>680</width>
+         <width>16777215</width>
          <height>300</height>
         </size>
        </property>
        <property name="title">
         <string/>
        </property>
-       <widget class="QWidget" name="">
-        <property name="geometry">
-         <rect>
-          <x>12</x>
-          <y>16</y>
-          <width>750</width>
-          <height>254</height>
-         </rect>
-        </property>
-        <layout class="QVBoxLayout" name="verticalLayout">
-         <property name="spacing">
-          <number>20</number>
-         </property>
-         <item>
-          <layout class="QGridLayout" name="gridLayout">
-           <property name="horizontalSpacing">
-            <number>10</number>
-           </property>
-           <property name="verticalSpacing">
-            <number>15</number>
-           </property>
-           <item row="0" column="0">
-            <widget class="QCheckBox" name="checkBoxSwitch">
-             <property name="text">
-              <string/>
-             </property>
-            </widget>
-           </item>
-           <item row="0" column="1">
-            <widget class="QLabel" name="label_7">
-             <property name="text">
-              <string>网管使能</string>
-             </property>
-            </widget>
-           </item>
-           <item row="0" column="2">
-            <widget class="QComboBox" name="comboBoxSwitch">
-             <property name="minimumSize">
-              <size>
-               <width>500</width>
-               <height>28</height>
-              </size>
-             </property>
-            </widget>
-           </item>
-           <item row="1" column="0">
-            <widget class="QCheckBox" name="checkBoxWifiName">
-             <property name="text">
-              <string/>
-             </property>
-            </widget>
-           </item>
-           <item row="1" column="1">
-            <widget class="QLabel" name="label_3">
-             <property name="text">
-              <string>WiFi 名称</string>
-             </property>
-            </widget>
-           </item>
-           <item row="1" column="2">
-            <widget class="QLineEdit" name="lineEditWifiName">
-             <property name="minimumSize">
-              <size>
-               <width>620</width>
-               <height>28</height>
-              </size>
-             </property>
-             <property name="maximumSize">
-              <size>
-               <width>500</width>
-               <height>16777215</height>
-              </size>
-             </property>
-             <property name="maxLength">
-              <number>32</number>
-             </property>
-            </widget>
-           </item>
-           <item row="2" column="0">
-            <widget class="QCheckBox" name="checkBoxWifiPwd">
-             <property name="text">
-              <string/>
-             </property>
-            </widget>
-           </item>
-           <item row="2" column="1">
-            <widget class="QLabel" name="label_4">
-             <property name="text">
-              <string>WiFi 密码</string>
-             </property>
-            </widget>
-           </item>
-           <item row="2" column="2">
-            <widget class="QLineEdit" name="lineEditWifiPwd">
-             <property name="minimumSize">
-              <size>
-               <width>620</width>
-               <height>28</height>
-              </size>
-             </property>
-             <property name="maximumSize">
-              <size>
-               <width>500</width>
-               <height>16777215</height>
-              </size>
-             </property>
-             <property name="maxLength">
-              <number>32</number>
-             </property>
-            </widget>
-           </item>
-           <item row="3" column="0">
-            <widget class="QCheckBox" name="checkBoxServiceIp">
-             <property name="text">
-              <string/>
-             </property>
-            </widget>
-           </item>
-           <item row="3" column="1">
-            <widget class="QLabel" name="label_6">
-             <property name="text">
-              <string>网管中心IP</string>
-             </property>
-            </widget>
-           </item>
-           <item row="3" column="2">
-            <widget class="QLineEdit" name="lineEditServiceIp">
-             <property name="minimumSize">
-              <size>
-               <width>620</width>
-               <height>28</height>
-              </size>
-             </property>
-             <property name="maximumSize">
-              <size>
-               <width>500</width>
-               <height>16777215</height>
-              </size>
-             </property>
-             <property name="maxLength">
-              <number>32</number>
-             </property>
-            </widget>
-           </item>
-           <item row="4" column="0">
-            <widget class="QCheckBox" name="checkBoxServicePort">
-             <property name="text">
-              <string/>
-             </property>
-            </widget>
-           </item>
-           <item row="4" column="1">
-            <widget class="QLabel" name="label_5">
-             <property name="text">
-              <string>网管中心端口</string>
-             </property>
-            </widget>
-           </item>
-           <item row="4" column="2">
-            <widget class="QSpinBox" name="spinBoxServicePort">
-             <property name="minimumSize">
-              <size>
-               <width>620</width>
-               <height>28</height>
-              </size>
-             </property>
-             <property name="maximumSize">
-              <size>
-               <width>500</width>
-               <height>16777215</height>
-              </size>
-             </property>
-             <property name="maximum">
-              <number>65535</number>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </item>
-         <item>
-          <layout class="QHBoxLayout" name="horizontalLayout">
-           <item>
-            <widget class="QPushButton" name="pushButtonAllSel">
-             <property name="text">
-              <string>全选</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QPushButton" name="pushButtonAllNoSel">
-             <property name="text">
-              <string>全不选</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QPushButton" name="pushButtonClear">
-             <property name="text">
-              <string>清空</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QPushButton" name="pushButtonQuery">
-             <property name="text">
-              <string>查询</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QPushButton" name="pushButtonConfig">
-             <property name="text">
-              <string>设置</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QPushButton" name="pushButtonUpload">
-             <property name="text">
-              <string>上传数据</string>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </item>
-        </layout>
-       </widget>
+       <layout class="QGridLayout" name="gridLayout_2">
+        <item row="0" column="0">
+         <layout class="QVBoxLayout" name="verticalLayout">
+          <property name="spacing">
+           <number>20</number>
+          </property>
+          <item>
+           <layout class="QGridLayout" name="gridLayout">
+            <property name="horizontalSpacing">
+             <number>10</number>
+            </property>
+            <property name="verticalSpacing">
+             <number>15</number>
+            </property>
+            <item row="0" column="0">
+             <widget class="QCheckBox" name="checkBoxSwitch">
+              <property name="text">
+               <string/>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="1">
+             <widget class="QLabel" name="label_7">
+              <property name="text">
+               <string>网管使能</string>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="2">
+             <widget class="QComboBox" name="comboBoxSwitch">
+              <property name="minimumSize">
+               <size>
+                <width>500</width>
+                <height>26</height>
+               </size>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="0">
+             <widget class="QCheckBox" name="checkBoxWifiName">
+              <property name="text">
+               <string/>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="1">
+             <widget class="QLabel" name="label_3">
+              <property name="text">
+               <string>WiFi 名称</string>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="2">
+             <widget class="QLineEdit" name="lineEditWifiName">
+              <property name="minimumSize">
+               <size>
+                <width>500</width>
+                <height>26</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>16777215</width>
+                <height>16777215</height>
+               </size>
+              </property>
+              <property name="maxLength">
+               <number>32</number>
+              </property>
+             </widget>
+            </item>
+            <item row="2" column="0">
+             <widget class="QCheckBox" name="checkBoxWifiPwd">
+              <property name="text">
+               <string/>
+              </property>
+             </widget>
+            </item>
+            <item row="2" column="1">
+             <widget class="QLabel" name="label_4">
+              <property name="text">
+               <string>WiFi 密码</string>
+              </property>
+             </widget>
+            </item>
+            <item row="2" column="2">
+             <widget class="QLineEdit" name="lineEditWifiPwd">
+              <property name="minimumSize">
+               <size>
+                <width>500</width>
+                <height>26</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>16777215</width>
+                <height>16777215</height>
+               </size>
+              </property>
+              <property name="maxLength">
+               <number>32</number>
+              </property>
+             </widget>
+            </item>
+            <item row="3" column="0">
+             <widget class="QCheckBox" name="checkBoxServiceIp">
+              <property name="text">
+               <string/>
+              </property>
+             </widget>
+            </item>
+            <item row="3" column="1">
+             <widget class="QLabel" name="label_6">
+              <property name="text">
+               <string>socket地址</string>
+              </property>
+             </widget>
+            </item>
+            <item row="3" column="2">
+             <widget class="QLineEdit" name="lineEditServiceIp">
+              <property name="minimumSize">
+               <size>
+                <width>500</width>
+                <height>26</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>16777215</width>
+                <height>16777215</height>
+               </size>
+              </property>
+              <property name="maxLength">
+               <number>32</number>
+              </property>
+              <property name="placeholderText">
+               <string>www.xxx.cn或者xxx.xxx.xxx.xxx</string>
+              </property>
+             </widget>
+            </item>
+            <item row="4" column="0">
+             <widget class="QCheckBox" name="checkBoxServicePort">
+              <property name="text">
+               <string/>
+              </property>
+             </widget>
+            </item>
+            <item row="4" column="1">
+             <widget class="QLabel" name="label_5">
+              <property name="text">
+               <string>socket端口</string>
+              </property>
+             </widget>
+            </item>
+            <item row="4" column="2">
+             <widget class="QSpinBox" name="spinBoxServicePort">
+              <property name="minimumSize">
+               <size>
+                <width>500</width>
+                <height>26</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>500</width>
+                <height>16777215</height>
+               </size>
+              </property>
+              <property name="maximum">
+               <number>65535</number>
+              </property>
+              <property name="value">
+               <number>8972</number>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item>
+           <layout class="QHBoxLayout" name="horizontalLayout">
+            <item>
+             <widget class="QPushButton" name="pushButtonAllSel">
+              <property name="text">
+               <string>全选</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QPushButton" name="pushButtonAllNoSel">
+              <property name="text">
+               <string>全不选</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QPushButton" name="pushButtonClear">
+              <property name="text">
+               <string>清空</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QPushButton" name="pushButtonQuery">
+              <property name="text">
+               <string>查询</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QPushButton" name="pushButtonConfig">
+              <property name="text">
+               <string>设置</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QPushButton" name="pushButtonUpload">
+              <property name="text">
+               <string>上传数据</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </item>
+       </layout>
       </widget>
      </item>
      <item>
-      <widget class="QLabel" name="label_22">
-       <property name="text">
-        <string>注意:“上传数据”是将数据上传至管理中心</string>
+      <layout class="QVBoxLayout" name="verticalLayout_2">
+       <property name="spacing">
+        <number>15</number>
        </property>
-      </widget>
+       <item>
+        <widget class="QLabel" name="label_22">
+         <property name="text">
+          <string>注意:</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="label">
+         <property name="text">
+          <string>1、网管使能若选择打开,则可远程管理设备参数,包括软件升级</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="label_2">
+         <property name="text">
+          <string>2、socket地址,即socket服务器访问地址,可以是域名也可以是ip地址</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="label_8">
+         <property name="text">
+          <string>3、socket端口,即socket服务器监听端口</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="label_9">
+         <property name="text">
+          <string>4、上传数据,即将数据上传至管理中心</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
      </item>
     </layout>
    </item>
-   <item row="1" column="2">
-    <spacer name="horizontalSpacer">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>40</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="1" column="0">
-    <spacer name="horizontalSpacer_2">
+   <item row="2" column="1">
+    <spacer name="verticalSpacer">
      <property name="orientation">
-      <enum>Qt::Horizontal</enum>
+      <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
-       <width>40</width>
-       <height>20</height>
+       <width>20</width>
+       <height>40</height>
       </size>
      </property>
     </spacer>
    </item>
-   <item row="2" column="1">
+   <item row="0" column="1">
     <spacer name="verticalSpacer_2">
      <property name="orientation">
       <enum>Qt::Vertical</enum>

+ 34 - 44
sysconfig.ui

@@ -52,8 +52,8 @@
          <property name="verticalSpacing">
           <number>15</number>
          </property>
-         <item row="0" column="0">
-          <widget class="QCheckBox" name="checkBoxHostUrl">
+         <item row="1" column="0">
+          <widget class="QCheckBox" name="checkBoxHostPort">
            <property name="minimumSize">
             <size>
              <width>20</width>
@@ -65,58 +65,64 @@
            </property>
           </widget>
          </item>
-         <item row="0" column="1">
-          <widget class="QLabel" name="label_3">
+         <item row="0" column="0">
+          <widget class="QCheckBox" name="checkBoxHostUrl">
            <property name="minimumSize">
             <size>
-             <width>60</width>
+             <width>20</width>
              <height>0</height>
             </size>
            </property>
            <property name="text">
-            <string>管理中心URL</string>
+            <string/>
            </property>
           </widget>
          </item>
-         <item row="0" column="2">
-          <widget class="QLineEdit" name="lineEditHostUrl">
+         <item row="1" column="2">
+          <widget class="QSpinBox" name="spinBoxHostPort">
            <property name="minimumSize">
             <size>
              <width>500</width>
              <height>28</height>
             </size>
            </property>
-           <property name="maxLength">
-            <number>32</number>
+           <property name="minimum">
+            <number>80</number>
            </property>
-           <property name="placeholderText">
-            <string>http://www.xxx.com</string>
+           <property name="maximum">
+            <number>65535</number>
+           </property>
+           <property name="value">
+            <number>80</number>
            </property>
           </widget>
          </item>
-         <item row="0" column="3">
-          <widget class="QLabel" name="label_4">
+         <item row="0" column="2">
+          <widget class="QLineEdit" name="lineEditHostUrl">
            <property name="minimumSize">
             <size>
-             <width>78</width>
-             <height>0</height>
+             <width>500</width>
+             <height>28</height>
             </size>
            </property>
-           <property name="text">
-            <string>管理中心域名</string>
+           <property name="maxLength">
+            <number>32</number>
+           </property>
+           <property name="placeholderText">
+            <string>http://www.xxx.com或者https://www.xxx.com</string>
            </property>
           </widget>
          </item>
-         <item row="1" column="0">
-          <widget class="QCheckBox" name="checkBoxHostPort">
+         <item row="0" column="1">
+          <widget class="QLabel" name="label_3">
            <property name="minimumSize">
             <size>
-             <width>20</width>
+             <width>60</width>
              <height>0</height>
             </size>
            </property>
            <property name="text">
-            <string/>
+            <string>管理中心URL</string>
            </property>
           </widget>
          </item>
@@ -127,25 +133,6 @@
            </property>
           </widget>
          </item>
-         <item row="1" column="2">
-          <widget class="QSpinBox" name="spinBoxHostPort">
-           <property name="minimumSize">
-            <size>
-             <width>500</width>
-             <height>28</height>
-            </size>
-           </property>
-           <property name="minimum">
-            <number>80</number>
-           </property>
-           <property name="maximum">
-            <number>65535</number>
-           </property>
-           <property name="value">
-            <number>80</number>
-           </property>
-          </widget>
-         </item>
         </layout>
        </item>
        <item>
@@ -206,6 +193,9 @@
    </item>
    <item row="2" column="1">
     <layout class="QVBoxLayout" name="verticalLayout_2">
+     <property name="spacing">
+      <number>15</number>
+     </property>
      <item>
       <widget class="QLabel" name="label_8">
        <property name="text">
@@ -216,21 +206,21 @@
      <item>
       <widget class="QLabel" name="label_10">
        <property name="text">
-        <string>1、在同一个项目,系统参数仅需设置一次即可,设置后参数会被保存至本地电脑</string>
+        <string>1、在同一个项目,系统参数仅需设置一次即可,设置后参数会被保存至本地电脑</string>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QLabel" name="label_6">
        <property name="text">
-        <string>2、管理中心URL:即http服务器的地址,可以是域名,也可以是ip</string>
+        <string>2、管理中心URL:即http服务器访问地址,如何配置请咨询http服务器配置管理员</string>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QLabel" name="label">
        <property name="text">
-        <string>3、管理中心端口:即http服务器监听端口,服务器需提前配置</string>
+        <string>3、管理中心端口:即http服务器监听端口,如何配置请咨询http服务器配置管理员</string>
        </property>
       </widget>
      </item>

+ 97 - 59
ui_oamnetworkparam.h

@@ -23,18 +23,18 @@
 #include <QtWidgets/QSpacerItem>
 #include <QtWidgets/QSpinBox>
 #include <QtWidgets/QVBoxLayout>
-#include <QtWidgets/QWidget>
 
 QT_BEGIN_NAMESPACE
 
 class Ui_OamNetworkParam
 {
 public:
-    QGridLayout *gridLayout_2;
-    QSpacerItem *verticalSpacer;
-    QVBoxLayout *verticalLayout_2;
+    QGridLayout *gridLayout_3;
+    QSpacerItem *horizontalSpacer;
+    QSpacerItem *horizontalSpacer_2;
+    QVBoxLayout *verticalLayout_3;
     QGroupBox *groupBox;
-    QWidget *widget;
+    QGridLayout *gridLayout_2;
     QVBoxLayout *verticalLayout;
     QGridLayout *gridLayout;
     QCheckBox *checkBoxSwitch;
@@ -59,9 +59,13 @@ public:
     QPushButton *pushButtonQuery;
     QPushButton *pushButtonConfig;
     QPushButton *pushButtonUpload;
+    QVBoxLayout *verticalLayout_2;
     QLabel *label_22;
-    QSpacerItem *horizontalSpacer;
-    QSpacerItem *horizontalSpacer_2;
+    QLabel *label;
+    QLabel *label_2;
+    QLabel *label_8;
+    QLabel *label_9;
+    QSpacerItem *verticalSpacer;
     QSpacerItem *verticalSpacer_2;
 
     void setupUi(QDialog *OamNetworkParam)
@@ -70,114 +74,118 @@ public:
             OamNetworkParam->setObjectName("OamNetworkParam");
         OamNetworkParam->resize(1024, 700);
         OamNetworkParam->setMinimumSize(QSize(800, 0));
-        gridLayout_2 = new QGridLayout(OamNetworkParam);
-        gridLayout_2->setObjectName("gridLayout_2");
-        verticalSpacer = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
+        gridLayout_3 = new QGridLayout(OamNetworkParam);
+        gridLayout_3->setObjectName("gridLayout_3");
+        horizontalSpacer = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
 
-        gridLayout_2->addItem(verticalSpacer, 0, 1, 1, 1);
+        gridLayout_3->addItem(horizontalSpacer, 1, 0, 1, 1);
 
-        verticalLayout_2 = new QVBoxLayout();
-        verticalLayout_2->setObjectName("verticalLayout_2");
+        horizontalSpacer_2 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        gridLayout_3->addItem(horizontalSpacer_2, 1, 2, 1, 1);
+
+        verticalLayout_3 = new QVBoxLayout();
+        verticalLayout_3->setSpacing(20);
+        verticalLayout_3->setObjectName("verticalLayout_3");
         groupBox = new QGroupBox(OamNetworkParam);
         groupBox->setObjectName("groupBox");
-        groupBox->setMinimumSize(QSize(770, 285));
-        groupBox->setMaximumSize(QSize(680, 300));
-        widget = new QWidget(groupBox);
-        widget->setObjectName("widget");
-        widget->setGeometry(QRect(12, 16, 750, 254));
-        verticalLayout = new QVBoxLayout(widget);
+        groupBox->setMinimumSize(QSize(590, 285));
+        groupBox->setMaximumSize(QSize(16777215, 300));
+        gridLayout_2 = new QGridLayout(groupBox);
+        gridLayout_2->setObjectName("gridLayout_2");
+        verticalLayout = new QVBoxLayout();
         verticalLayout->setSpacing(20);
         verticalLayout->setObjectName("verticalLayout");
-        verticalLayout->setContentsMargins(0, 0, 0, 0);
         gridLayout = new QGridLayout();
         gridLayout->setObjectName("gridLayout");
         gridLayout->setHorizontalSpacing(10);
         gridLayout->setVerticalSpacing(15);
-        checkBoxSwitch = new QCheckBox(widget);
+        checkBoxSwitch = new QCheckBox(groupBox);
         checkBoxSwitch->setObjectName("checkBoxSwitch");
 
         gridLayout->addWidget(checkBoxSwitch, 0, 0, 1, 1);
 
-        label_7 = new QLabel(widget);
+        label_7 = new QLabel(groupBox);
         label_7->setObjectName("label_7");
 
         gridLayout->addWidget(label_7, 0, 1, 1, 1);
 
-        comboBoxSwitch = new QComboBox(widget);
+        comboBoxSwitch = new QComboBox(groupBox);
         comboBoxSwitch->setObjectName("comboBoxSwitch");
-        comboBoxSwitch->setMinimumSize(QSize(500, 28));
+        comboBoxSwitch->setMinimumSize(QSize(500, 26));
 
         gridLayout->addWidget(comboBoxSwitch, 0, 2, 1, 1);
 
-        checkBoxWifiName = new QCheckBox(widget);
+        checkBoxWifiName = new QCheckBox(groupBox);
         checkBoxWifiName->setObjectName("checkBoxWifiName");
 
         gridLayout->addWidget(checkBoxWifiName, 1, 0, 1, 1);
 
-        label_3 = new QLabel(widget);
+        label_3 = new QLabel(groupBox);
         label_3->setObjectName("label_3");
 
         gridLayout->addWidget(label_3, 1, 1, 1, 1);
 
-        lineEditWifiName = new QLineEdit(widget);
+        lineEditWifiName = new QLineEdit(groupBox);
         lineEditWifiName->setObjectName("lineEditWifiName");
-        lineEditWifiName->setMinimumSize(QSize(620, 28));
-        lineEditWifiName->setMaximumSize(QSize(500, 16777215));
+        lineEditWifiName->setMinimumSize(QSize(500, 26));
+        lineEditWifiName->setMaximumSize(QSize(16777215, 16777215));
         lineEditWifiName->setMaxLength(32);
 
         gridLayout->addWidget(lineEditWifiName, 1, 2, 1, 1);
 
-        checkBoxWifiPwd = new QCheckBox(widget);
+        checkBoxWifiPwd = new QCheckBox(groupBox);
         checkBoxWifiPwd->setObjectName("checkBoxWifiPwd");
 
         gridLayout->addWidget(checkBoxWifiPwd, 2, 0, 1, 1);
 
-        label_4 = new QLabel(widget);
+        label_4 = new QLabel(groupBox);
         label_4->setObjectName("label_4");
 
         gridLayout->addWidget(label_4, 2, 1, 1, 1);
 
-        lineEditWifiPwd = new QLineEdit(widget);
+        lineEditWifiPwd = new QLineEdit(groupBox);
         lineEditWifiPwd->setObjectName("lineEditWifiPwd");
-        lineEditWifiPwd->setMinimumSize(QSize(620, 28));
-        lineEditWifiPwd->setMaximumSize(QSize(500, 16777215));
+        lineEditWifiPwd->setMinimumSize(QSize(500, 26));
+        lineEditWifiPwd->setMaximumSize(QSize(16777215, 16777215));
         lineEditWifiPwd->setMaxLength(32);
 
         gridLayout->addWidget(lineEditWifiPwd, 2, 2, 1, 1);
 
-        checkBoxServiceIp = new QCheckBox(widget);
+        checkBoxServiceIp = new QCheckBox(groupBox);
         checkBoxServiceIp->setObjectName("checkBoxServiceIp");
 
         gridLayout->addWidget(checkBoxServiceIp, 3, 0, 1, 1);
 
-        label_6 = new QLabel(widget);
+        label_6 = new QLabel(groupBox);
         label_6->setObjectName("label_6");
 
         gridLayout->addWidget(label_6, 3, 1, 1, 1);
 
-        lineEditServiceIp = new QLineEdit(widget);
+        lineEditServiceIp = new QLineEdit(groupBox);
         lineEditServiceIp->setObjectName("lineEditServiceIp");
-        lineEditServiceIp->setMinimumSize(QSize(620, 28));
-        lineEditServiceIp->setMaximumSize(QSize(500, 16777215));
+        lineEditServiceIp->setMinimumSize(QSize(500, 26));
+        lineEditServiceIp->setMaximumSize(QSize(16777215, 16777215));
         lineEditServiceIp->setMaxLength(32);
 
         gridLayout->addWidget(lineEditServiceIp, 3, 2, 1, 1);
 
-        checkBoxServicePort = new QCheckBox(widget);
+        checkBoxServicePort = new QCheckBox(groupBox);
         checkBoxServicePort->setObjectName("checkBoxServicePort");
 
         gridLayout->addWidget(checkBoxServicePort, 4, 0, 1, 1);
 
-        label_5 = new QLabel(widget);
+        label_5 = new QLabel(groupBox);
         label_5->setObjectName("label_5");
 
         gridLayout->addWidget(label_5, 4, 1, 1, 1);
 
-        spinBoxServicePort = new QSpinBox(widget);
+        spinBoxServicePort = new QSpinBox(groupBox);
         spinBoxServicePort->setObjectName("spinBoxServicePort");
-        spinBoxServicePort->setMinimumSize(QSize(620, 28));
+        spinBoxServicePort->setMinimumSize(QSize(500, 26));
         spinBoxServicePort->setMaximumSize(QSize(500, 16777215));
         spinBoxServicePort->setMaximum(65535);
+        spinBoxServicePort->setValue(8972);
 
         gridLayout->addWidget(spinBoxServicePort, 4, 2, 1, 1);
 
@@ -186,32 +194,32 @@ public:
 
         horizontalLayout = new QHBoxLayout();
         horizontalLayout->setObjectName("horizontalLayout");
-        pushButtonAllSel = new QPushButton(widget);
+        pushButtonAllSel = new QPushButton(groupBox);
         pushButtonAllSel->setObjectName("pushButtonAllSel");
 
         horizontalLayout->addWidget(pushButtonAllSel);
 
-        pushButtonAllNoSel = new QPushButton(widget);
+        pushButtonAllNoSel = new QPushButton(groupBox);
         pushButtonAllNoSel->setObjectName("pushButtonAllNoSel");
 
         horizontalLayout->addWidget(pushButtonAllNoSel);
 
-        pushButtonClear = new QPushButton(widget);
+        pushButtonClear = new QPushButton(groupBox);
         pushButtonClear->setObjectName("pushButtonClear");
 
         horizontalLayout->addWidget(pushButtonClear);
 
-        pushButtonQuery = new QPushButton(widget);
+        pushButtonQuery = new QPushButton(groupBox);
         pushButtonQuery->setObjectName("pushButtonQuery");
 
         horizontalLayout->addWidget(pushButtonQuery);
 
-        pushButtonConfig = new QPushButton(widget);
+        pushButtonConfig = new QPushButton(groupBox);
         pushButtonConfig->setObjectName("pushButtonConfig");
 
         horizontalLayout->addWidget(pushButtonConfig);
 
-        pushButtonUpload = new QPushButton(widget);
+        pushButtonUpload = new QPushButton(groupBox);
         pushButtonUpload->setObjectName("pushButtonUpload");
 
         horizontalLayout->addWidget(pushButtonUpload);
@@ -220,27 +228,52 @@ public:
         verticalLayout->addLayout(horizontalLayout);
 
 
-        verticalLayout_2->addWidget(groupBox);
+        gridLayout_2->addLayout(verticalLayout, 0, 0, 1, 1);
+
 
+        verticalLayout_3->addWidget(groupBox);
+
+        verticalLayout_2 = new QVBoxLayout();
+        verticalLayout_2->setSpacing(15);
+        verticalLayout_2->setObjectName("verticalLayout_2");
         label_22 = new QLabel(OamNetworkParam);
         label_22->setObjectName("label_22");
 
         verticalLayout_2->addWidget(label_22);
 
+        label = new QLabel(OamNetworkParam);
+        label->setObjectName("label");
 
-        gridLayout_2->addLayout(verticalLayout_2, 1, 1, 1, 1);
+        verticalLayout_2->addWidget(label);
 
-        horizontalSpacer = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+        label_2 = new QLabel(OamNetworkParam);
+        label_2->setObjectName("label_2");
 
-        gridLayout_2->addItem(horizontalSpacer, 1, 2, 1, 1);
+        verticalLayout_2->addWidget(label_2);
 
-        horizontalSpacer_2 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+        label_8 = new QLabel(OamNetworkParam);
+        label_8->setObjectName("label_8");
+
+        verticalLayout_2->addWidget(label_8);
+
+        label_9 = new QLabel(OamNetworkParam);
+        label_9->setObjectName("label_9");
+
+        verticalLayout_2->addWidget(label_9);
+
+
+        verticalLayout_3->addLayout(verticalLayout_2);
+
+
+        gridLayout_3->addLayout(verticalLayout_3, 1, 1, 1, 1);
+
+        verticalSpacer = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
 
-        gridLayout_2->addItem(horizontalSpacer_2, 1, 0, 1, 1);
+        gridLayout_3->addItem(verticalSpacer, 2, 1, 1, 1);
 
         verticalSpacer_2 = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
 
-        gridLayout_2->addItem(verticalSpacer_2, 2, 1, 1, 1);
+        gridLayout_3->addItem(verticalSpacer_2, 0, 1, 1, 1);
 
 
         retranslateUi(OamNetworkParam);
@@ -259,16 +292,21 @@ public:
         checkBoxWifiPwd->setText(QString());
         label_4->setText(QCoreApplication::translate("OamNetworkParam", "WiFi \345\257\206\347\240\201", nullptr));
         checkBoxServiceIp->setText(QString());
-        label_6->setText(QCoreApplication::translate("OamNetworkParam", "\347\275\221\347\256\241\344\270\255\345\277\203IP", nullptr));
+        label_6->setText(QCoreApplication::translate("OamNetworkParam", "socket\345\234\260\345\235\200", nullptr));
+        lineEditServiceIp->setPlaceholderText(QCoreApplication::translate("OamNetworkParam", "www.xxx.cn\346\210\226\350\200\205xxx.xxx.xxx.xxx", nullptr));
         checkBoxServicePort->setText(QString());
-        label_5->setText(QCoreApplication::translate("OamNetworkParam", "\347\275\221\347\256\241\344\270\255\345\277\203\347\253\257\345\217\243", nullptr));
+        label_5->setText(QCoreApplication::translate("OamNetworkParam", "socket\347\253\257\345\217\243", nullptr));
         pushButtonAllSel->setText(QCoreApplication::translate("OamNetworkParam", "\345\205\250\351\200\211", nullptr));
         pushButtonAllNoSel->setText(QCoreApplication::translate("OamNetworkParam", "\345\205\250\344\270\215\351\200\211", nullptr));
         pushButtonClear->setText(QCoreApplication::translate("OamNetworkParam", "\346\270\205\347\251\272", nullptr));
         pushButtonQuery->setText(QCoreApplication::translate("OamNetworkParam", "\346\237\245\350\257\242", nullptr));
         pushButtonConfig->setText(QCoreApplication::translate("OamNetworkParam", "\350\256\276\347\275\256", nullptr));
         pushButtonUpload->setText(QCoreApplication::translate("OamNetworkParam", "\344\270\212\344\274\240\346\225\260\346\215\256", nullptr));
-        label_22->setText(QCoreApplication::translate("OamNetworkParam", "\346\263\250\346\204\217\357\274\232\342\200\234\344\270\212\344\274\240\346\225\260\346\215\256\342\200\235\346\230\257\345\260\206\346\225\260\346\215\256\344\270\212\344\274\240\350\207\263\347\256\241\347\220\206\344\270\255\345\277\203", nullptr));
+        label_22->setText(QCoreApplication::translate("OamNetworkParam", "\346\263\250\346\204\217\357\274\232", nullptr));
+        label->setText(QCoreApplication::translate("OamNetworkParam", "1\343\200\201\347\275\221\347\256\241\344\275\277\350\203\275\350\213\245\351\200\211\346\213\251\346\211\223\345\274\200\357\274\214\345\210\231\345\217\257\350\277\234\347\250\213\347\256\241\347\220\206\350\256\276\345\244\207\345\217\202\346\225\260\357\274\214\345\214\205\346\213\254\350\275\257\344\273\266\345\215\207\347\272\247", nullptr));
+        label_2->setText(QCoreApplication::translate("OamNetworkParam", "2\343\200\201socket\345\234\260\345\235\200\357\274\214\345\215\263socket\346\234\215\345\212\241\345\231\250\350\256\277\351\227\256\345\234\260\345\235\200\357\274\214\345\217\257\344\273\245\346\230\257\345\237\237\345\220\215\344\271\237\345\217\257\344\273\245\346\230\257ip\345\234\260\345\235\200", nullptr));
+        label_8->setText(QCoreApplication::translate("OamNetworkParam", "3\343\200\201socket\347\253\257\345\217\243\357\274\214\345\215\263socket\346\234\215\345\212\241\345\231\250\347\233\221\345\220\254\347\253\257\345\217\243", nullptr));
+        label_9->setText(QCoreApplication::translate("OamNetworkParam", "4\343\200\201\344\270\212\344\274\240\346\225\260\346\215\256\357\274\214\345\215\263\345\260\206\346\225\260\346\215\256\344\270\212\344\274\240\350\207\263\347\256\241\347\220\206\344\270\255\345\277\203", nullptr));
     } // retranslateUi
 
 };

+ 26 - 33
ui_sysconfig.h

@@ -33,13 +33,12 @@ public:
     QWidget *layoutWidget;
     QVBoxLayout *verticalLayout;
     QGridLayout *gridLayout;
+    QCheckBox *checkBoxHostPort;
     QCheckBox *checkBoxHostUrl;
-    QLabel *label_3;
+    QSpinBox *spinBoxHostPort;
     QLineEdit *lineEditHostUrl;
-    QLabel *label_4;
-    QCheckBox *checkBoxHostPort;
+    QLabel *label_3;
     QLabel *label_5;
-    QSpinBox *spinBoxHostPort;
     QHBoxLayout *horizontalLayout;
     QPushButton *pushButtonAllSel;
     QPushButton *pushButtonAllNoSel;
@@ -78,17 +77,26 @@ public:
         gridLayout->setObjectName("gridLayout");
         gridLayout->setHorizontalSpacing(10);
         gridLayout->setVerticalSpacing(15);
+        checkBoxHostPort = new QCheckBox(layoutWidget);
+        checkBoxHostPort->setObjectName("checkBoxHostPort");
+        checkBoxHostPort->setMinimumSize(QSize(20, 0));
+
+        gridLayout->addWidget(checkBoxHostPort, 1, 0, 1, 1);
+
         checkBoxHostUrl = new QCheckBox(layoutWidget);
         checkBoxHostUrl->setObjectName("checkBoxHostUrl");
         checkBoxHostUrl->setMinimumSize(QSize(20, 0));
 
         gridLayout->addWidget(checkBoxHostUrl, 0, 0, 1, 1);
 
-        label_3 = new QLabel(layoutWidget);
-        label_3->setObjectName("label_3");
-        label_3->setMinimumSize(QSize(60, 0));
+        spinBoxHostPort = new QSpinBox(layoutWidget);
+        spinBoxHostPort->setObjectName("spinBoxHostPort");
+        spinBoxHostPort->setMinimumSize(QSize(500, 28));
+        spinBoxHostPort->setMinimum(80);
+        spinBoxHostPort->setMaximum(65535);
+        spinBoxHostPort->setValue(80);
 
-        gridLayout->addWidget(label_3, 0, 1, 1, 1);
+        gridLayout->addWidget(spinBoxHostPort, 1, 2, 1, 1);
 
         lineEditHostUrl = new QLineEdit(layoutWidget);
         lineEditHostUrl->setObjectName("lineEditHostUrl");
@@ -97,32 +105,17 @@ public:
 
         gridLayout->addWidget(lineEditHostUrl, 0, 2, 1, 1);
 
-        label_4 = new QLabel(layoutWidget);
-        label_4->setObjectName("label_4");
-        label_4->setMinimumSize(QSize(78, 0));
-
-        gridLayout->addWidget(label_4, 0, 3, 1, 1);
-
-        checkBoxHostPort = new QCheckBox(layoutWidget);
-        checkBoxHostPort->setObjectName("checkBoxHostPort");
-        checkBoxHostPort->setMinimumSize(QSize(20, 0));
+        label_3 = new QLabel(layoutWidget);
+        label_3->setObjectName("label_3");
+        label_3->setMinimumSize(QSize(60, 0));
 
-        gridLayout->addWidget(checkBoxHostPort, 1, 0, 1, 1);
+        gridLayout->addWidget(label_3, 0, 1, 1, 1);
 
         label_5 = new QLabel(layoutWidget);
         label_5->setObjectName("label_5");
 
         gridLayout->addWidget(label_5, 1, 1, 1, 1);
 
-        spinBoxHostPort = new QSpinBox(layoutWidget);
-        spinBoxHostPort->setObjectName("spinBoxHostPort");
-        spinBoxHostPort->setMinimumSize(QSize(500, 28));
-        spinBoxHostPort->setMinimum(80);
-        spinBoxHostPort->setMaximum(65535);
-        spinBoxHostPort->setValue(80);
-
-        gridLayout->addWidget(spinBoxHostPort, 1, 2, 1, 1);
-
 
         verticalLayout->addLayout(gridLayout);
 
@@ -164,6 +157,7 @@ public:
         gridLayout_2->addItem(horizontalSpacer, 1, 0, 1, 1);
 
         verticalLayout_2 = new QVBoxLayout();
+        verticalLayout_2->setSpacing(15);
         verticalLayout_2->setObjectName("verticalLayout_2");
         label_8 = new QLabel(sysconfig);
         label_8->setObjectName("label_8");
@@ -210,11 +204,10 @@ public:
     {
         sysconfig->setWindowTitle(QCoreApplication::translate("sysconfig", "Form", nullptr));
         groupBox->setTitle(QString());
+        checkBoxHostPort->setText(QString());
         checkBoxHostUrl->setText(QString());
+        lineEditHostUrl->setPlaceholderText(QCoreApplication::translate("sysconfig", "http://www.xxx.com\346\210\226\350\200\205https://www.xxx.com", nullptr));
         label_3->setText(QCoreApplication::translate("sysconfig", "\347\256\241\347\220\206\344\270\255\345\277\203URL", nullptr));
-        lineEditHostUrl->setPlaceholderText(QCoreApplication::translate("sysconfig", "http://www.xxx.com", nullptr));
-        label_4->setText(QCoreApplication::translate("sysconfig", "\347\256\241\347\220\206\344\270\255\345\277\203\345\237\237\345\220\215", nullptr));
-        checkBoxHostPort->setText(QString());
         label_5->setText(QCoreApplication::translate("sysconfig", "\347\256\241\347\220\206\344\270\255\345\277\203\347\253\257\345\217\243", nullptr));
         pushButtonAllSel->setText(QCoreApplication::translate("sysconfig", "\345\205\250\351\200\211", nullptr));
         pushButtonAllNoSel->setText(QCoreApplication::translate("sysconfig", "\345\205\250\344\270\215\351\200\211", nullptr));
@@ -222,9 +215,9 @@ public:
         pushButtonQuery->setText(QCoreApplication::translate("sysconfig", "\346\237\245\350\257\242", nullptr));
         pushButtonConfig->setText(QCoreApplication::translate("sysconfig", "\350\256\276\347\275\256", nullptr));
         label_8->setText(QCoreApplication::translate("sysconfig", "\346\263\250\346\204\217\357\274\232", nullptr));
-        label_10->setText(QCoreApplication::translate("sysconfig", "1\343\200\201\345\234\250\345\220\214\344\270\200\344\270\252\351\241\271\347\233\256\357\274\214\347\263\273\347\273\237\345\217\202\346\225\260\344\273\205\351\234\200\350\256\276\347\275\256\344\270\200\346\254\241\345\215\263\345\217\257\357\274\214\350\256\276\347\275\256\345\220\216\345\217\202\346\225\260\344\274\232\350\242\253\344\277\235\345\255\230\350\207\263\346\234\254\345\234\260\347\224\265\350\204\221", nullptr));
-        label_6->setText(QCoreApplication::translate("sysconfig", "2\343\200\201\347\256\241\347\220\206\344\270\255\345\277\203URL\357\274\232\345\215\263http\346\234\215\345\212\241\345\231\250\347\232\204\345\234\260\345\235\200\357\274\214\345\217\257\344\273\245\346\230\257\345\237\237\345\220\215\357\274\214\344\271\237\345\217\257\344\273\245\346\230\257ip", nullptr));
-        label->setText(QCoreApplication::translate("sysconfig", "3\343\200\201\347\256\241\347\220\206\344\270\255\345\277\203\347\253\257\345\217\243\357\274\232\345\215\263http\346\234\215\345\212\241\345\231\250\347\232\204\347\233\221\345\220\254\347\253\257\345\217\243\357\274\214\346\234\215\345\212\241\345\231\250\351\234\200\346\217\220\345\211\215\351\205\215\347\275\256", nullptr));
+        label_10->setText(QCoreApplication::translate("sysconfig", "1\343\200\201\345\234\250\345\220\214\344\270\200\344\270\252\351\241\271\347\233\256\344\270\255\357\274\214\347\263\273\347\273\237\345\217\202\346\225\260\344\273\205\351\234\200\350\256\276\347\275\256\344\270\200\346\254\241\345\215\263\345\217\257\357\274\214\350\256\276\347\275\256\345\220\216\345\217\202\346\225\260\344\274\232\350\242\253\344\277\235\345\255\230\350\207\263\346\234\254\345\234\260\347\224\265\350\204\221\344\270\255", nullptr));
+        label_6->setText(QCoreApplication::translate("sysconfig", "2\343\200\201\347\256\241\347\220\206\344\270\255\345\277\203URL\357\274\232\345\215\263http\346\234\215\345\212\241\345\231\250\350\256\277\351\227\256\345\234\260\345\235\200\357\274\214\345\246\202\344\275\225\351\205\215\347\275\256\350\257\267\345\222\250\350\257\242http\346\234\215\345\212\241\345\231\250\351\205\215\347\275\256\347\256\241\347\220\206\345\221\230", nullptr));
+        label->setText(QCoreApplication::translate("sysconfig", "3\343\200\201\347\256\241\347\220\206\344\270\255\345\277\203\347\253\257\345\217\243\357\274\232\345\215\263http\346\234\215\345\212\241\345\231\250\347\233\221\345\220\254\347\253\257\345\217\243\357\274\214\345\246\202\344\275\225\351\205\215\347\275\256\350\257\267\345\222\250\350\257\242http\346\234\215\345\212\241\345\231\250\351\205\215\347\275\256\347\256\241\347\220\206\345\221\230", nullptr));
     } // retranslateUi
 
 };

Some files were not shown because too many files changed in this diff