Merge branch 'main' of http://123.57.54.1:3000/CaoYuhui/PayloadAPP

Src/RescueLoad/rescueloadwidget.cpp

@@ -207,10 +207,10 @@ void RescueLoadWidget::updateDetailTable(const QString imsi)
     ui->deviceDetail->item(1, 0)->setText(data.operatorName);
     ui->deviceDetail->item(2, 0)->setText(data.longitude);
     ui->deviceDetail->item(3, 0)->setText(data.latitude);
-    ui->deviceDetail->item(4, 0)->setText(QString::number(data.altitude));
+    // ui->deviceDetail->item(4, 0)->setText(QString::number(data.altitude));
-    ui->deviceDetail->item(5, 0)->setText(data.fcn);
+    ui->deviceDetail->item(4, 0)->setText(data.fcn);
-    ui->deviceDetail->item(6, 0)->setText(QString::number(data.rssi));
+    ui->deviceDetail->item(5, 0)->setText(QString::number(data.rssi));
-    ui->deviceDetail->item(7, 0)->setText(data.createDate);
+    ui->deviceDetail->item(6, 0)->setText(data.createDate);
     ui->deviceDetail->show();
 
     // qDebug()<<"更新详细信息end: " << imsi;

Src/RescueLoad/rescueloadwidget.ui

@@ -440,7 +440,7 @@ background-color:transparent;
         <property name="minimumSize">
          <size>
           <width>320</width>
-          <height>275</height>
+          <height>240</height>
          </size>
         </property>
         <property name="maximumSize">
@@ -470,7 +470,7 @@ background-color:transparent;
            <property name="minimumSize">
             <size>
              <width>0</width>
-             <height>240</height>
+             <height>210</height>
             </size>
            </property>
            <property name="font">
@@ -531,11 +531,6 @@ background-color:transparent;
              <string>纬度</string>
             </property>
            </row>
-           <row>
-            <property name="text">
-             <string>海拔高度</string>
-            </property>
-           </row>
            <row>
             <property name="text">
              <string>频点</string>