From c1f45d3524d4e5af92668684e224d18599fcf123 Mon Sep 17 00:00:00 2001
From: zhangsheng <zhangs1125@sina.com>
Date: Mon, 7 Apr 2025 19:30:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=95=8C=E9=9D=A2=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=BB=E7=95=8C=E9=9D=A2=E6=8C=AF=E5=8A=A8=E6=9D=BF=E5=8D=A1?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mainwindow.cpp     |   9 +-
 seismic_monitor.ui | 234 ++++++++++++++++++++++++++++++++++++++-------
 2 files changed, 205 insertions(+), 38 deletions(-)

diff --git a/mainwindow.cpp b/mainwindow.cpp
index e70c993..cf887a5 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -18,7 +18,8 @@
 #include <qsettings.h>
 #include <QNetworkProxy>
 #include "relaysetting.h"
-#include "common.h"
+#include "config_mgr.h"
+#include "vibrationdata.h"
 
 QString g_strServerIp;
 
@@ -282,6 +283,12 @@ void MainWindow::onMenuActionTriggered() {
                     chan_display = "键相";
                 } else if (slot_type == "HAM824") {
                     chan_display = "振动";
+                    auto vibrationData = std::make_shared<VibrationData>();
+                    vibrationData->slot_ = button_id;
+                    if(rack_type == "单板卡"){
+                        vibrationData->card_type_ = kCardVibSingle;
+                    }
+                    ConfigMgr::Instance()->AddCard(vibrationData);
                 } else if (slot_type == "OPM844") {
                     chan_display = "转速";
                 }
diff --git a/seismic_monitor.ui b/seismic_monitor.ui
index dfa44fe..043b9dc 100644
--- a/seismic_monitor.ui
+++ b/seismic_monitor.ui
@@ -61,7 +61,7 @@
       <property name="geometry">
        <rect>
         <x>10</x>
-        <y>470</y>
+        <y>500</y>
         <width>844</width>
         <height>37</height>
        </rect>
@@ -220,7 +220,7 @@
         <x>40</x>
         <y>40</y>
         <width>331</width>
-        <height>401</height>
+        <height>441</height>
        </rect>
       </property>
       <property name="title">
@@ -230,7 +230,7 @@
        <property name="geometry">
         <rect>
          <x>10</x>
-         <y>300</y>
+         <y>340</y>
          <width>120</width>
          <height>80</height>
         </rect>
@@ -272,7 +272,7 @@
        <property name="geometry">
         <rect>
          <x>200</x>
-         <y>300</y>
+         <y>340</y>
          <width>120</width>
          <height>81</height>
         </rect>
@@ -315,20 +315,20 @@
         <rect>
          <x>10</x>
          <y>50</y>
-         <width>312</width>
-         <height>245</height>
+         <width>311</width>
+         <height>268</height>
         </rect>
        </property>
        <property name="minimumSize">
         <size>
          <width>0</width>
-         <height>245</height>
+         <height>0</height>
         </size>
        </property>
        <property name="maximumSize">
         <size>
          <width>16777215</width>
-         <height>245</height>
+         <height>16777215</height>
         </size>
        </property>
        <property name="currentIndex">
@@ -342,7 +342,7 @@
          <property name="geometry">
           <rect>
            <x>9</x>
-           <y>121</y>
+           <y>150</y>
            <width>288</width>
            <height>80</height>
           </rect>
@@ -463,13 +463,13 @@
           </item>
          </layout>
         </widget>
-        <widget class="QWidget" name="layoutWidget">
+        <widget class="QWidget" name="">
          <property name="geometry">
           <rect>
-           <x>0</x>
+           <x>1</x>
            <y>0</y>
-           <width>271</width>
-           <height>111</height>
+           <width>266</width>
+           <height>136</height>
           </rect>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_2">
@@ -529,7 +529,7 @@
               </property>
               <property name="sizeHint" stdset="0">
                <size>
-                <width>20</width>
+                <width>40</width>
                 <height>20</height>
                </size>
               </property>
@@ -700,7 +700,47 @@
               </property>
               <property name="sizeHint" stdset="0">
                <size>
-                <width>20</width>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
+          </item>
+          <item>
+           <layout class="QHBoxLayout" name="horizontalLayout_24">
+            <item>
+             <spacer name="horizontalSpacer_8">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>90</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+            <item>
+             <widget class="QCheckBox" name="checkBox_power_1">
+              <property name="layoutDirection">
+               <enum>Qt::LeftToRight</enum>
+              </property>
+              <property name="text">
+               <string>是否供电</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer name="horizontalSpacer_7">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
                 <height>20</height>
                </size>
               </property>
@@ -719,7 +759,7 @@
          <property name="geometry">
           <rect>
            <x>9</x>
-           <y>121</y>
+           <y>150</y>
            <width>288</width>
            <height>80</height>
           </rect>
@@ -852,13 +892,13 @@
           </item>
          </layout>
         </widget>
