机场详情重构

Web/src/components/GMap.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="g-map-wrapper">
     <!-- 地图区域 -->
-    <div id="g-container" :style="{ width: '100%', height: '100%' }" />
+    <div id="g-container" :style="{ width: '100%', height: '100%' }"></div>
     <!-- 绘制面板 -->
     <div class="g-action-panel">
       <div :class="state.currentType === 'pin' ? 'g-action-item selection' : 'g-action-item'"
@@ -20,7 +20,6 @@
           <BorderOutlined class="fz18" />
         </a>
       </div>
-      <!-- <FlightAreaActionIcon class="g-action-item mt10" :class="{'selection': mouseMode && state.isFlightArea}" @select-action="selectFlightAreaAction" @click="selectFlightAreaAction"/> -->
       <div v-if="mouseMode" class="g-action-item" @click="draw('off', false)">
         <a style="color: red;">
           <CloseOutlined />
@@ -40,368 +39,17 @@
       </div>
     </div>
     <!-- 机场OSD -->
-    <!-- <AirportOsdInfoModal :osdInfo="osdVisible" :deviceInfo="deviceInfo"
-      v-if="osdVisible.visible && osdVisible.is_dock" /> -->
-    <div v-if="osdVisible.visible && osdVisible.is_dock" v-drag-window class="osd-panel fz12">
-      <div class="drag-title fz16 pl5 pr5 flex-align-center flex-row flex-justify-between"
-        style="border-bottom: 1px solid #515151; height: 10%;">
-        <span>{{ osdVisible.gateway_callsign }}</span>
-      </div>
-      <span><a style="color: white; position: absolute; top: 5px; right: 5px;"
-          @click="() => osdVisible.visible = false">
-          <CloseOutlined />
-        </a></span>
-      <!-- 机场 -->
-      <div class="flex-display" style="border-bottom: 1px solid #515151;">
-        <div class="flex-column flex-align-stretch flex-justify-center" style="width: 60px; background: #2d2d2d;">
-          <a-tooltip :title="osdVisible.model">
-            <div class="flex-column  flex-align-center flex-justify-center" style="width: 90%;">
-              <span>
-                <RobotFilled style="font-size: 48px;" />
-              </span>
-              <span class="mt10">Dock</span>
-            </div>
-          </a-tooltip>
-        </div>
-        <div class="osd flex-1" style="flex: 1">
-          <a-row>
-            <a-col span="16"
-              :style="deviceInfo.dock.basic_osd?.mode_code === EDockModeCode.Disconnected ? 'color: red; font-weight: 700;' : 'color: rgb(25,190,107)'">
-              {{ EDockModeCode[deviceInfo.dock.basic_osd?.mode_code] }}</a-col>
-          </a-row>
-          <a-row>
-            <a-col span="12">
-              <a-tooltip title="Accumulated Running Time">
-                <span>
-                  <HistoryOutlined />
-                </span>
-                <span class="ml10">
-                  <span v-if="deviceInfo.dock.work_osd?.acc_time >= 2592000"> {{
-                    Math.floor(deviceInfo.dock.work_osd?.acc_time / 2592000) }}m </span>
-                  <span v-if="(deviceInfo.dock.work_osd?.acc_time % 2592000) >= 86400"> {{
-                    Math.floor((deviceInfo.dock.work_osd?.acc_time % 2592000) / 86400) }}d </span>
-                  <span v-if="(deviceInfo.dock.work_osd?.acc_time % 2592000 % 86400) >= 3600"> {{
-                    Math.floor((deviceInfo.dock.work_osd?.acc_time % 2592000 % 86400) / 3600) }}h </span>
-                  <span v-if="(deviceInfo.dock.work_osd?.acc_time % 2592000 % 86400 % 3600) >= 60"> {{
-                    Math.floor((deviceInfo.dock.work_osd?.acc_time % 2592000 % 86400 % 3600) / 60) }}min </span>
-                  <span>{{ Math.floor(deviceInfo.dock.work_osd?.acc_time % 2592000 % 86400 % 3600 % 60) }} s</span>
-                </span>
-              </a-tooltip>
-            </a-col>
-            <a-col span="12">
-              <a-tooltip title="Activation time">
-                <span>
-                  <FieldTimeOutlined />
-                </span>
-                <span class="ml10">{{ new Date((deviceInfo.dock.work_osd?.activation_time ?? 0) * 1000).toLocaleString()
-                  }}
-                </span>
-              </a-tooltip>
-            </a-col>
-          </a-row>
-          <a-row>
-            <a-col span="6">
-              <a-tooltip title="Network State">
-                <span :style="qualityStyle">
-                  <span v-if="deviceInfo.dock.basic_osd?.network_state?.type === NetworkStateTypeEnum.FOUR_G">
-                    <SignalFilled />
-                  </span>
-                  <span v-else>
-                    <GlobalOutlined />
-                  </span>
-                </span>
-                <span class="ml10">{{ deviceInfo.dock.basic_osd?.network_state?.rate }} kb/s</span>
-              </a-tooltip>
-            </a-col>
-            <a-col span="6">
-              <a-tooltip title="The total number of times the dock has performed missions.">
-                <span>
-                  <CarryOutOutlined />
-                </span>
-                <span class="ml10">{{ deviceInfo.dock.work_osd?.job_number }} </span>
-              </a-tooltip>
-            </a-col>
-            <a-col span="6">
-              <a-tooltip title="Media File Remain Upload">
-                <span>
-                  <CloudUploadOutlined class="fz14" />
-                </span>
-                <span class="ml10">{{ deviceInfo.dock.link_osd?.media_file_detail?.remain_upload }}</span>
-              </a-tooltip>
-            </a-col>
-            <a-col span="6">
-              <a-tooltip>
-                <template #title>
-                  <p>total: {{ deviceInfo.dock.basic_osd?.storage?.total }}</p>
-                  <p>used: {{ deviceInfo.dock.basic_osd?.storage?.used }}</p>
-                </template>
-                <span>
-                  <FolderOpenOutlined />
-                </span>
-                <span class="ml10" v-if="deviceInfo.dock.basic_osd?.storage?.total > 0">
-                  <a-progress type="circle" :width="20"
-                    :percent="deviceInfo.dock.basic_osd?.storage?.used * 100 / deviceInfo.dock.basic_osd?.storage?.total"
-                    :strokeWidth="20" :showInfo="false"
-                    :strokeColor="deviceInfo.dock.basic_osd?.storage?.used * 100 / deviceInfo.dock.basic_osd?.storage?.total > 80 ? 'red' : '#00ee8b'" />
-                </span>
-              </a-tooltip>
-            </a-col>
-          </a-row>
-          <a-row>
-            <a-col span="6">
-              <a-tooltip title="Wind Speed">
-                <span>W.S</span>
-                <span class="ml10">{{ (deviceInfo.dock.basic_osd?.wind_speed ?? str) + ' m/s' }}</span>
-              </a-tooltip>
-            </a-col>
-            <a-col span="6">
-              <a-tooltip title="Rainfall">
-                <span>🌧</span>
-                <span class="ml10">{{ RainfallEnum[deviceInfo.dock.basic_osd?.rainfall] }}</span>
-              </a-tooltip>
-            </a-col>
-            <a-col span="6">
-              <a-tooltip title="Environment Temperature">
-                <span>°C</span>
-                <span class="ml10">{{ deviceInfo.dock.basic_osd?.environment_temperature }}</span>
-              </a-tooltip>
-            </a-col>
-            <a-col span="6">
-              <a-tooltip title="Dock Temperature">
-                <span>°C</span>
-                <span class="ml10">{{ deviceInfo.dock.basic_osd?.temperature }}</span>
-              </a-tooltip>
-            </a-col>
-          </a-row>
-          <a-row>
-            <a-col span="6">
-              <a-tooltip title="Dock Humidity">
-                <span>💦</span>
-                <span class="ml10">{{ deviceInfo.dock.basic_osd?.humidity }}</span>
-              </a-tooltip>
-            </a-col>
-            <a-col span="6">
-              <a-tooltip title="Working Voltage">
-                <span
-                  style="border: 1px solid; border-radius: 50%; width: 18px; height: 18px; line-height: 16px; text-align: center; float: left;">V</span>
-                <span class="ml10">{{ (deviceInfo.dock.work_osd?.working_voltage ?? str) + ' mV' }}</span>
-              </a-tooltip>
-            </a-col>
-            <a-col span="6">
-              <a-tooltip title="Working Current">
-                <span
-                  style="border: 1px solid; border-radius: 50%; width: 18px; height: 18px; line-height: 15px; text-align: center; float: left;">A</span>
-                <span class="ml10">{{ (deviceInfo.dock.work_osd?.working_current ?? str) + ' mA' }}</span>
-              </a-tooltip>
-            </a-col>
-            <a-col span="6">
-              <a-tooltip title="Drone in dock">
-                <span>
-                  <RocketOutlined />
-                </span>
-                <span class="ml10">{{ deviceInfo.dock.basic_osd?.drone_in_dock }}</span>
-              </a-tooltip>
-            </a-col>
-          </a-row>
-          <a-row class="p5">
-            <a-col span="24">
-              <a-button type="primary" :disabled="dockControlPanelVisible" size="small"
-                @click="setDockControlPanelVisible(true)">
-                Actions
-              </a-button>
-            </a-col>
-          </a-row>
-          <!-- 机场控制面板 -->
-          <DockControlPanel v-if="dockControlPanelVisible" :sn="osdVisible.gateway_sn" :deviceInfo="deviceInfo"
-            @close-control-panel="onCloseControlPanel">
-          </DockControlPanel>
-        </div>
-      </div>
-      <!--  飞机-->
-      <div class="flex-display">
-        <div class="flex-column flex-align-stretch flex-justify-center" style="width: 60px;  background: #2d2d2d;">
-          <a-tooltip :title="osdVisible.model">
-            <div style="width: 90%;" class="flex-column flex-align-center flex-justify-center">
-              <span><a-image :src="M30" :preview="false" /></span>
-              <span>M30</span>
-            </div>
-          </a-tooltip>
-        </div>
-        <div class="osd flex-1">
-          <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>
-          </a-row>
-          <a-row>
-            <a-col span="6">
-              <a-tooltip title="Upward Quality">
-                <span>
-                  <SignalFilled />
-                  <ArrowUpOutlined style="font-size: 9px; vertical-align: top;" />
-                </span>
-                <span class="ml10">{{ deviceInfo.dock.link_osd?.sdr?.up_quality }}</span>
-              </a-tooltip>
-            </a-col>
-            <a-col span="6">
-              <a-tooltip title="Downward Quality">
-                <span>
-                  <SignalFilled />
-                  <ArrowDownOutlined style="font-size: 9px; vertical-align: top;" />
-                </span>
-                <span class="ml10">{{ deviceInfo.dock.link_osd?.sdr?.down_quality }}</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 && deviceInfo.device.battery.capacity_percent !== str ?
-                  deviceInfo.device?.battery.capacity_percent + ' %' : str }}</span>
-              </a-tooltip>
-            </a-col>
-            <a-col span="6">
-              <a-tooltip>
-                <template #title>
-                  <p>total: {{ deviceInfo.device?.storage?.total }}</p>
-                  <p>used: {{ deviceInfo.device?.storage?.used }}</p>
-                </template>
-                <span>
-                  <FolderOpenOutlined />
-                </span>
-                <span class="ml10" v-if="deviceInfo.device?.storage?.total > 0">
-                  <a-progress type="circle" :width="20"
-                    :percent="deviceInfo.device?.storage?.used * 100 / deviceInfo.device?.storage?.total"
-                    :strokeWidth="20" :showInfo="false"
-                    :strokeColor="deviceInfo.device?.storage?.used * 100 / deviceInfo.device?.storage?.total > 80 ? 'red' : '#00ee8b'" />
-                </span>
-              </a-tooltip>
-            </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 class="ml10">{{ deviceInfo.device ? deviceInfo.device.position_state.gps_number : str }}</span>
-              </a-tooltip>
-            </a-col>
-            <a-col span="6">
-              <a-tooltip title="RTK">
-                <span>
-                  <TrademarkOutlined class="fz14" />
-                </span>
-                <span class="ml10">{{ deviceInfo.device ? deviceInfo.device.position_state.rtk_number : str }}</span>
-              </a-tooltip>
-            </a-col>
-          </a-row>
-          <a-row>
-            <a-col span="6">
-              <a-tooltip title="Flight Mode">
-                <span>
-                  <ControlOutlined class="fz16" />
-                </span>
-                <span class="ml10">{{ deviceInfo.device ? EGear[deviceInfo.device?.gear] : str }}</span>
-              </a-tooltip>
-            </a-col>
-            <a-col span="6">
-              <a-tooltip title="Altitude above sea level">
-                <span>ASL</span>
-                <span class="ml10">{{ !deviceInfo.device || deviceInfo.device.height === str ? str :
-                  deviceInfo.device?.height.toFixed(2) + ' m' }}</span>
-              </a-tooltip>
-            </a-col>
-            <a-col span="6">
-              <a-tooltip title="Altitude above takeoff level">
-                <span>ALT</span>
-                <span class="ml10">{{ !deviceInfo.device || 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
-                  style="border: 1px solid; border-radius: 50%; width: 18px; height: 18px; line-height: 15px; text-align: center;  display: block; float: left;">H</span>
-                <span class="ml10">{{ !deviceInfo.device || 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>
-                <span class="ml10">{{ !deviceInfo.device || deviceInfo.device?.horizontal_speed === str ? str :
-                  deviceInfo.device?.horizontal_speed.toFixed(2) + ' m/s' }}</span>
-              </a-tooltip>
-            </a-col>
-            <a-col span="6">
-              <a-tooltip title="Vertical Speed">
-                <span>V.S</span>
-                <span class="ml10">{{ !deviceInfo.device || 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>
-                <span class="ml10">{{ !deviceInfo.device || deviceInfo.device.wind_speed === str ? str :
-                  (deviceInfo.device?.wind_speed / 10).toFixed(2) + ' m/s' }}</span>
-              </a-tooltip>
-            </a-col>
-          </a-row>
-        </div>
-      </div>
-      <div class="battery-slide" v-if="deviceInfo.device && deviceInfo.device.battery.remain_flight_time !== 0"
-        style="border: 1px solid red">
-        <div style="background: #535759;" class="width-100"></div>
-        <div class="capacity-percent" :style="{ width: deviceInfo.device.battery.capacity_percent + '%' }"></div>
-        <div class="return-home" :style="{ width: deviceInfo.device.battery.return_home_power + '%' }"></div>
-        <div class="landing" :style="{ width: deviceInfo.device.battery.landing_power + '%' }"></div>
-        <div class="white-point" :style="{ left: deviceInfo.device.battery.landing_power + '%' }"></div>
-        <div class="battery" :style="{ left: deviceInfo.device.battery.capacity_percent + '%' }">
-          {{ Math.floor(deviceInfo.device.battery.remain_flight_time / 60) }}:
-          {{ 10 > (deviceInfo.device.battery.remain_flight_time % 60) ? '0' :
-            '' }}{{ deviceInfo.device.battery.remain_flight_time % 60 }}
-        </div>
-      </div>
-      <!-- 飞行指令 -->
-      <DroneControlPanel :sn="osdVisible.gateway_sn" :deviceInfo="deviceInfo" :payloads="osdVisible.payloads">
-      </DroneControlPanel>
-    </div>
+    <AirportOsdInfoModal :osdInfo="osdVisible" :deviceInfo="deviceInfo"
+      v-if="osdVisible.visible && osdVisible.is_dock" />
     <!-- 飞机OSD -->
     <DeviceOsdInfoModal :osdInfo="osdVisible" :deviceInfo="deviceInfo"
       v-if="osdVisible.visible && !osdVisible.is_dock" />
-    <!-- liveview -->
-    <div class="liveview" v-if="livestreamOthersVisible" v-drag-window>
-      <div style="height: 40px; width: 100%" class="drag-title"></div>
-      <a style="position: absolute; right: 10px; top: 10px; font-size: 16px; color: white;"
-        @click="closeLivestreamOthers">
-        <CloseOutlined />
-      </a>
-      <LivestreamOthers />
-    </div>
-    <div class="liveview" v-if="livestreamAgoraVisible" v-drag-window>
-      <div style="height: 40px; width: 100%" class="drag-title"></div>
-      <a style="position: absolute; right: 10px; top: 10px; font-size: 16px; color: white;"
-        @click="closeLivestreamAgora">
-        <CloseOutlined />
-      </a>
-      <LivestreamAgora />
-    </div>
   </div>
 </template>
 
 <script lang="ts">
 import { computed, defineComponent, onMounted, reactive, ref, watch, onUnmounted } from 'vue'
+import { BorderOutlined, LineOutlined, CloseOutlined, AimOutlined } from '@ant-design/icons-vue'
 import {
   generateLineContent,
   generatePointContent,
@@ -421,31 +69,17 @@ import { GeojsonCoordinate } from '/@/types/map'
 import { MapDoodleEnum } from '/@/types/map-enum'
 import { PostElementsBody } from '/@/types/mapLayer'
 import { uuidv4 } from '/@/utils/uuid'
-import { gcj02towgs84, wgs84togcj02 } from '/@/vendors/coordtransform'
+import { gcj02towgs84, wgs84togcj02 } from '../vendors/coordtransform'
 import { deviceTsaUpdate } from '/@/hooks/use-g-map-tsa'
-import {
-  DeviceOsd, DeviceStatus, DockOsd, EGear, EModeCode, GatewayOsd, EDockModeCode,
-  NetworkStateQualityEnum, NetworkStateTypeEnum, RainfallEnum, DroneInDockEnum
-} from '/@/types/device'
 import pin from '/@/assets/icons/pin-2d8cf0.svg'
-import M30 from '/@/assets/icons/m30.png'
 import planeSrc from '/@/assets/icons/plane.png'
 import satelliteSrc from '/@/assets/icons/satellite.png'
-import {
-  BorderOutlined, LineOutlined, CloseOutlined, AimOutlined, ControlOutlined, TrademarkOutlined, ArrowDownOutlined,
-  ThunderboltOutlined, SignalFilled, GlobalOutlined, HistoryOutlined, CloudUploadOutlined, RocketOutlined,
-  FieldTimeOutlined, CloudOutlined, CloudFilled, FolderOpenOutlined, RobotFilled, ArrowUpOutlined, CarryOutOutlined
-} from '@ant-design/icons-vue'
 import { EDeviceTypeName, ELocalStorageKey } from '../types'
-import DockControlPanel from './g-map/DockControlPanel.vue'
-import { useDockControl } from './g-map/use-dock-control'
-import DroneControlPanel from './g-map/DroneControlPanel.vue'
-import { useConnectMqtt } from './g-map/use-connect-mqtt'
-import LivestreamOthers from './livestream-others.vue'
-import FlightAreaActionIcon from './flight-area/FlightAreaActionIcon.vue'
 import { EFlightAreaType } from '../types/flight-area'
 import { useFlightArea } from './flight-area/use-flight-area'
+import { useConnectMqtt } from './g-map/use-connect-mqtt'
 import { useFlightAreaDroneLocationEvent } from './flight-area/use-flight-area-drone-location-event'
+import { DeviceOsd, DeviceStatus, DockOsd, EModeCode, GatewayOsd } from '/@/types/device'
 
 export default defineComponent({
   components: {
@@ -453,28 +87,8 @@ export default defineComponent({
     LineOutlined,
     CloseOutlined,
     AimOutlined,
-    ControlOutlined,
-    TrademarkOutlined,
-    ThunderboltOutlined,
-    SignalFilled,
-    GlobalOutlined,
-    HistoryOutlined,
-    CloudUploadOutlined,
-    FieldTimeOutlined,
-    CloudOutlined,
-    CloudFilled,
-    FolderOpenOutlined,
-    RobotFilled,
-    ArrowUpOutlined,
-    ArrowDownOutlined,
     AirportOsdInfoModal,
     DeviceOsdInfoModal,
-    DockControlPanel,
-    DroneControlPanel,
-    CarryOutOutlined,
-    RocketOutlined,
-    LivestreamOthers,
-    FlightAreaActionIcon,
   },
   name: 'GMap',
   props: {},
@@ -501,15 +115,14 @@ export default defineComponent({
       useMouseToolHook.onChangeMapType(mapType);
     }
 
-    const str: string = '--'
+    const str: string = '--';
+
     const deviceInfo: any = reactive({
       gateway: {
         capacity_percent: str,
         transmission_signal_quality: str,
       } as GatewayOsd,
-      dock: {
-
-      } as DockOsd,
+      dock: {} as DockOsd,
       device: {
         gear: -1,
         mode_code: EModeCode.Disconnected,
@@ -540,29 +153,10 @@ export default defineComponent({
       return store.state.layerBaseInfo.share
     })
 
-    const livestreamOthersVisible = computed(() => {
-      return store.state.livestreamOthersVisible
-    })
-
-    const livestreamAgoraVisible = computed(() => {
-      return store.state.livestreamAgoraVisible
-    })
-
     const osdVisible = computed(() => {
       return store.state.osdVisible
     })
 
-    const qualityStyle = computed(() => {
-      if (deviceInfo.dock.basic_osd?.network_state?.type === NetworkStateTypeEnum.ETHERNET ||
-        (deviceInfo.dock.basic_osd?.network_state?.quality || 0) > NetworkStateQualityEnum.FAIR) {
-        return 'color: #00ee8b'
-      }
-      if ((deviceInfo.dock.basic_osd?.network_state?.quality || 0) === NetworkStateQualityEnum.FAIR) {
-        return 'color: yellow'
-      }
-      return 'color: red'
-    })
-
     watch(() => store.state.trajectoryList, (list: any) => {
       setTimeout(() => {
         if (list.length >= 2) {// 至少要有起点终点两个坐标才可以绘制轨迹
@@ -683,13 +277,6 @@ export default defineComponent({
       useMouseToolHook.mouseTool(type, getDrawCallback, flightAreaType)
     }
 
-    // dock 控制面板
-    const {
-      dockControlPanelVisible,
-      setDockControlPanelVisible,
-      onCloseControlPanel,
-    } = useDockControl()
-
     // 连接或断开drc
     useConnectMqtt()
 
@@ -707,11 +294,8 @@ export default defineComponent({
     })
 
     const { getDrawFlightAreaCallback, onFlightAreaDroneLocationWs } = useFlightArea()
-    useFlightAreaDroneLocationEvent(onFlightAreaDroneLocationWs)
 
-    function selectFlightAreaAction({ type, isCircle }: { type: EFlightAreaType, isCircle: boolean }) {
-      draw(isCircle ? MapDoodleEnum.CIRCLE : MapDoodleEnum.POLYGON, true, type)
-    }
+    useFlightAreaDroneLocationEvent(onFlightAreaDroneLocationWs)
 
     function getDrawCallback({ obj }: { obj: any }) {
       if (state.isFlightArea) {
@@ -733,6 +317,7 @@ export default defineComponent({
       }
       draw('off', false)
     }
+
     async function postPinPositionResource(obj: any) {
       const req: any = getPinPositionResource(obj)
       const userName = localStorage.getItem(ELocalStorageKey.Username) || ''
@@ -775,6 +360,7 @@ export default defineComponent({
         });
       });
     }
+
     async function postPolylineResource(obj: any) {
       const req: any = getPolylineResource(obj)
       const userName = localStorage.getItem(ELocalStorageKey.Username) || ''
@@ -845,6 +431,7 @@ export default defineComponent({
         });
       });
     }
+
     async function postPolygonResource(obj: any) {
       const req: any = getPoygonResource(obj)
       const userName = localStorage.getItem(ELocalStorageKey.Username) || ''
@@ -928,6 +515,7 @@ export default defineComponent({
         resource
       }
     }
+
     function getPolylineResource(obj: any) {
       const path = obj.getPath()
       const resource = generateLineContent(path)
@@ -938,6 +526,7 @@ export default defineComponent({
         resource
       }
     }
+
     function getPoygonResource(obj: any) {
       const path = obj.getPath()
       const resource = generatePolyContent(path)
@@ -948,11 +537,13 @@ export default defineComponent({
         resource
       }
     }
+
     function getBaseInfo(obj: any) {
       const name = obj.title
       const id = uuidv4()
       return { name, id }
     }
+
     function setLayers(resource: PostElementsBody) {
       const layers = store.state.Layers
       const layer: any = layers.find((item: any) => item.id.includes(shareId.value))
@@ -961,12 +552,7 @@ export default defineComponent({
       }
       store.commit('SET_LAYER_INFO', layers)
     }
-    function closeLivestreamOthers() {
-      store.commit('SET_LIVESTREAM_OTHERS_VISIBLE', false)
-    }
-    function closeLivestreamAgora() {
-      store.commit('SET_LIVESTREAM_AGORA_VISIBLE', false)
-    }
+
     function updateCoordinates(transformType: string, element: any) {
       const type = element.resource?.type as number
       if (element.resource) {
@@ -1031,31 +617,15 @@ export default defineComponent({
     return {
       draw,
       mouseMode,
-      livestreamOthersVisible,
-      livestreamAgoraVisible,
       osdVisible,
       pin,
       state,
-      M30,
       planeSrc,
       satelliteSrc,
       deviceInfo,
       onClickSwitchMapType,
-      EGear,
       EModeCode,
       str,
-      EDockModeCode,
-      dockControlPanelVisible,
-      setDockControlPanelVisible,
-      onCloseControlPanel,
-      NetworkStateTypeEnum,
-      NetworkStateQualityEnum,
-      RainfallEnum,
-      DroneInDockEnum,
-      closeLivestreamOthers,
-      closeLivestreamAgora,
-      qualityStyle,
-      selectFlightAreaAction,
     }
   }
 })
@@ -1134,80 +704,6 @@ export default defineComponent({
   justify-content: flex-end;
   align-items: center;
 }
-
-.osd-panel {
-  position: absolute;
-  margin-left: 10px;
-  left: 0;
-  top: 10px;
-  width: 480px;
-  background: #000;
-  color: #fff;
-  border-radius: 2px;
-  background-color: rgba(0, 0, 0, 0.8);
-}
-
-.osd>div:not(.dock-control-panel) {
-  margin-top: 5px;
-  padding: 5px;
-}
-
-.circle {
-  border-radius: 50%;
-  width: 10px;
-  height: 10px;
-}
-
-.battery-slide {
-  .capacity-percent {
-    background: #00ee8b;
-  }
-
-  .return-home {
-    background: #ff9f0a;
-  }
-
-  .landing {
-    background: #f5222d;
-  }
-
-  .white-point {
-    width: 4px;
-    height: 4px;
-    border-radius: 50%;
-    background: white;
-    bottom: -0.5px;
-  }
-
-  .battery {
-    background: #141414;
-    color: #00ee8b;
-    margin-top: -10px;
-    height: 20px;
-    width: auto;
-    border-left: 1px solid #00ee8b;
-    padding: 0 5px;
-  }
-}
-
-.battery-slide>div {
-  position: absolute;
-  min-height: 2px;
-  border-radius: 2px;
-}
-
-.liveview {
-  position: absolute;
-  color: #fff;
-  z-index: 1;
-  left: 0;
-  margin-left: 10px;
-  top: 10px;
-  text-align: center;
-  width: 800px;
-  height: 660px;
-  background: #232323;
-}
 </style>
 
 <style lang="scss">

Web/src/components/airport/components/InfoModal.vue

@@ -1,208 +1,349 @@
 <template>
-  <div v-drag-window class="content infoModal-content">
-    <div class="content-title">
-      <div class="drag-title">
-        <span>{{ osdInfo.callsign }}</span>
-      </div>
-      <a class="fz16" style="color: white;" @click="() => osdInfo.visible = false">
+  <div v-drag-window class="osd-panel fz12">
+    <div class="drag-title fz16 pl5 pr5 flex-align-center flex-row flex-justify-between"
+      style="border-bottom: 1px solid #515151; height: 10%;">
+      <span>{{ osdInfo.gateway_callsign }}</span>
+    </div>
+    <span>
+      <a style="color: white; position: absolute; top: 5px; right: 5px;" @click="() => osdInfo.visible = false">
         <CloseOutlined />
       </a>
-    </div>
-    <div class="content-osd">
-      <div class="content-osd-head">
-        <div class="content-osd-head-icon">
-          <div class="content-osd-head-icon-image">
-            <a-image :src="M30Src" :preview="false" />
+    </span>
+    <!-- 机场 -->
+    <div class="flex-display" style="border-bottom: 1px solid #515151;">
+      <div class="flex-column flex-align-stretch flex-justify-center" style="width: 60px; background: #2d2d2d;">
+        <a-tooltip :title="osdInfo.model">
+          <div class="flex-column  flex-align-center flex-justify-center" style="width: 90%;">
+            <span>
+              <RobotFilled style="font-size: 48px;" />
+            </span>
+            <span class="mt10">Dock</span>
           </div>
-          <a-tooltip :title="osdInfo.model">
-            <div class="content-osd-head-icon-text">
-              {{ osdInfo.model }}
-            </div>
-          </a-tooltip>
-        </div>
-        <div class="content-osd-head-right">
-          <div class="content-osd-head-right-top">
-            <div class="content-osd-head-right-top-style">
-              航线飞行
-            </div>
-            <div class="content-osd-head-right-top-status">
-              {{ getTextByModeCode(deviceInfo.device.mode_code) }}
-            </div>
-          </div>
-          <div class="content-osd-head-right-bottom">
-            <div class="content-osd-head-right-bottom-button">
-              <span class="openLiveButton" @click="state.deviceLiveStatus = true" v-if="!state.deviceLiveStatus">
-                开启直播
+        </a-tooltip>
+      </div>
+      <div class="osd flex-1" style="flex: 1">
+        <a-row>
+          <a-col span="16"
+            :style="deviceInfo.dock.basic_osd?.mode_code === EDockModeCode.Disconnected ? 'color: red; font-weight: 700;' : 'color: rgb(25,190,107)'">
+            {{ EDockModeCode[deviceInfo.dock.basic_osd?.mode_code] }}</a-col>
+        </a-row>
+        <a-row>
+          <a-col span="12">
+            <a-tooltip title="Accumulated Running Time">
+              <span>
+                <HistoryOutlined />
               </span>
-              <span class="openLiveButton" @click="state.deviceLiveStatus = false" v-else>
-                关闭直播
+              <span class="ml10">
+                <span v-if="deviceInfo.dock.work_osd?.acc_time >= 2592000"> {{
+                  Math.floor(deviceInfo.dock.work_osd?.acc_time / 2592000) }}m </span>
+                <span v-if="(deviceInfo.dock.work_osd?.acc_time % 2592000) >= 86400"> {{
+                  Math.floor((deviceInfo.dock.work_osd?.acc_time % 2592000) / 86400) }}d </span>
+                <span v-if="(deviceInfo.dock.work_osd?.acc_time % 2592000 % 86400) >= 3600"> {{
+                  Math.floor((deviceInfo.dock.work_osd?.acc_time % 2592000 % 86400) / 3600) }}h </span>
+                <span v-if="(deviceInfo.dock.work_osd?.acc_time % 2592000 % 86400 % 3600) >= 60"> {{
+                  Math.floor((deviceInfo.dock.work_osd?.acc_time % 2592000 % 86400 % 3600) / 60) }}min </span>
+                <span>{{ Math.floor(deviceInfo.dock.work_osd?.acc_time % 2592000 % 86400 % 3600 % 60) }} s</span>
               </span>
-            </div>
-            <div class="content-osd-head-right-bottom-text">
-              如需切换直播请停止后重新发起
-            </div>
-          </div>
-          <div class="content-osd-head-right-select">
-            <div v-if="state.deviceLiveStatus">
-              <a-select style="width: 130px;margin-right: 5px;" placeholder="摄像头" v-model:value="state.cameraValue">
-                <a-select-option v-for="item in state.cameraList" :key="item.value" :value="item.value"
-                  @click="onCameraSelect(item)">
-                  {{ item.label }}
-                </a-select-option>
-              </a-select>
-              <a-select style="width: 130px;margin-right: 5px;" placeholder="清晰度" v-model:value="state.clarityValue"
-                @select="onClaritySelect">
-                <a-select-option v-for="item in clarityList" :key="item.value" :value="item.value">
-                  {{ item.label }}
-                </a-select-option>
-              </a-select>
-              <a-button style="margin-right: 5px;" :icon="h(PlaySquareOutlined)" @click="onStart" />
-              <a-button :icon="h(PoweroffOutlined)" @click="onStop" />
-            </div>
-          </div>
-        </div>
+            </a-tooltip>
+          </a-col>
+          <a-col span="12">
+            <a-tooltip title="Activation time">
+              <span>
+                <FieldTimeOutlined />
+              </span>
+              <span class="ml10">{{ new Date((deviceInfo.dock.work_osd?.activation_time ?? 0) * 1000).toLocaleString()
+                }}
+              </span>
+            </a-tooltip>
+          </a-col>
+        </a-row>
+        <a-row>
+          <a-col span="6">
+            <a-tooltip title="Network State">
+              <span :style="qualityStyle">
+                <span v-if="deviceInfo.dock.basic_osd?.network_state?.type === NetworkStateTypeEnum.FOUR_G">
+                  <SignalFilled />
+                </span>
+                <span v-else>
+                  <GlobalOutlined />
+                </span>
+              </span>
+              <span class="ml10">{{ deviceInfo.dock.basic_osd?.network_state?.rate }} kb/s</span>
+            </a-tooltip>
+          </a-col>
+          <a-col span="6">
+            <a-tooltip title="The total number of times the dock has performed missions.">
+              <span>
+                <CarryOutOutlined />
+              </span>
+              <span class="ml10">{{ deviceInfo.dock.work_osd?.job_number }} </span>
+            </a-tooltip>
+          </a-col>
+          <a-col span="6">
+            <a-tooltip title="Media File Remain Upload">
+              <span>
+                <CloudUploadOutlined class="fz14" />
+              </span>
+              <span class="ml10">{{ deviceInfo.dock.link_osd?.media_file_detail?.remain_upload }}</span>
+            </a-tooltip>
+          </a-col>
+          <a-col span="6">
+            <a-tooltip>
+              <template #title>
+                <p>total: {{ deviceInfo.dock.basic_osd?.storage?.total }}</p>
+                <p>used: {{ deviceInfo.dock.basic_osd?.storage?.used }}</p>
+              </template>
+              <span>
+                <FolderOpenOutlined />
+              </span>
+              <span class="ml10" v-if="deviceInfo.dock.basic_osd?.storage?.total > 0">
+                <a-progress type="circle" :width="20"
+                  :percent="deviceInfo.dock.basic_osd?.storage?.used * 100 / deviceInfo.dock.basic_osd?.storage?.total"
+                  :strokeWidth="20" :showInfo="false"
+                  :strokeColor="deviceInfo.dock.basic_osd?.storage?.used * 100 / deviceInfo.dock.basic_osd?.storage?.total > 80 ? 'red' : '#00ee8b'" />
+              </span>
+            </a-tooltip>
+          </a-col>
+        </a-row>
+        <a-row>
+          <a-col span="6">
+            <a-tooltip title="Wind Speed">
+              <span>W.S</span>
+              <span class="ml10">{{ (deviceInfo.dock.basic_osd?.wind_speed ?? str) + ' m/s' }}</span>
+            </a-tooltip>
+          </a-col>
+          <a-col span="6">
+            <a-tooltip title="Rainfall">
+              <span>🌧</span>
+              <span class="ml10">{{ RainfallEnum[deviceInfo.dock.basic_osd?.rainfall] }}</span>
+            </a-tooltip>
+          </a-col>
+          <a-col span="6">
+            <a-tooltip title="Environment Temperature">
+              <span>°C</span>
+              <span class="ml10">{{ deviceInfo.dock.basic_osd?.environment_temperature }}</span>
+            </a-tooltip>
+          </a-col>
+          <a-col span="6">
+            <a-tooltip title="Dock Temperature">
+              <span>°C</span>
+              <span class="ml10">{{ deviceInfo.dock.basic_osd?.temperature }}</span>
+            </a-tooltip>
+          </a-col>
+        </a-row>
+        <a-row>
+          <a-col span="6">
+            <a-tooltip title="Dock Humidity">
+              <span>💦</span>
+              <span class="ml10">{{ deviceInfo.dock.basic_osd?.humidity }}</span>
+            </a-tooltip>
+          </a-col>
+          <a-col span="6">
+            <a-tooltip title="Working Voltage">
+              <span
+                style="border: 1px solid; border-radius: 50%; width: 18px; height: 18px; line-height: 16px; text-align: center; float: left;">V</span>
+              <span class="ml10">{{ (deviceInfo.dock.work_osd?.working_voltage ?? str) + ' mV' }}</span>
+            </a-tooltip>
+          </a-col>
+          <a-col span="6">
+            <a-tooltip title="Working Current">
+              <span
+                style="border: 1px solid; border-radius: 50%; width: 18px; height: 18px; line-height: 15px; text-align: center; float: left;">A</span>
+              <span class="ml10">{{ (deviceInfo.dock.work_osd?.working_current ?? str) + ' mA' }}</span>
+            </a-tooltip>
+          </a-col>
+          <a-col span="6">
+            <a-tooltip title="Drone in dock">
+              <span>
+                <RocketOutlined />
+              </span>
+              <span class="ml10">{{ deviceInfo.dock.basic_osd?.drone_in_dock }}</span>
+            </a-tooltip>
+          </a-col>
+        </a-row>
+        <a-row class="p5">
+          <a-col span="24">
+            <a-button type="primary" :disabled="dockControlPanelVisible" size="small"
+              @click="setDockControlPanelVisible(true)">
+              操作
+            </a-button>
+          </a-col>
+        </a-row>
       </div>
-      <div class="battery-slide">
-        <div style="background: #535759;" class="width-100"></div>
-        <div class="capacity-percent" :style="{ width: deviceInfo.device.battery.capacity_percent + '%' }"></div>
+    </div>
+    <!--  飞机-->
+    <div class="flex-display">
+      <div class="flex-column flex-align-stretch flex-justify-center" style="width: 60px;  background: #2d2d2d;">
+        <a-tooltip :title="osdInfo.model">
+          <div style="width: 90%;" class="flex-column flex-align-center flex-justify-center">
+            <span><a-image :src="M30Src" :preview="false" /></span>
+            <span>M30</span>
+          </div>
+        </a-tooltip>
       </div>
-      <LivePlayer :text="state.playerText" :url="state.playerUrl" v-if="state.deviceLiveStatus" />
-      <div class="content-osd-info">
-        <a-row style="margin-bottom: 5px;">
+      <div class="osd flex-1">
+        <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>
+        </a-row>
+        <a-row>
           <a-col span="6">
-            <div style="margin-top: -3px;" class="content-osd-info-item">
-              <a-tooltip title="遥控器信号">
-                <div style="display: flex;align-items: flex-end;">
-                  <img style="margin-right: 5px;" :src="controllerSrc" v-if="controllerSignal > 0">
-                  <img style="margin-right: 5px;" :src="controllerErrorSrc" v-else>
-                  <div>
-                    <img :src="signalThreeSrc" v-if="controllerSignal <= 3">
-                    <img :src="signalFourSrc" v-else-if="controllerSignal === 4">
-                    <img :src="signalFiveSrc" v-else-if="controllerSignal === 5">
-                  </div>
-                </div>
-              </a-tooltip>
-              <a-tooltip title="飞行器信号">
-                <div style="display: flex;align-items: flex-end;">
-                  <img style="width: 15px;margin-right: 5px;" :src="networkSrc" v-if="aircraftSignal > 0">
-                  <img style="width: 15px;margin-right: 5px;" :src="networkErrorSrc" v-else>
-                  <div>
-                    <img :src="signalThreeSrc" v-if="aircraftSignal <= 3">
-                    <img :src="signalFourSrc" v-else-if="aircraftSignal === 4">
-                    <img :src="signalFiveSrc" v-else-if="aircraftSignal === 5">
-                  </div>
-                </div>
-              </a-tooltip>
-            </div>
+            <a-tooltip title="Upward Quality">
+              <span>
+                <SignalFilled />
+                <ArrowUpOutlined style="font-size: 9px; vertical-align: top;" />
+              </span>
+              <span class="ml10">{{ deviceInfo.dock.link_osd?.sdr?.up_quality }}</span>
+            </a-tooltip>
           </a-col>
           <a-col span="6">
-            <div class="content-osd-info-item">
-              <a-tooltip title="RTK">
-                <div style="display: flex;align-items: center;margin-right: 5px;">
-                  <img style="width: 24px;margin-right: 5px;" :src="rtkSrc" v-if="RTK > 0">
-                  <img style="width: 24px; margin-right: 5px;" :src="rtkErrorSrc" v-else>
-                  <div>
-                    {{ RTK }}
-                  </div>
-                </div>
-              </a-tooltip>
-              <a-tooltip title="GPS">
-                <div style="display: flex;align-items: center;">
-                  <img style="margin-right: 5px;" :src="gpsSrc" v-if="GPS > 0">
-                  <img style="margin-right: 5px;" :src="gpsErrorSrc" v-else>
-                  <div>
-                    {{ GPS }}
-                  </div>
-                </div>
-              </a-tooltip>
-            </div>
+            <a-tooltip title="Downward Quality">
+              <span>
+                <SignalFilled />
+                <ArrowDownOutlined style="font-size: 9px; vertical-align: top;" />
+              </span>
+              <span class="ml10">{{ deviceInfo.dock.link_osd?.sdr?.down_quality }}</span>
+            </a-tooltip>
           </a-col>
           <a-col span="6">
-            <a-tooltip title="电量">
-              <div class="content-osd-info-item">
-                <div style="margin-right: 5px;">
-                  <!-- <img :src="batteryOneSrc" v-if="capacity >= 75">
-                  <img :src="batteryTwoSrc" v-else-if="capacity >= 50 && capacity < 75">
-                  <img :src="batteryThreeSrc" v-else-if="capacity >= 25 && capacity < 50">
-                  <img :src="batteryFourSrc" v-else-if="capacity < 25"> -->
-                </div>
-                <div>
-                  {{ capacity + '%' }}
-                </div>
-              </div>
+            <a-tooltip title="Drone Battery Level">
+              <span>
+                <ThunderboltOutlined class="fz14" />
+              </span>
+              <span class="ml10">{{ deviceInfo.device && deviceInfo.device.battery.capacity_percent !== str ?
+                deviceInfo.device?.battery.capacity_percent + ' %' : str }}</span>
             </a-tooltip>
           </a-col>
           <a-col span="6">
-            <a-tooltip title="风向速度">
-              <div class="content-osd-info-item">
-                <img style="margin-right: 5px;" :src="windSrc">
-                <div style="font-weight: bold;margin-right: 5px;">
-                  W.S
-                </div>
-                <div>
-                  {{ windSpeed }}
-                </div>
-              </div>
+            <a-tooltip>
+              <template #title>
+                <p>total: {{ deviceInfo.device?.storage?.total }}</p>
+                <p>used: {{ deviceInfo.device?.storage?.used }}</p>
+              </template>
+              <span>
+                <FolderOpenOutlined />
+              </span>
+              <span class="ml10" v-if="deviceInfo.device?.storage?.total > 0">
+                <a-progress type="circle" :width="20"
+                  :percent="deviceInfo.device?.storage?.used * 100 / deviceInfo.device?.storage?.total"
+                  :strokeWidth="20" :showInfo="false"
+                  :strokeColor="deviceInfo.device?.storage?.used * 100 / deviceInfo.device?.storage?.total > 80 ? 'red' : '#00ee8b'" />
+              </span>
             </a-tooltip>
           </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="海拔高度">
-              <div class="content-osd-info-item">
-                <div style="font-weight: bold;margin-right: 5px;">
-                  ASL
-                </div>
-                <div>
-                  {{ ASL }}
-                </div>
-              </div>
+            <a-tooltip title="GPS">
+              <span>GPS</span>
+              <span class="ml10">{{ deviceInfo.device ? deviceInfo.device.position_state.gps_number : str }}</span>
             </a-tooltip>
           </a-col>
           <a-col span="6">
-            <a-tooltip title="离地高度">
-              <div class="content-osd-info-item">
-                <div style="font-weight: bold;margin-right: 5px;">
-                  AGL
-                </div>
-                <div>
-                  {{ AGL }}
-                </div>
-              </div>
+            <a-tooltip title="RTK">
+              <span>
+                <TrademarkOutlined class="fz14" />
+              </span>
+              <span class="ml10">{{ deviceInfo.device ? deviceInfo.device.position_state.rtk_number : str }}</span>
             </a-tooltip>
           </a-col>
+        </a-row>
+        <a-row>
           <a-col span="6">
-            <a-tooltip title="水平速度">
-              <div class="content-osd-info-item">
-                <div style="font-weight: bold;margin-right: 5px;">
-                  H.S
-                </div>
-                <div>
-                  {{ HS }}
-                </div>
-              </div>
+            <a-tooltip title="Flight Mode">
+              <span>
+                <ControlOutlined class="fz16" />
+              </span>
+              <span class="ml10">{{ deviceInfo.device ? EGear[deviceInfo.device?.gear] : str }}</span>
             </a-tooltip>
           </a-col>
           <a-col span="6">
-            <a-tooltip title="当前高度">
-              <div class="content-osd-info-item">
-                <img style="margin-right: 5px;" :src="homeSrc">
-                <div>
-                  {{ homeDistance }}
-                </div>
-              </div>
+            <a-tooltip title="Altitude above sea level">
+              <span>ASL</span>
+              <span class="ml10">{{ !deviceInfo.device || deviceInfo.device.height === str ? str :
+                deviceInfo.device?.height.toFixed(2) + ' m' }}</span>
+            </a-tooltip>
+          </a-col>
+          <a-col span="6">
+            <a-tooltip title="Altitude above takeoff level">
+              <span>ALT</span>
+              <span class="ml10">{{ !deviceInfo.device || 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
+                style="border: 1px solid; border-radius: 50%; width: 18px; height: 18px; line-height: 15px; text-align: center;  display: block; float: left;">H</span>
+              <span class="ml10">{{ !deviceInfo.device || 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>
+              <span class="ml10">{{ !deviceInfo.device || deviceInfo.device?.horizontal_speed === str ? str :
+                deviceInfo.device?.horizontal_speed.toFixed(2) + ' m/s' }}</span>
+            </a-tooltip>
+          </a-col>
+          <a-col span="6">
+            <a-tooltip title="Vertical Speed">
+              <span>V.S</span>
+              <span class="ml10">{{ !deviceInfo.device || 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>
+              <span class="ml10">{{ !deviceInfo.device || deviceInfo.device.wind_speed === str ? str :
+                (deviceInfo.device?.wind_speed / 10).toFixed(2) + ' m/s' }}</span>
             </a-tooltip>
           </a-col>
         </a-row>
       </div>
     </div>
+    <div class="battery-slide" v-if="deviceInfo.device && deviceInfo.device.battery.remain_flight_time !== 0"
+      style="border: 1px solid red">
+      <div style="background: #535759;" class="width-100"></div>
+      <div class="capacity-percent" :style="{ width: deviceInfo.device.battery.capacity_percent + '%' }"></div>
+      <div class="return-home" :style="{ width: deviceInfo.device.battery.return_home_power + '%' }"></div>
+      <div class="landing" :style="{ width: deviceInfo.device.battery.landing_power + '%' }"></div>
+      <div class="white-point" :style="{ left: deviceInfo.device.battery.landing_power + '%' }"></div>
+      <div class="battery" :style="{ left: deviceInfo.device.battery.capacity_percent + '%' }">
+        {{ Math.floor(deviceInfo.device.battery.remain_flight_time / 60) }}:
+        {{ 10 > (deviceInfo.device.battery.remain_flight_time % 60) ? '0' : '' }}{{
+          deviceInfo.device.battery.remain_flight_time % 60 }}
+      </div>
+    </div>
+    <!-- 机场控制面板 -->
+    <DockControlPanel v-if="dockControlPanelVisible" :sn="osdInfo.gateway_sn" :deviceInfo="deviceInfo"
+      @close-control-panel="onCloseControlPanel" />
+    <!-- 飞行指令 -->
+    <DroneControlPanel :sn="osdInfo.gateway_sn" :deviceInfo="deviceInfo" :payloads="osdInfo.payloads" />
   </div>
 </template>
 
 <script lang="ts" setup>
 import { h, computed, reactive, onMounted } from 'vue';
 import { message } from 'ant-design-vue';
-import { CloseOutlined, PlaySquareOutlined, PoweroffOutlined } from '@ant-design/icons-vue'
+import {
+  BorderOutlined, LineOutlined, CloseOutlined, AimOutlined, ControlOutlined, TrademarkOutlined, ArrowDownOutlined,
+  ThunderboltOutlined, SignalFilled, GlobalOutlined, HistoryOutlined, CloudUploadOutlined, RocketOutlined,
+  FieldTimeOutlined, CloudOutlined, CloudFilled, FolderOpenOutlined, RobotFilled, ArrowUpOutlined, CarryOutOutlined
+} from '@ant-design/icons-vue'
+
 import LivePlayer from '/@/components/livePlayer/index.vue';
 import M30Src from '/@/assets/icons/m30.png';
 import controllerSrc from '../icons/info/controller.svg';
@@ -224,7 +365,13 @@ import windSrc from '../icons/info/wind.svg';
 import homeSrc from '../icons/info/home.svg';
 import { CURRENT_CONFIG as config } from '/@/api/http/config';
 import { getLiveCapacity, startLivestream, stopLivestream } from '/@/api/manage';
-import { getTextByModeCode } from '/@/utils/index'
+import DockControlPanel from '../../g-map/DockControlPanel.vue'
+import DroneControlPanel from '../../g-map/DroneControlPanel.vue'
+import {
+  DeviceOsd, DeviceStatus, DockOsd, EGear, EModeCode, GatewayOsd, EDockModeCode,
+  NetworkStateQualityEnum, NetworkStateTypeEnum, RainfallEnum, DroneInDockEnum
+} from '/@/types/device'
+import { useDockControl } from '../../g-map/use-dock-control';
 
 interface Props {
   osdInfo: any
@@ -235,6 +382,13 @@ const props = withDefaults(defineProps<Props>(), {
 
 });
 
+// dock 控制面板
+const {
+  dockControlPanelVisible,
+  setDockControlPanelVisible,
+  onCloseControlPanel,
+} = useDockControl()
+
 // 遥控器信号
 const controllerSignal = computed(() => {
   const info = props.deviceInfo.gateway;
@@ -255,70 +409,18 @@ const aircraftSignal = computed(() => {
   }
 });
 
-const RTK = computed(() => {
-  const info = props.deviceInfo.device;
-  return info.position_state.rtk_number;
-});
-
-const GPS = computed(() => {
-  const info = props.deviceInfo.device;
-  return info.position_state.gps_number;
-});
-
-// 电池容量
-const capacity = computed(() => {
-  const info = props.deviceInfo.device;
-  if (info) {
-    return info.battery.capacity_percent;
-  } else {
-    return 0;
-  }
-});
-
-const windSpeed = computed(() => {
-  const info = props.deviceInfo.device;
-  if (info.wind_speed === '--') {
-    return info.wind_speed;
-  } else {
-    return (info.wind_speed / 10).toFixed(2) + ' m/s';
-  }
-});
-
-const ASL = computed(() => {
-  const info = props.deviceInfo.device;
-  if (info.height === '--') {
-    return info.height;
-  } else {
-    return info.height.toFixed(2) + ' m';
-  }
-});
-
-const AGL = computed(() => {
-  const info = props.deviceInfo.device;
-  if (info.elevation === '--') {
-    return info.elevation;
-  } else {
-    return info.elevation.toFixed(2) + ' m';
-  }
-});
+const str: string = '--'
 
-const HS = computed(() => {
-  const info = props.deviceInfo.device;
-  if (info.horizontal_speed === '--') {
-    return info.horizontal_speed;
-  } else {
-    return info.horizontal_speed.toFixed(2) + ' m/s';
+const qualityStyle = computed(() => {
+  if (props.deviceInfo.dock.basic_osd?.network_state?.type === NetworkStateTypeEnum.ETHERNET ||
+    (props.deviceInfo.dock.basic_osd?.network_state?.quality || 0) > NetworkStateQualityEnum.FAIR) {
+    return 'color: #00ee8b'
   }
-});
-
-const homeDistance = computed(() => {
-  const info = props.deviceInfo.device;
-  if (info.home_distance === '--') {
-    return info.home_distance;
-  } else {
-    return info.home_distance.toFixed(2) + ' m';
+  if ((props.deviceInfo.dock.basic_osd?.network_state?.quality || 0) === NetworkStateQualityEnum.FAIR) {
+    return 'color: yellow'
   }
-});
+  return 'color: red'
+})
 
 interface SelectOption {
   value: any,
@@ -374,27 +476,27 @@ const state: State = reactive({
 })
 
 const fetchLiveCapacity = async () => {
-  try {
-    const res = await getLiveCapacity({});
-    if (res.code === 0) {
-      const deviceInfo = res.data.filter((item: any) => item.sn === props.osdInfo.sn)[0];
-      const cameras_list = deviceInfo.cameras_list || [];
-      const cameraList = cameras_list.map((item: any) => {
-        return {
-          label: item.name,
-          value: item.index,
-          more: item.videos_list
-        }
-      })
-      state.cameraList = cameraList;
-    }
-  } catch (e: any) {
-    console.error(e);
-  }
+  // try {
+  //   const res = await getLiveCapacity({});
+  //   if (res.code === 0) {
+  //     const deviceInfo = res.data.filter((item: any) => item.sn === props.osdInfo.sn)[0];
+  //     const cameras_list = deviceInfo.cameras_list || [];
+  //     const cameraList = cameras_list.map((item: any) => {
+  //       return {
+  //         label: item.name,
+  //         value: item.index,
+  //         more: item.videos_list
+  //       }
+  //     })
+  //     state.cameraList = cameraList;
+  //   }
+  // } catch (e: any) {
+  //   console.error(e);
+  // }
 }
 
 onMounted(async () => {
-  await fetchLiveCapacity()
+  // await fetchLiveCapacity()
 })
 
 const onCameraSelect = (record: SelectOption) => {
@@ -467,167 +569,64 @@ const onStop = async () => {
 </script>
 
 <style lang="scss" scoped>
-.content {
-  width: 420px;
-  color: #fff;
-  border-radius: 4px;
-  overflow: hidden;
-  // background-color: rgba(0, 0, 0, 0.8);
-  background-color: #232323;
+.osd-panel {
   position: absolute;
-  left: 10px;
+  margin-left: 10px;
+  left: 0;
   top: 10px;
-
-  &-title {
-    padding: 5px;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    border: 1px solid #535759;
-  }
-
-  &-osd {
-    font-size: 12px;
-
-    &-head {
-      display: flex;
-
-      &-icon {
-        width: 80px;
-        padding: 5px;
-        background: #3d3d3d;
-        display: flex;
-        flex-direction: column;
-        justify-content: center;
-        align-items: center;
-
-        &-image {
-          width: 80%;
-        }
-
-        &-text {
-          text-align: center;
-          white-space: nowrap;
-          overflow: hidden;
-        }
-      }
-
-      &-right {
-        width: 100%;
-        padding: 5px;
-
-        &-top {
-          margin: 10px 0;
-          display: flex;
-          align-items: center;
-
-          &-style {
-            width: 100px;
-            color: #2a994b;
-            border-right: 1px solid #535759;
-            margin-right: 5px;
-          }
-
-          &-status {
-            flex: 1;
-            padding-left: 5px;
-            background: #4a4d4e;
-          }
-        }
-
-        &-bottom {
-          display: flex;
-          align-items: center;
-
-          &-button {
-            width: 100px;
-            border-right: 1px solid #535759;
-            margin-right: 5px;
-
-            .openLiveButton {
-              padding: 2px 4px;
-              border: 1.5px solid #535759;
-              border-radius: 2px;
-              cursor: pointer;
-            }
-          }
-
-          &-text {
-            color: #535759;
-          }
-        }
-
-        &-select {
-          margin: 10px 0 5px;
-        }
-      }
-    }
-
-    &-info {
-      padding: 5px;
-
-      &-item {
-        display: flex;
-        align-items: center;
-
-        img {
-          width: 13px;
-          height: 13px;
-        }
-      }
-    }
-  }
+  width: 480px;
+  background: #000;
+  color: #fff;
+  border-radius: 2px;
+  background-color: rgba(0, 0, 0, 0.8);
 }
-</style>
-
-<style lang="scss">
-.infoModal-content {
 
-  // 修改按钮样式
-  .ant-btn {
-    color: #FFFFFF;
-    background: transparent;
-    border: 1px solid #535759;
+.osd>div:not(.dock-control-panel) {
+  margin-top: 5px;
+  padding: 5px;
+}
 
-    &:hover {
-      color: #fff;
-      background-color: transparent;
-      border-color: #535759;
-    }
+.circle {
+  border-radius: 50%;
+  width: 10px;
+  height: 10px;
+}
 
-    &:focus {
-      color: #fff;
-      background-color: transparent;
-      border-color: #535759;
-    }
+.battery-slide {
+  .capacity-percent {
+    background: #00ee8b;
   }
 
-  .ant-select-selector {
-    color: #FFFFFF;
-    background: transparent !important;
-    border: 1px solid #535759 !important;
-    box-shadow: none !important;
+  .return-home {
+    background: #ff9f0a;
   }
 
-  .ant-select-arrow {
-    color: #fff;
+  .landing {
+    background: #f5222d;
   }
 
-  .ant-select-dropdown {
-    background-color: transparent;
-
-    .ant-select-item {
-      background-color: #000000 !important;
-      color: #fff;
-
-      &:hover {
-        background-color: #4a4a4a !important;
-      }
-    }
+  .white-point {
+    width: 4px;
+    height: 4px;
+    border-radius: 50%;
+    background: white;
+    bottom: -0.5px;
+  }
 
-    .ant-select-item-option-selected {
-      background-color: #3a3a3a;
-    }
+  .battery {
+    background: #141414;
+    color: #00ee8b;
+    margin-top: -10px;
+    height: 20px;
+    width: auto;
+    border-left: 1px solid #00ee8b;
+    padding: 0 5px;
   }
 }
+
+.battery-slide>div {
+  position: absolute;
+  min-height: 2px;
+  border-radius: 2px;
+}
 </style>

Web/src/components/airport/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="content" @click="onClickLocation">
+  <div class="content">
     <div class="content-title">
       <div class="content-title-left">
         <img class="content-title-left-icon" :src="taskSrc">
@@ -90,8 +90,6 @@ import infoSelectedSrc from './icons/info_selected.svg';
 import { useMyStore } from '/@/store';
 import { getTextByModeCode, getTextByDockModeCode, getTextByDockTaskCode } from '/@/utils/index'
 import { OnlineDevice, EModeCode, EDockModeCode } from '/@/types/device';
-import { wgs84togcj02 } from '/@/vendors/coordtransform'
-import { getRoot } from '/@/root';
 
 interface Props {
   dock: OnlineDevice,
@@ -102,8 +100,6 @@ const props = withDefaults(defineProps<Props>(), {
 
 });
 
-const root: any = getRoot()
-
 const store = useMyStore()
 
 const deviceInfo = computed(() => store.state.deviceState.deviceInfo);
@@ -131,15 +127,6 @@ const hangarLogInfo = computed(() => {
     return ''
   }
 })
-
-const onClickLocation = () => {
-  const sn = props.dock.gateway.sn;
-  const gatewayInfo = store.state.deviceState.gatewayInfo[sn];
-  if (gatewayInfo) {
-    const coordinate = wgs84togcj02(gatewayInfo.longitude, gatewayInfo.latitude);
-    root.$map.setCenter(coordinate)
-  }
-}
 </script>
 
 <style lang="scss" scoped>

Web/src/components/flight-area/use-flight-area.ts

@@ -4,7 +4,7 @@ import { getRoot } from '/@/root'
 import { PostFlightAreaBody, saveFlightArea } from '/@/api/flight-area'
 import { generateCircleContent, generatePolyContent } from '/@/utils/map-layer-utils'
 import { GeojsonCoordinate } from '/@/utils/genjson'
-import { gcj02towgs84, wgs84togcj02 } from '/@/vendors/coordtransform.js'
+import { gcj02towgs84, wgs84togcj02 } from '../../vendors/coordtransform'
 import { uuidv4 } from '/@/utils/uuid'
 import { CommonHostWs } from '/@/websocket'
 import { FlightAreasDroneLocation } from '/@/types/flight-area'
@@ -102,16 +102,16 @@ export function useFlightArea() {
     createFlightArea(obj)
   }
 
-  const getWgs84 = <T extends GeojsonCoordinate | GeojsonCoordinate[]>(coordinate: T): T => {
+  const getWgs84 = (coordinate: any): any => {
     if (coordinate[0] instanceof Array) {
-      return (coordinate as GeojsonCoordinate[]).map(c => gcj02towgs84(c[0], c[1])) as T
+      return (coordinate as GeojsonCoordinate[]).map(c => gcj02towgs84(c[0], c[1]))
     }
     return gcj02towgs84(coordinate[0], coordinate[1])
   }
 
-  const getGcj02 = <T extends GeojsonCoordinate | GeojsonCoordinate[]>(coordinate: T): T => {
+  const getGcj02 = (coordinate: any): any => {
     if (coordinate[0] instanceof Array) {
-      return (coordinate as GeojsonCoordinate[]).map(c => wgs84togcj02(c[0], c[1])) as T
+      return (coordinate as GeojsonCoordinate[]).map(c => wgs84togcj02(c[0], c[1]))
     }
     return wgs84togcj02(coordinate[0], coordinate[1])
   }

Web/src/components/g-map/use-connect-mqtt.ts

@@ -21,7 +21,7 @@ type StatusOptions = {
   status: 'pending';
 }
 
-export function useConnectMqtt () {
+export function useConnectMqtt() {
   const store = useMyStore()
   const dockOsdVisible = computed(() => {
     return store.state.osdVisible && store.state.osdVisible.visible && store.state.osdVisible.is_dock

Web/src/components/onLineDevice/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="content" @click="onClickLocation">
+  <div class="content">
     <div class="content-info">
       <div class="content-info-left">
         <div class="content-info-left-style">
@@ -76,8 +76,6 @@ import infoSelectedSrc from './icons/info_selected.svg';
 import { useMyStore } from '/@/store';
 import { getTextByModeCode } from '/@/utils/index'
 import { OnlineDevice, EModeCode } from '/@/types/device';
-import { wgs84togcj02 } from '/@/vendors/coordtransform'
-import { getRoot } from '/@/root';
 
 interface Props {
   device: OnlineDevice,
@@ -88,8 +86,6 @@ const props = withDefaults(defineProps<Props>(), {
 
 });
 
-const root: any = getRoot()
-
 const store = useMyStore()
 
 const deviceInfo = computed(() => store.state.deviceState.deviceInfo)
@@ -113,15 +109,6 @@ const capacity = computed(() => {
     return 0;
   }
 });
-
-const onClickLocation = () => {
-  const sn = props.device.gateway.sn;
-  const gatewayInfo = store.state.deviceState.gatewayInfo[sn];
-  if (gatewayInfo) {
-    const coordinate = wgs84togcj02(gatewayInfo.longitude, gatewayInfo.latitude);
-    root.$map.setCenter(coordinate)
-  }
-}
 </script>
 
 <style lang="scss" scoped>

Web/src/hooks/use-g-map-trajectory.ts

@@ -1,7 +1,7 @@
 import { getRoot } from '/@/root'
 import hardstandSrc from '/@/assets/icons/hardstand.png'
 import droneIcon from '/@/assets/icons/drone.png'
-import { wgs84togcj02 } from '/@/vendors/coordtransform'
+import { wgs84togcj02 } from '../vendors/coordtransform'
 import rootStore from '/@/store'
 
 export function useGMapTrajectory() {

Web/src/pages/page-web/projects/layer/index.vue

@@ -76,7 +76,7 @@ import {
   updateElementsReq
 } from '/@/api/layer'
 import { useMyStore } from '/@/store'
-import { gcj02towgs84, wgs84togcj02 } from '/@/vendors/coordtransform'
+import { gcj02towgs84, wgs84togcj02 } from '../../../../vendors/coordtransform'
 import { getRoot } from '/@/root'
 
 const root = getRoot()
@@ -235,7 +235,7 @@ function updateMapElement(
   }
 }
 
-function selectLayer(keys: string[], e) {
+function selectLayer(keys: string[], e: any) {
   visible.value = false
   state.photoDrawerVisible = false
   if (e.selected) {

Web/src/pages/page-web/projects/media/detail/components/FileInfo.vue

@@ -148,7 +148,7 @@ import { useGMapManage } from '/@/hooks/use-g-map';
 import { apis } from '/@/api/custom';
 import { downloadFile } from '/@/utils/common';
 import { downloadMediaFile } from '/@/api/media';
-import { wgs84togcj02 } from '/@/vendors/coordtransform'
+import { wgs84togcj02 } from '../../../../../../vendors/coordtransform'
 import { getWorkspaceId } from '/@/utils/index'
 
 interface Props {

Web/src/pages/page-web/projects/mediaInfo/index.vue

@@ -113,7 +113,7 @@ import { EnvironmentOutlined } from '@ant-design/icons-vue';
 import Panoramic from '/@/components/panoramic/index.vue';
 import { useGMapManage } from '/@/hooks/use-g-map';
 import { apis } from '/@/api/custom';
-import { wgs84togcj02 } from '/@/vendors/coordtransform'
+import { wgs84togcj02 } from '../../../../vendors/coordtransform'
 import router from '/@/router';
 
 const state = reactive({

Web/src/pages/page-web/projects/trajectory/index.vue

@@ -23,7 +23,7 @@ import Search from './components/Search.vue';
 import { apis } from '/@/api/custom/index';
 import router from '/@/router';
 import { useMyStore } from '/@/store';
-import { wgs84togcj02 } from '/@/vendors/coordtransform'
+import { wgs84togcj02 } from '../../../../vendors/coordtransform'
 
 const store = useMyStore()
 

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

@@ -1,5 +1,5 @@
 <template>
-  <div class="project-tsa-wrapper ">
+  <div class="project-tsa-wrapper">
     <div class="scrollbar" :style="{ height: '100%' }">
       <a-collapse style="background: #232323;" :bordered="false" expandIconPosition="right" accordion
         v-model:activeKey="state.activeKey">
@@ -8,8 +8,11 @@
             <a-empty :image="noData" :image-style="{ height: '60px' }" />
           </div>
           <div v-else>
-            <div :style="{ 'margin-top': index === 0 ? '' : '10px' }" v-for="(dock, index) in onlineDocks.data"
-              :key="dock.sn">
+            <div :class="[
+              'item-border',
+              dock.sn === state.selectedSn ? 'item-border-selected' : ''
+            ]" :style="{ 'margin-top': index === 0 ? '' : '10px' }" v-for="(dock, index) in onlineDocks.data"
+              :key="dock.sn" @click="handleclickItem(dock)">
               <Airport :dock="dock" :onClickLookInfo="() => switchVisible(dock, true)" />
             </div>
           </div>
@@ -19,8 +22,11 @@
             <a-empty :image="noData" :image-style="{ height: '60px' }" />
           </div>
           <div v-else>
-            <div :style="{ 'margin-top': index === 0 ? '' : '10px' }" v-for="(device, index) in onlineDevices.data"
-              :key="device.sn">
+            <div :class="[
+              'item-border',
+              device.sn === state.selectedSn ? 'item-border-selected' : ''
+            ]" :style="{ 'margin-top': index === 0 ? '' : '10px' }" v-for="(device, index) in onlineDevices.data"
+              :key="device.sn" @click="handleclickItem(device)">
               <OnLineDevice :device="device" :onClickLookInfo="() => switchVisible(device, false)" />
             </div>
           </div>
@@ -36,17 +42,17 @@
 
 <script lang="ts" setup>
 import { computed, onMounted, reactive, ref, watch } from 'vue'
-import { RocketOutlined, EyeInvisibleOutlined, EyeOutlined, RobotOutlined, DoubleRightOutlined } from '@ant-design/icons-vue'
 import Layer from './layer/index.vue'
-import noData from '/@/assets/icons/no-data.png'
-import { useMyStore } from '/@/store'
-import { getDeviceTopo, getUnreadDeviceHms, updateDeviceHms } from '/@/api/manage'
-import { EHmsLevel } from '/@/types/enums'
 import Airport from '/@/components/airport/index.vue'
 import OnLineDevice from '/@/components/onLineDevice/index.vue'
-import { OnlineDevice, EModeCode, EDockModeCode } from '/@/types/device'
-import { EDeviceTypeName } from '/@/types'
+import noData from '/@/assets/icons/no-data.png'
 import { getWorkspaceId } from '/@/utils/index'
+import { useMyStore } from '/@/store'
+import { wgs84togcj02 } from '../../../vendors/coordtransform'
+import { getDeviceTopo, getUnreadDeviceHms } from '/@/api/manage'
+import { OnlineDevice, EModeCode } from '/@/types/device'
+import { EDeviceTypeName } from '/@/types'
+import { getRoot } from '/@/root';
 
 const store = useMyStore()
 const workspaceId = ref(getWorkspaceId())
@@ -54,6 +60,8 @@ const osdVisible = computed(() => store.state.osdVisible)
 const hmsVisible = new Map<string, boolean>()
 const scorllHeight = ref()
 
+const root: any = getRoot()
+
 const onlineDevices = reactive({
   data: [] as OnlineDevice[]
 })
@@ -64,7 +72,7 @@ const onlineDocks = reactive({
 
 const state = reactive({
   activeKey: -1,
-  selectedDevice: '',
+  selectedSn: '',
 })
 
 const mapClickElement = computed(() => store.state.mapClickElement)
@@ -187,30 +195,22 @@ function getOnlineDeviceHms() {
   })
 }
 
-function readHms(visiable: boolean, sn: string) {
-  if (!visiable) {
-    updateDeviceHms(workspaceId.value, sn).then(res => {
-      if (res.code === 0) {
-        delete hmsInfo.value[sn]
-      }
-    })
+const handleclickItem = (record: any) => {
+  const sn = record.sn;
+  if (state.selectedSn === sn) {
+    return state.selectedSn = '';
+  }
+  state.selectedSn = sn;
+  const gatewaySn = record.gateway.sn;
+  const gatewayInfo = store.state.deviceState.gatewayInfo[gatewaySn];
+  if (gatewayInfo) {
+    const coordinate = wgs84togcj02(gatewayInfo.longitude, gatewayInfo.latitude);
+    root.$map.setCenter(coordinate)
   }
 }
 </script>
 
 <style lang="scss">
-.airport-item {
-  background: #3c3c3c;
-  width: 100%;
-  height: 100px;
-  box-sizing: border-box;
-  padding-top: 10px;
-  border-radius: 2px;
-  border: 2px solid transparent;
-  cursor: pointer;
-  margin-top: 10px;
-}
-
 .project-tsa-wrapper> :first-child {
   height: 50px;
   line-height: 50px;
@@ -236,115 +236,13 @@ function readHms(visiable: boolean, sn: string) {
   padding-left: 14px;
 }
 
-.text-hidden {
-  overflow: hidden !important;
-  text-overflow: ellipsis !important;
-  white-space: nowrap;
-  -o-text-overflow: ellipsis;
-}
-
-.font-bold {
-  font-weight: 700;
-}
-
-.battery-slide {
-  width: 100%;
-
-  .capacity-percent {
-    background: #00ee8b;
-  }
-
-  .return-home {
-    background: #ff9f0a;
-  }
-
-  .landing {
-    background: #f5222d;
-  }
-
-  .battery {
-    background: white;
-    border-radius: 1px;
-    width: 8px;
-    height: 4px;
-    margin-top: -3px;
-  }
-}
-
-.battery-slide>div {
-  position: relative;
-  margin-top: -2px;
-  min-height: 2px;
-  border-radius: 2px;
-  white-space: nowrap;
-}
-
-.disable {
-  cursor: not-allowed;
-}
-
-.notice-blink {
-  background: $success;
-  animation: blink 500ms infinite;
-}
-
-.caution-blink {
-  background: orange;
-  animation: blink 500ms infinite;
-}
-
-.warn-blink {
-  background: red;
-  animation: blink 500ms infinite;
-}
-
-.notice {
-  background: $success;
-  overflow: hidden;
-  cursor: pointer;
-}
-
-.caution {
-  background: orange;
-  cursor: pointer;
-  overflow: hidden;
-}
-
-.warn {
-  background: red;
-  cursor: pointer;
+.item-border {
+  border-radius: 4px;
+  border: 2px solid transparent;
   overflow: hidden;
-}
-
-.word-loop {
-  white-space: nowrap;
-  display: inline-block;
-  animation: 10s loop linear infinite normal;
-}
-
-@keyframes blink {
-  from {
-    opacity: 1;
-  }
-
-  50% {
-    opacity: 0.35;
-  }
-
-  to {
-    opacity: 1;
-  }
-}
-
-@keyframes loop {
-  0% {
-    transform: translateX(20px);
-    -webkit-transform: translateX(20px);
-  }
 
-  100% {
-    transform: translateX(-100%);
-    -webkit-transform: translateX(-100%);
+  &-selected {
+    border-color: #1fa3f6;
   }
 }
 </style>

Web/src/vendors/coordtransform.js → Web/src/vendors/coordtransform.ts

@@ -13,7 +13,7 @@ const ee = 0.00669342162296594323;
  * @param lat
  * @returns {*[]}
  */
-export function wgs84togcj02(lng, lat) {
+export function wgs84togcj02(lng: number, lat: number) {
     if (out_of_china(lng, lat)) {
         return [lng, lat]
     }
@@ -38,27 +38,27 @@ export function wgs84togcj02(lng, lat) {
  * @param lat
  * @returns {*[]}
  */
- export function gcj02towgs84(lng, lat) {
+export function gcj02towgs84(lng: number, lat: number) {
     var lat = +lat;
     var lng = +lng;
     if (out_of_china(lng, lat)) {
-      return [lng, lat]
+        return [lng, lat]
     } else {
-      var dlat = transformlat(lng - 105.0, lat - 35.0);
-      var dlng = transformlng(lng - 105.0, lat - 35.0);
-      var radlat = lat / 180.0 * PI;
-      var magic = Math.sin(radlat);
-      magic = 1 - ee * magic * magic;
-      var sqrtmagic = Math.sqrt(magic);
-      dlat = (dlat * 180.0) / ((a * (1 - ee)) / (magic * sqrtmagic) * PI);
-      dlng = (dlng * 180.0) / (a / sqrtmagic * Math.cos(radlat) * PI);
-      var mglat = lat + dlat;
-      var mglng = lng + dlng;
-      return [lng * 2 - mglng, lat * 2 - mglat]
+        var dlat = transformlat(lng - 105.0, lat - 35.0);
+        var dlng = transformlng(lng - 105.0, lat - 35.0);
+        var radlat = lat / 180.0 * PI;
+        var magic = Math.sin(radlat);
+        magic = 1 - ee * magic * magic;
+        var sqrtmagic = Math.sqrt(magic);
+        dlat = (dlat * 180.0) / ((a * (1 - ee)) / (magic * sqrtmagic) * PI);
+        dlng = (dlng * 180.0) / (a / sqrtmagic * Math.cos(radlat) * PI);
+        var mglat = lat + dlat;
+        var mglng = lng + dlng;
+        return [lng * 2 - mglng, lat * 2 - mglat]
     }
 }
 
-function transformlat(lng, lat) {
+function transformlat(lng: number, lat: number) {
     var ret = -100.0 + 2.0 * lng + 3.0 * lat + 0.2 * lat * lat + 0.1 * lng * lat + 0.2 * Math.sqrt(Math.abs(lng));
     ret += (20.0 * Math.sin(6.0 * lng * PI) + 20.0 * Math.sin(2.0 * lng * PI)) * 2.0 / 3.0;
     ret += (20.0 * Math.sin(lat * PI) + 40.0 * Math.sin(lat / 3.0 * PI)) * 2.0 / 3.0;
@@ -66,7 +66,7 @@ function transformlat(lng, lat) {
     return ret
 }
 
-export function transformlng(lng, lat) {
+export function transformlng(lng: number, lat: number) {
     var ret = 300.0 + lng + 2.0 * lat + 0.1 * lng * lng + 0.1 * lng * lat + 0.1 * Math.sqrt(Math.abs(lng));
     ret += (20.0 * Math.sin(6.0 * lng * PI) + 20.0 * Math.sin(2.0 * lng * PI)) * 2.0 / 3.0;
     ret += (20.0 * Math.sin(lng * PI) + 40.0 * Math.sin(lng / 3.0 * PI)) * 2.0 / 3.0;
@@ -80,6 +80,6 @@ export function transformlng(lng, lat) {
  * @param lat
  * @returns {boolean}
  */
-function out_of_china(lng, lat) {
+function out_of_china(lng: number, lat: number) {
     return (lng < 72.004 || lng > 137.8347) || ((lat < 0.8293 || lat > 55.8271) || false);
 }

Web/tsconfig.json

@@ -27,6 +27,5 @@
     "src/**/*.d.ts",
     "src/**/*.tsx",
     "src/**/*.vue",
-    "src/vendors/coordtransform.js"
   ]
 }