在线设备-设备信息弹出层

Web/src/components/GMap.vue

@@ -49,69 +49,50 @@
         <div class="osd">
           <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] }}</a-col>
+              :style="deviceInfo.device.mode_code === EModeCode.Disconnected ? 'color: red; font-weight: 700;' : 'color: rgb(25,190,107)'">
+              {{ EModeCode[deviceInfo.device.mode_code] }}
+            </a-col>
           </a-row>
           <a-row>
-            <a-col span="6">
-              <a-tooltip title="Signal strength">
-                <span>HD</span>
-                <span class="ml10">{{ deviceInfo.gateway?.transmission_signal_quality }}</span>
-              </a-tooltip>
-            </a-col>
-            <a-col span="6">
-              <a-tooltip title="RC Battery Level">
-                <span>
-                  <ThunderboltOutlined class="fz14" />
-                </span>
-                <span class="ml10">{{ deviceInfo.gateway && deviceInfo.gateway.capacity_percent !== str ?
-                  deviceInfo.gateway?.capacity_percent + ' %' : deviceInfo.gateway?.capacity_percent }}</span>
-              </a-tooltip>
-            </a-col>
-
-            <a-col span="6">
-              <a-tooltip title="Drone Battery Level">
-                <span>
-                  <ThunderboltOutlined class="fz14" />
-                </span>
-                <span class="ml10">{{ deviceInfo.device.battery.capacity_percent !== str ?
-                  deviceInfo.device.battery.capacity_percent + ' %' : deviceInfo.device.battery.capacity_percent
-                  }}</span>
-              </a-tooltip>
+            <a-col span="8">
+              开启直播
             </a-col>
           </a-row>
           <a-row>
-            <a-tooltip title="RTK Fixed">
-              <a-col span="6" class="flex-row flex-align-center flex-justify-start">
-                <span>Fixed</span>
-                <span class="ml10 circle"
-                  :style="deviceInfo.device.position_state.is_fixed === 1 ? 'backgroud: rgb(25,190,107);' : ' background: red;'"></span>
-              </a-col>
-            </a-tooltip>
             <a-col span="6">
               <a-tooltip title="GPS">
-                <span>GPS</span>
+                <span>
+                  GPS
+                  <WifiOutlined />
+                </span>
                 <span class="ml10">{{ deviceInfo.device.position_state.gps_number }}</span>
               </a-tooltip>
             </a-col>
             <a-col span="6">
               <a-tooltip title="RTK">
                 <span>
-                  <TrademarkOutlined class="fz14" />
+                  RTK
                 </span>
                 <span class="ml10">{{ deviceInfo.device.position_state.rtk_number }}</span>
               </a-tooltip>
             </a-col>
-          </a-row>
-          <a-row>
             <a-col span="6">
-              <a-tooltip title="Flight Mode">
-                <span>
-                  <ControlOutlined class="fz16" />
+              <a-tooltip title="Altitude above sea level">
+                <span>电量</span>
+                <span class="ml10">
+                  {{ deviceInfo.device.battery.capacity_percent + '%' }}
                 </span>
-                <span class="ml10">{{ EGear[deviceInfo.device.gear] }}</span>
               </a-tooltip>
             </a-col>
+            <a-col span="6">
+              <a-tooltip title="Wind Speed">
+                <span>W.S</span>
+                <span class="ml10">{{ deviceInfo.device.wind_speed === str ? str : (deviceInfo.device.wind_speed /
+                  10).toFixed(2) + ' m/s' }}</span>
+              </a-tooltip>
+            </a-col>
+          </a-row>
+          <a-row>
             <a-col span="6">
               <a-tooltip title="Altitude above sea level">
                 <span>ASL</span>
@@ -122,23 +103,12 @@
             </a-col>
             <a-col span="6">
               <a-tooltip title="Altitude above takeoff level">
-                <span>ALT</span>
+                <span>AGL</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="Distance to Home Point">
-                <span>H</span>
-                <span class="ml10">
-                  {{ deviceInfo.device.home_distance === str ? str : deviceInfo.device.home_distance.toFixed(2) + ' m'
-                  }}
-                </span>
-              </a-tooltip>
-            </a-col>
-          </a-row>
-          <a-row>
             <a-col span="6">
               <a-tooltip title="Horizontal Speed">
                 <span>H.S</span>
@@ -149,20 +119,11 @@
               </a-tooltip>
             </a-col>
             <a-col span="6">
-              <a-tooltip title="Vertical Speed">
-                <span>V.S</span>
-                <span class="ml10">
-                  {{ deviceInfo.device.vertical_speed === str ? str :
-                    deviceInfo.device.vertical_speed.toFixed(2) + ' m/s' }}
-                </span>
-              </a-tooltip>
-            </a-col>
-            <a-col span="6">
-              <a-tooltip title="Wind Speed">
-                <span>W.S</span>
+              <a-tooltip title="Distance to Home Point">
+                <span>H</span>
                 <span class="ml10">
-                  {{ deviceInfo.device.wind_speed === str ? str : (deviceInfo.device.wind_speed /
-                    10).toFixed(2) + ' m/s' }}
+                  {{ deviceInfo.device.home_distance === str ? str : deviceInfo.device.home_distance.toFixed(2) + ' m'
+                  }}
                 </span>
               </a-tooltip>
             </a-col>
@@ -372,8 +333,8 @@
           <a-row>
             <a-col span="16"
               :style="!deviceInfo.device || deviceInfo.device?.mode_code === EModeCode.Disconnected ? 'color: red; font-weight: 700;' : 'color: rgb(25,190,107)'">
-              {{ !deviceInfo.device ? EModeCode[EModeCode.Disconnected] : EModeCode[deviceInfo.device?.mode_code]
-              }}</a-col>
+              {{ !deviceInfo.device ? EModeCode[EModeCode.Disconnected] : EModeCode[deviceInfo.device?.mode_code] }}
+            </a-col>
           </a-row>
           <a-row>
             <a-col span="6">