调整设备信息

Web/src/components/GMap.vue

@@ -32,9 +32,11 @@
       <div class="drag-title pl5 pr5 flex-align-center flex-row flex-justify-between"
         style="border-bottom: 1px solid #515151; height: 18%;">
         <span>{{ osdVisible.callsign }}</span>
-        <span><a class="fz16" style="color: white;" @click="() => osdVisible.visible = false">
+        <span>
+          <a class="fz16" style="color: white;" @click="() => osdVisible.visible = false">
             <CloseOutlined />
-          </a></span>
+          </a>
+        </span>
       </div>
       <div style="height: 82%;">
         <div class="flex-column flex-align-center flex-justify-center"
@@ -50,17 +52,24 @@
           <a-row>
             <a-col span="16"
               :style="deviceInfo.device.mode_code === EModeCode.Disconnected ? 'color: red; font-weight: 700;' : 'color: rgb(25,190,107)'">
-              {{ EModeCode[deviceInfo.device.mode_code] }}
+              <span>
+                {{ EModeCode[deviceInfo.device.mode_code] }}
+              </span>
+              <span>
+                飞行状态
+              </span>
             </a-col>
           </a-row>
           <a-row>
             <a-col span="8">
-              开启直播
+              <span class="openLiveButton">
+                开启直播
+              </span>
             </a-col>
           </a-row>
           <a-row>
             <a-col span="6">
-              <a-tooltip title="GPS">
+              <a-tooltip title="GPS卫星数">
                 <span>
                   GPS
                   <WifiOutlined />
@@ -77,7 +86,7 @@
               </a-tooltip>
             </a-col>
             <a-col span="6">
-              <a-tooltip title="Altitude above sea level">
+              <a-tooltip title="电量">
                 <span>电量</span>
                 <span class="ml10">
                   {{ deviceInfo.device.battery.capacity_percent + '%' }}
@@ -85,7 +94,7 @@
               </a-tooltip>
             </a-col>
             <a-col span="6">
-              <a-tooltip title="Wind Speed">
+              <a-tooltip title="风向速度">
                 <span>W.S</span>
                 <span class="ml10">{{ deviceInfo.device.wind_speed === str ? str : (deviceInfo.device.wind_speed /
                   10).toFixed(2) + ' m/s' }}</span>
@@ -94,7 +103,7 @@
           </a-row>
           <a-row>
             <a-col span="6">
-              <a-tooltip title="Altitude above sea level">
+              <a-tooltip title="海拔高度">
                 <span>ASL</span>
                 <span class="ml10">
                   {{ deviceInfo.device.height === str ? str : deviceInfo.device.height.toFixed(2) + ' m' }}
@@ -102,15 +111,15 @@
               </a-tooltip>
             </a-col>
             <a-col span="6">
-              <a-tooltip title="Altitude above takeoff level">
-                <span>AGL</span>
+              <a-tooltip title="离地高度">
+                <span>ALT</span>
                 <span class="ml10">
                   {{ deviceInfo.device.elevation === str ? str : deviceInfo.device.elevation.toFixed(2) + ' m' }}
                 </span>
               </a-tooltip>
             </a-col>
             <a-col span="6">
-              <a-tooltip title="Horizontal Speed">
+              <a-tooltip title="水平速度">
                 <span>H.S</span>
                 <span class="ml10">
                   {{ deviceInfo.device.horizontal_speed === str ? str :
@@ -119,7 +128,7 @@
               </a-tooltip>
             </a-col>
             <a-col span="6">
-              <a-tooltip title="Distance to Home Point">
+              <a-tooltip title="当前高度">
                 <span>H</span>
                 <span class="ml10">
                   {{ deviceInfo.device.home_distance === str ? str : deviceInfo.device.home_distance.toFixed(2) + ' m'
@@ -1098,6 +1107,12 @@ export default defineComponent({
   opacity: 0.8;
 }
 
+.openLiveButton {
+  padding: 5px;
+  border: 1px solid #5c5c5c;
+  cursor: pointer;
+}
+
 .osd>div:not(.dock-control-panel) {
   margin-top: 5px;
   padding-left: 5px;

Web/src/pages/page-web/projects/tsa.vue

@@ -96,7 +96,7 @@
                           style="width: 18px; height: 16px; text-align: center;">
                           <span :style="hmsInfo[dock.sn].length > 99 ? 'font-size: 11px' : 'font-size: 12px'">{{
                             hmsInfo[dock.sn].length
-                            }}</span>
+                          }}</span>
                           <span class="fz10">{{ hmsInfo[dock.sn].length > 99 ? '+' : '' }}</span>
                         </div>
                         <a-popover trigger="click" placement="bottom" color="black"
@@ -229,9 +229,6 @@
       <a-button style="margin-right: 10px;" type="primary" @click="onClickGoHome">
         返回
       </a-button>
-      <a-button type="primary" @click="openLivestreamOthers">
-        直播测试
-      </a-button>
     </div>
   </div>
 </template>