-        <widget class="QWidget" name="layoutWidget">
+        <widget class="QWidget" name="">
          <property name="geometry">
           <rect>
-           <x>0</x>
+           <x>1</x>
            <y>0</y>
            <width>266</width>
-           <height>108</height>
+           <height>136</height>
           </rect>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_7">
@@ -1094,6 +1134,46 @@
             </item>
            </layout>
           </item>
+          <item>
+           <layout class="QHBoxLayout" name="horizontalLayout_25">
+            <item>
+             <spacer name="horizontalSpacer_9">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>90</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+            <item>
+             <widget class="QCheckBox" name="checkBox_power_2">
+              <property name="layoutDirection">
+               <enum>Qt::LeftToRight</enum>
+              </property>
+              <property name="text">
+               <string>是否供电</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer name="horizontalSpacer_10">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
+          </item>
          </layout>
         </widget>
        </widget>
@@ -1115,7 +1195,7 @@
        <property name="geometry">
         <rect>
          <x>140</x>
-         <y>310</y>
+         <y>350</y>
          <width>52</width>
          <height>75</height>
         </rect>
@@ -1171,7 +1251,7 @@
         <x>460</x>
         <y>40</y>
         <width>331</width>
-        <height>401</height>
+        <height>441</height>
        </rect>
       </property>
       <property name="title">
@@ -1181,7 +1261,7 @@
        <property name="geometry">
         <rect>
          <x>10</x>
-         <y>300</y>
+         <y>340</y>
          <width>120</width>
          <height>80</height>
         </rect>
@@ -1223,7 +1303,7 @@
        <property name="geometry">
         <rect>
          <x>200</x>
-         <y>300</y>
+         <y>340</y>
          <width>120</width>
          <height>80</height>
         </rect>
@@ -1267,19 +1347,19 @@
          <x>10</x>
          <y>50</y>
          <width>312</width>
-         <height>245</height>
+         <height>271</height>
         </rect>
        </property>
        <property name="minimumSize">
         <size>
          <width>0</width>
-         <height>245</height>
+         <height>0</height>
         </size>
        </property>
        <property name="maximumSize">
         <size>
          <width>16777215</width>
-         <height>245</height>
+         <height>16777215</height>
         </size>
        </property>
        <property name="currentIndex">
@@ -1293,7 +1373,7 @@
          <property name="geometry">
           <rect>
            <x>9</x>
-           <y>121</y>
+           <y>150</y>
            <width>288</width>
            <height>80</height>
           </rect>
@@ -1414,13 +1494,13 @@
           </item>
          </layout>
         </widget>
-        <widget class="QWidget" name="layoutWidget">
+        <widget class="QWidget" name="">
          <property name="geometry">
           <rect>
-           <x>0</x>
-           <y>0</y>
+           <x>1</x>
+           <y>1</y>
            <width>266</width>
-           <height>108</height>
+           <height>136</height>
           </rect>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_9">
@@ -1656,6 +1736,46 @@
             </item>
            </layout>
           </item>
+          <item>
+           <layout class="QHBoxLayout" name="horizontalLayout_27">
+            <item>
+             <spacer name="horizontalSpacer_11">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>90</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+            <item>
+             <widget class="QCheckBox" name="checkBox_power_3">
+              <property name="layoutDirection">
+               <enum>Qt::LeftToRight</enum>
+              </property>
+              <property name="text">
+               <string>是否供电</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer name="horizontalSpacer_12">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
+          </item>
          </layout>
         </widget>
        </widget>
@@ -1667,7 +1787,7 @@
          <property name="geometry">
           <rect>
            <x>9</x>
-           <y>121</y>
+           <y>150</y>
            <width>288</width>
            <height>80</height>
           </rect>
@@ -1788,13 +1908,13 @@
           </item>
          </layout>
         </widget>
-        <widget class="QWidget" name="layoutWidget">
+        <widget class="QWidget" name="">
          <property name="geometry">
           <rect>
-           <x>0</x>
-           <y>0</y>
+           <x>1</x>
+           <y>1</y>
            <width>266</width>
-           <height>108</height>
+           <height>136</height>
           </rect>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_11">
@@ -2030,6 +2150,46 @@
             </item>
            </layout>
           </item>
+          <item>
+           <layout class="QHBoxLayout" name="horizontalLayout_29">
+            <item>
+             <spacer name="horizontalSpacer_14">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>90</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+            <item>
+             <widget class="QCheckBox" name="checkBox_power_4">
+              <property name="layoutDirection">
+               <enum>Qt::LeftToRight</enum>
+              </property>
+              <property name="text">
+               <string>是否供电</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer name="horizontalSpacer_15">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
+          </item>
          </layout>
         </widget>
        </widget>
@@ -2051,7 +2211,7 @@
        <property name="geometry">
         <rect>
          <x>140</x>
-         <y>312</y>
+         <y>352</y>
          <width>52</width>
          <height>75</height>
         </rect>