From 4e04700100f90776f4889a3c8af6ffde153a7f9e Mon Sep 17 00:00:00 2001
From: husq <931347610@qq.com>
Date: Thu, 14 Sep 2023 23:52:19 +0800
Subject: [PATCH] 提交代码

---
 src/components/GMap.vue | 1492 ++++++++++++++++++++++++++++------------------------------
 1 files changed, 721 insertions(+), 771 deletions(-)

diff --git a/src/components/GMap.vue b/src/components/GMap.vue
index 788011c..1a99fcc 100644
--- a/src/components/GMap.vue
+++ b/src/components/GMap.vue
@@ -3,511 +3,420 @@
     <!-- 地图区域 -->
     <div id="g-container" :style="{ width: '100%', height: '100%' }" />
     <!-- 绘制面板 -->
-    <div class="g-action-panel" :style="{ right: drawVisible ? '316px' : '16px' }">
+    <div
+      class="g-action-panel"
+      :style="{ right: drawVisible ? '316px' : '16px' }"
+    >
       <div :class="state.currentType === 'pin' ? 'g-action-item selection' : 'g-action-item'" @click="draw('pin', true)">
         <a><a-image :src="pin" :preview="false" /></a>
       </div>
-      <div :class="state.currentType === 'polyline' ? 'g-action-item selection' : 'g-action-item'"
-        @click="draw('polyline', true)">
-        <a>
-          <LineOutlined :rotate="135" class="fz20" />
-        </a>
+      <div :class="state.currentType === 'polyline' ? 'g-action-item selection' : 'g-action-item'" @click="draw('polyline', true)">
+        <a><LineOutlined :rotate="135" class="fz20"/></a>
       </div>
-      <div :class="state.currentType === 'polygon' ? 'g-action-item selection' : 'g-action-item'"
-        @click="draw('polygon', true)">
-        <a>
-          <BorderOutlined class="fz18" />
-        </a>
+      <div :class="state.currentType === 'polygon' ? 'g-action-item selection' : 'g-action-item'" @click="draw('polygon', true)">
+        <a><BorderOutlined class="fz18" /></a>
       </div>
       <div v-if="mouseMode" class="g-action-item" @click="draw('off', false)">
-        <a style="color: red;">
-          <CloseOutlined />
-        </a>
+        <a style="color: red;"><CloseOutlined /></a>
       </div>
     </div>
     <!-- 飞机OSD -->
     <div v-if="osdVisible.visible && !osdVisible.is_dock" class="osd-panel fz12">
-      <div class="pl5 pr5 flex-align-center flex-row flex-justify-between"
-        style="border-bottom: 1px solid #515151; height: 18%;">
+      <div class="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">
-            <CloseOutlined />
-          </a></span>
+        <span><a class="fz16" style="color: white;" @click="() => osdVisible.visible = false"><CloseOutlined /></a></span>
       </div>
       <div style="height: 82%;">
-        <div class="flex-column flex-align-center flex-justify-center"
-          style="margin-top: -5px; padding-top: 25px; float: left; width: 60px; background: #2d2d2d;">
+        <div class="flex-column flex-align-center flex-justify-center" style="margin-top: -5px; padding-top: 25px; float: left; 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><a-image :src="M30" :preview="false"/></span>
               <span>{{ osdVisible.model }}</span>
             </div>
           </a-tooltip>
         </div>
         <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)'">{{
-                EModeText[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="无人机电池电量">
-                <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>
-          </a-row>
-          <a-row>
-            <a-tooltip title="RTK固定">
-              <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-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>
+            </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-tooltip>
-            <a-col span="6">
-              <a-tooltip title="GPS">
-                <span>GPS</span>
-                <span class="ml10">{{ deviceInfo.device.position_state.gps_number }}</span>
+              <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>
+            </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>
-            <a-col span="6">
-              <a-tooltip title="RTK">
-                <span>
-                  <TrademarkOutlined class="fz14" />
-                </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="飞行模式">
-                <span>
-                  <ControlOutlined class="fz16" />
-                </span>
-                <span class="ml10">{{ EGear[deviceInfo.device.gear] }}</span>
-              </a-tooltip>
-            </a-col>
-            <a-col span="6">
-              <a-tooltip title="海拔高度">
-                <span>ASL</span>
-                <span class="ml10">{{ deviceInfo.device.height === str ? str : deviceInfo.device.height.toFixed(2) + 'm'}}</span>
-              </a-tooltip>
-            </a-col>
-            <a-col span="6">
-              <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="到起点距离">
-                <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="水平速度">
-                <span>H.S</span>
-                <span class="ml10">{{ 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="垂直速度">
-                <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="风速">
-                <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-col span="6">
+                <a-tooltip title="GPS">
+                  <span>GPS</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"/></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" /></span>
+                  <span class="ml10">{{ EGear[deviceInfo.device.gear] }}</span>
+                </a-tooltip>
+              </a-col>
+              <a-col span="6">
+                <a-tooltip title="Altitude above sea level">
+                  <span>ASL</span>
+                  <span class="ml10">{{ 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.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>
+                  <span class="ml10">{{ 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.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.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.battery.remain_flight_time !== 0">
         <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="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 }}
+          {{ 10 > (deviceInfo.device.battery.remain_flight_time % 60) ? '0' : ''}}{{deviceInfo.device.battery.remain_flight_time % 60 }}
         </div>
       </div>
     </div>
     <!-- 机场OSD -->
     <div v-if="osdVisible.visible && osdVisible.is_dock" class="osd-panel fz12">
-      <div class="fz16 pl5 pr5 flex-align-center flex-row flex-justify-between"
-        style="border-bottom: 1px solid #515151; height: 10%;">
+      <div class="fz16 pl5 pr5 flex-align-center flex-row flex-justify-between" style="border-bottom: 1px solid #515151; height: 10%;">
         <span>{{ osdVisible.gateway_callsign }}</span>
-        <span><a style="color: white;" @click="() => osdVisible.visible = false">
-            <CloseOutlined />
-          </a></span>
+        <span><a style="color: white;" @click="() => osdVisible.visible = false"><CloseOutlined /></a></span>
       </div>
-      <!-- 机场 -->
-      <div class="flex-display" style="border-bottom: 1px solid #515151;">
+        <!-- 机场 -->
+      <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><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)'">
-              {{ EDockModeText[deviceInfo.dock.basic_osd?.mode_code] }}</a-col>
-          </a-row>
-          <a-row>
-            <a-col span="12">
-              <a-tooltip title="累计运行时间">
-                <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="激活时间">
-                <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="网络状态">
-                <span
-                  :style="deviceInfo.dock.basic_osd?.network_state?.type === NetworkStateTypeEnum.ETHERNET || deviceInfo.dock.basic_osd?.network_state?.quality === NetworkStateQualityEnum.GOOD ?
-                      'color: #00ee8b' : deviceInfo.dock.basic_osd?.network_state?.quality === NetworkStateQualityEnum.MEDIUM ? 'color: yellow' : 'color: red'">
-                  <span v-if="deviceInfo.dock.basic_osd?.network_state?.type === NetworkStateTypeEnum.FOUR_G">
-                    <SignalFilled />
+            <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>
-                  <span v-else>
-                    <GlobalOutlined />
+                </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>
-                </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="设备执行任务总次数">
-                <span>
-                  <CarryOutOutlined />
-                </span>
-                <span class="ml10">{{ deviceInfo.dock.work_osd?.job_number }} </span>
-              </a-tooltip>
-            </a-col>
-            <a-col span="6">
-              <a-tooltip title="媒体文件剩余上传">
-                <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>总共: {{ deviceInfo.dock.basic_osd?.storage?.total }}</p>
-                  <p>已使用: {{ 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="风速">
-                <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="降雨量">
-                <span>🌧</span>
-                <span class="ml10">{{ RainfallEnum[deviceInfo.dock.basic_osd?.rainfall] }}</span>
-              </a-tooltip>
-            </a-col>
-            <a-col span="6">
-              <a-tooltip title="环境温度">
-                <span>°C</span>
-                <span class="ml10">{{ deviceInfo.dock.basic_osd?.environment_temperature }}</span>
-              </a-tooltip>
-            </a-col>
-            <a-col span="6">
-              <a-tooltip title="设备温度">
-                <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="设备湿度">
-                <span>💦</span>
-                <span class="ml10">{{ deviceInfo.dock.basic_osd?.humidity }}</span>
-              </a-tooltip>
-            </a-col>
-            <a-col span="6">
-              <a-tooltip title="工作电压">
-                <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="工作电流">
-                <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="设备上的无人机">
-                <span>
-                  <RocketOutlined />
-                </span>
-                <span class="ml10">{{ DroneInDockEnum[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>
-          <!-- 机场控制面板 -->
-          <DockControlPanel v-if="dockControlPanelVisible" :sn="osdVisible.gateway_sn" :deviceInfo="deviceInfo"
-            @close-control-panel="onCloseControlPanel">
-          </DockControlPanel>
+                </a-tooltip>
+              </a-col>
+            </a-row>
+            <a-row>
+              <a-col span="6">
+                <a-tooltip title="Network State">
+                  <span :style="deviceInfo.dock.basic_osd?.network_state?.type === NetworkStateTypeEnum.ETHERNET || deviceInfo.dock.basic_osd?.network_state?.quality === NetworkStateQualityEnum.GOOD ?
+                    'color: #00ee8b' : deviceInfo.dock.basic_osd?.network_state?.quality === NetworkStateQualityEnum.MEDIUM ? 'color: yellow' : 'color: red'">
+                    <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">{{ DroneInDockEnum[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-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><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 ? EModeText[EModeCode.Disconnected] : EModeText[deviceInfo.device?.mode_code]
-              }}</a-col>
-          </a-row>
-          <a-row>
-            <a-col span="6">
-              <a-tooltip title="向上质量">
-                <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="向下质量">
-                <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="无人机电池电量">
-                <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>总供: {{ deviceInfo.device?.storage?.total }}</p>
-                  <p>已使用: {{ 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固定">
-              <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-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-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-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>
-            <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="飞行模式">
-                <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="海拔高度">
-                <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="高于起飞高度">
-                <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="到起点距离">
-                <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="水平速度">
-                <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="垂直速度">
-                <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="风速">
-                <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>
+              <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 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="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 }}
+          {{ 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>
+      <DroneControlPanel :sn="osdVisible.gateway_sn" :deviceInfo="deviceInfo" :payloads="osdVisible.payloads"></DroneControlPanel>
     </div>
   </div>
 </template>
 
-<script lang="ts" setup>
+<script lang="ts">
 import { computed, defineComponent, onMounted, reactive, ref, watch } from 'vue'
 import {
   generateLineContent,
@@ -528,7 +437,7 @@
 import { gcj02towgs84, wgs84togcj02 } from '/@/vendors/coordtransform'
 import { deviceTsaUpdate } from '/@/hooks/use-g-map-tsa'
 import {
-  DeviceOsd, DeviceStatus, DockOsd, EGear, EModeCode, GatewayOsd, EDockModeCode, EDockModeText, EModeText,
+  DeviceOsd, DeviceStatus, DockOsd, EGear, EModeCode, GatewayOsd, EDockModeCode,
   NetworkStateQualityEnum, NetworkStateTypeEnum, RainfallEnum, DroneInDockEnum
 } from '/@/types/device'
 import pin from '/@/assets/icons/pin-2d8cf0.svg'
@@ -543,343 +452,393 @@
 import { useDockControl } from './g-map/use-dock-control'
 import DroneControlPanel from './g-map/DroneControlPanel.vue'
 import { useConnectMqtt } from './g-map/use-connect-mqtt'
-const useMouseToolHook = useMouseTool()
-const useGMapManageHook = useGMapManage()
-const deviceTsaUpdateHook = deviceTsaUpdate()
-const root = getRoot()
 
-const mouseMode = ref(false)
-const store = useMyStore()
-const state = reactive({
-  currentType: '',
-  coverIndex: 0
-})
-const str: string = '--'
-const deviceInfo = reactive({
-  gateway: {
-    capacity_percent: str,
-    transmission_signal_quality: str,
-  } as GatewayOsd,
-  dock: {
-
-  } as DockOsd,
-  device: {
-    gear: -1,
-    mode_code: EModeCode.Disconnected,
-    height: str,
-    home_distance: str,
-    horizontal_speed: str,
-    vertical_speed: str,
-    wind_speed: str,
-    wind_direction: str,
-    elevation: str,
-    position_state: {
-      gps_number: str,
-      is_fixed: 0,
-      rtk_number: str
-    },
-    battery: {
-      capacity_percent: str,
-      landing_power: str,
-      remain_flight_time: 0,
-      return_home_power: str,
-    },
-    latitude: 0,
-    longitude: 0,
-  } as DeviceOsd
-})
-const shareId = computed(() => {
-  return store.state.layerBaseInfo.share
-})
-const defaultId = computed(() => {
-  return store.state.layerBaseInfo.default
-})
-const drawVisible = computed(() => {
-  return store.state.drawVisible
-})
-const osdVisible = computed(() => {
-  return store.state.osdVisible
-})
-
-watch(() => store.state.deviceStatusEvent,
-  data => {
-    if (Object.keys(data.deviceOnline).length !== 0) {
-      deviceTsaUpdateHook.initMarker(data.deviceOnline.domain, data.deviceOnline.device_callsign, data.deviceOnline.sn)
-      store.state.deviceStatusEvent.deviceOnline = {} as DeviceStatus
-    }
-    if (Object.keys(data.deviceOffline).length !== 0) {
-      deviceTsaUpdateHook.removeMarker(data.deviceOffline.sn)
-      if ((data.deviceOffline.sn === osdVisible.value.sn) || (osdVisible.value.is_dock && data.deviceOffline.sn === osdVisible.value.gateway_sn)) {
-        osdVisible.value.visible = false
-        store.commit('SET_OSD_VISIBLE_INFO', osdVisible)
-      }
-      store.state.deviceStatusEvent.deviceOffline = {}
-    }
+export default defineComponent({
+  components: {
+    BorderOutlined,
+    LineOutlined,
+    CloseOutlined,
+    ControlOutlined,
+    TrademarkOutlined,
+    ThunderboltOutlined,
+    SignalFilled,
+    GlobalOutlined,
+    HistoryOutlined,
+    CloudUploadOutlined,
+    FieldTimeOutlined,
+    CloudOutlined,
+    CloudFilled,
+    FolderOpenOutlined,
+    RobotFilled,
+    ArrowUpOutlined,
+    ArrowDownOutlined,
+    DockControlPanel,
+    DroneControlPanel,
+    CarryOutOutlined,
+    RocketOutlined
   },
-  {
-    deep: true
-  }
-)
+  name: 'GMap',
+  props: {},
+  setup () {
+    const useMouseToolHook = useMouseTool()
+    const useGMapManageHook = useGMapManage()
+    const deviceTsaUpdateHook = deviceTsaUpdate()
+    const root = getRoot()
 
-watch(() => store.state.deviceState, data => {
-  if (data.currentType === EDeviceTypeName.Gateway && data.gatewayInfo[data.currentSn]) {
-    deviceTsaUpdateHook.moveTo(data.currentSn, data.gatewayInfo[data.currentSn].longitude, data.gatewayInfo[data.currentSn].latitude)
-    if (osdVisible.value.visible && osdVisible.value.gateway_sn !== '') {
-      deviceInfo.gateway = data.gatewayInfo[osdVisible.value.gateway_sn]
-    }
-  }
-  if (data.currentType === EDeviceTypeName.Aircraft && data.deviceInfo[data.currentSn]) {
-    deviceTsaUpdateHook.moveTo(data.currentSn, data.deviceInfo[data.currentSn].longitude, data.deviceInfo[data.currentSn].latitude)
-    if (osdVisible.value.visible && osdVisible.value.sn !== '') {
-      deviceInfo.device = data.deviceInfo[osdVisible.value.sn]
-    }
-  }
-  if (data.currentType === EDeviceTypeName.Dock && data.dockInfo[data.currentSn]) {
-    deviceTsaUpdateHook.initMarker(EDeviceTypeName.Dock, [EDeviceTypeName.Dock], data.currentSn, data.dockInfo[data.currentSn].basic_osd?.longitude, data.dockInfo[data.currentSn].basic_osd?.latitude)
-    if (osdVisible.value.visible && osdVisible.value.is_dock && osdVisible.value.gateway_sn !== '') {
-      deviceInfo.dock = data.dockInfo[osdVisible.value.gateway_sn]
-      deviceInfo.device = data.deviceInfo[deviceInfo.dock.basic_osd.sub_device?.device_sn ?? osdVisible.value.sn]
-    }
-  }
-}, {
-  deep: true
-})
+    const mouseMode = ref(false)
+    const store = useMyStore()
+    const state = reactive({
+      currentType: '',
+      coverIndex: 0
+    })
+    const str: string = '--'
+    const deviceInfo = reactive({
+      gateway: {
+        capacity_percent: str,
+        transmission_signal_quality: str,
+      } as GatewayOsd,
+      dock: {
 
-watch(
-  () => store.state.wsEvent,
-  newData => {
-    const useGMapCoverHook = useGMapCover()
-    const event = newData
-    let exist = false
-    if (Object.keys(event.mapElementCreat).length !== 0) {
-      console.log(event.mapElementCreat)
-      const ele = event.mapElementCreat
-      store.state.Layers.forEach(layer => {
-        layer.elements.forEach(e => {
-          if (e.id === ele.id) {
-            exist = true
-            console.log('true')
+      } as DockOsd,
+      device: {
+        gear: -1,
+        mode_code: EModeCode.Disconnected,
+        height: str,
+        home_distance: str,
+        horizontal_speed: str,
+        vertical_speed: str,
+        wind_speed: str,
+        wind_direction: str,
+        elevation: str,
+        position_state: {
+          gps_number: str,
+          is_fixed: 0,
+          rtk_number: str
+        },
+        battery: {
+          capacity_percent: str,
+          landing_power: str,
+          remain_flight_time: 0,
+          return_home_power: str,
+        },
+        latitude: 0,
+        longitude: 0,
+      } as DeviceOsd
+    })
+    const shareId = computed(() => {
+      return store.state.layerBaseInfo.share
+    })
+    const defaultId = computed(() => {
+      return store.state.layerBaseInfo.default
+    })
+    const drawVisible = computed(() => {
+      return store.state.drawVisible
+    })
+    const osdVisible = computed(() => {
+      return store.state.osdVisible
+    })
+
+    watch(() => store.state.deviceStatusEvent,
+      data => {
+        if (Object.keys(data.deviceOnline).length !== 0) {
+          deviceTsaUpdateHook.initMarker(data.deviceOnline.domain, data.deviceOnline.device_callsign, data.deviceOnline.sn)
+          store.state.deviceStatusEvent.deviceOnline = {} as DeviceStatus
+        }
+        if (Object.keys(data.deviceOffline).length !== 0) {
+          deviceTsaUpdateHook.removeMarker(data.deviceOffline.sn)
+          if ((data.deviceOffline.sn === osdVisible.value.sn) || (osdVisible.value.is_dock && data.deviceOffline.sn === osdVisible.value.gateway_sn)) {
+            osdVisible.value.visible = false
+            store.commit('SET_OSD_VISIBLE_INFO', osdVisible)
           }
-        })
-      })
-      if (exist === false) {
-        setLayers({
-          id: ele.id,
-          name: ele.name,
-          resource: ele.resource
-        })
+          store.state.deviceStatusEvent.deviceOffline = {}
+        }
+      },
+      {
+        deep: true
+      }
+    )
 
-        updateCoordinates('wgs84-gcj02', ele)
-        useGMapCoverHook.init2DPin(
-          ele.name,
-          ele.resource.content.geometry.coordinates,
-          ele.resource.content.properties.color,
-          {
-            id: ele.id,
-            name: ele.name
+    watch(() => store.state.deviceState, data => {
+      if (data.currentType === EDeviceTypeName.Gateway && data.gatewayInfo[data.currentSn]) {
+        deviceTsaUpdateHook.moveTo(data.currentSn, data.gatewayInfo[data.currentSn].longitude, data.gatewayInfo[data.currentSn].latitude)
+        if (osdVisible.value.visible && osdVisible.value.gateway_sn !== '') {
+          deviceInfo.gateway = data.gatewayInfo[osdVisible.value.gateway_sn]
+        }
+      }
+      if (data.currentType === EDeviceTypeName.Aircraft && data.deviceInfo[data.currentSn]) {
+        deviceTsaUpdateHook.moveTo(data.currentSn, data.deviceInfo[data.currentSn].longitude, data.deviceInfo[data.currentSn].latitude)
+        if (osdVisible.value.visible && osdVisible.value.sn !== '') {
+          deviceInfo.device = data.deviceInfo[osdVisible.value.sn]
+        }
+      }
+      if (data.currentType === EDeviceTypeName.Dock && data.dockInfo[data.currentSn]) {
+        deviceTsaUpdateHook.initMarker(EDeviceTypeName.Dock, [EDeviceTypeName.Dock], data.currentSn, data.dockInfo[data.currentSn].basic_osd?.longitude, data.dockInfo[data.currentSn].basic_osd?.latitude)
+        if (osdVisible.value.visible && osdVisible.value.is_dock && osdVisible.value.gateway_sn !== '') {
+          deviceInfo.dock = data.dockInfo[osdVisible.value.gateway_sn]
+          deviceInfo.device = data.deviceInfo[deviceInfo.dock.basic_osd.sub_device?.device_sn ?? osdVisible.value.sn]
+        }
+      }
+    }, {
+      deep: true
+    })
+
+    watch(
+      () => store.state.wsEvent,
+      newData => {
+        const useGMapCoverHook = useGMapCover()
+        const event = newData
+        let exist = false
+        if (Object.keys(event.mapElementCreat).length !== 0) {
+          console.log(event.mapElementCreat)
+          const ele = event.mapElementCreat
+          store.state.Layers.forEach(layer => {
+            layer.elements.forEach(e => {
+              if (e.id === ele.id) {
+                exist = true
+                console.log('true')
+              }
+            })
+          })
+          if (exist === false) {
+            setLayers({
+              id: ele.id,
+              name: ele.name,
+              resource: ele.resource
+            })
+
+            updateCoordinates('wgs84-gcj02', ele)
+            useGMapCoverHook.init2DPin(
+              ele.name,
+              ele.resource.content.geometry.coordinates,
+              ele.resource.content.properties.color,
+              {
+                id: ele.id,
+                name: ele.name
+              }
+            )
           }
-        )
+
+          store.state.wsEvent.mapElementCreat = {}
+        }
+        if (Object.keys(event.mapElementUpdate).length !== 0) {
+          console.log(event.mapElementUpdate)
+          console.log('该功能还未实现,请开发商自己增加')
+          store.state.wsEvent.mapElementUpdate = {}
+        }
+        if (Object.keys(event.mapElementDelete).length !== 0) {
+          console.log(event.mapElementDelete)
+          console.log('该功能还未实现,请开发商自己增加')
+          store.state.wsEvent.mapElementDelete = {}
+        }
+      },
+      {
+        deep: true
       }
+    )
 
-      store.state.wsEvent.mapElementCreat = {}
+    function draw (type: MapDoodleType, bool: boolean) {
+      state.currentType = type
+      useMouseToolHook.mouseTool(type, getDrawCallback)
+      mouseMode.value = bool
     }
-    if (Object.keys(event.mapElementUpdate).length !== 0) {
-      console.log(event.mapElementUpdate)
-      console.log('该功能还未实现,请开发商自己增加')
-      store.state.wsEvent.mapElementUpdate = {}
+
+    // dock 控制面板
+    const {
+      dockControlPanelVisible,
+      setDockControlPanelVisible,
+      onCloseControlPanel,
+    } = useDockControl()
+
+    // 连接或断开drc
+    useConnectMqtt()
+
+    onMounted(() => {
+      const app = getApp()
+      useGMapManageHook.globalPropertiesConfig(app)
+    })
+
+    function getDrawCallback ({ obj }) {
+      switch (state.currentType) {
+        case MapDoodleEnum.PIN:
+          postPinPositionResource(obj)
+          break
+        case MapDoodleEnum.POLYLINE:
+          postPolylineResource(obj)
+          break
+        case MapDoodleEnum.POLYGON:
+          postPolygonResource(obj)
+          break
+        default:
+          break
+      }
     }
-    if (Object.keys(event.mapElementDelete).length !== 0) {
-      console.log(event.mapElementDelete)
-      console.log('该功能还未实现,请开发商自己增加')
-      store.state.wsEvent.mapElementDelete = {}
+    async function postPinPositionResource (obj) {
+      const req = getPinPositionResource(obj)
+      setLayers(req)
+      const coordinates = req.resource.content.geometry.coordinates
+      updateCoordinates('gcj02-wgs84', req);
+      (req.resource.content.geometry.coordinates as GeojsonCoordinate).push((coordinates as GeojsonCoordinate)[2])
+      const result = await postElementsReq(shareId.value, req)
+      obj.setExtData({ id: req.id, name: req.name })
+      store.state.coverList.push(obj)
+      // console.log(store.state.coverList)
     }
-  },
-  {
-    deep: true
+    async function postPolylineResource (obj) {
+      const req = getPolylineResource(obj)
+      setLayers(req)
+      updateCoordinates('gcj02-wgs84', req)
+      const result = await postElementsReq(shareId.value, req)
+      obj.setExtData({ id: req.id, name: req.name })
+      store.state.coverList.push(obj)
+      // console.log(store.state.coverList)
+    }
+    async function postPolygonResource (obj) {
+      const req = getPoygonResource(obj)
+      setLayers(req)
+      updateCoordinates('gcj02-wgs84', req)
+      const result = await postElementsReq(shareId.value, req)
+      obj.setExtData({ id: req.id, name: req.name })
+      store.state.coverList.push(obj)
+      // console.log(store.state.coverList)
+    }
+
+    function getPinPositionResource (obj) {
+      const position = obj.getPosition()
+      const resource = generatePointContent(position)
+      const name = obj._originOpts.title
+      const id = uuidv4()
+      return {
+        id,
+        name,
+        resource
+      }
+    }
+    function getPolylineResource (obj) {
+      const path = obj.getPath()
+      const resource = generateLineContent(path)
+      const { name, id } = getBaseInfo(obj._opts)
+      return {
+        id,
+        name,
+        resource
+      }
+    }
+    function getPoygonResource (obj) {
+      const path = obj.getPath()
+      const resource = generatePolyContent(path)
+      const { name, id } = getBaseInfo(obj._opts)
+      return {
+        id,
+        name,
+        resource
+      }
+    }
+    function getBaseInfo (obj) {
+      const name = obj.title
+      const id = uuidv4()
+      return { name, id }
+    }
+    function setLayers (resource: PostElementsBody) {
+      const layers = store.state.Layers
+      const layer = layers.find(item => item.id.includes(shareId.value))
+      // layer.id = 'private_layer' + uuidv4()
+      // layer?.elements.push(resource)
+      if (layer?.elements) {
+        ;(layer?.elements as any[]).push(resource)
+      }
+      console.log('layers', layers)
+      store.commit('SET_LAYER_INFO', layers)
+    }
+    function updateCoordinates (transformType: string, element: any) {
+      const geoType = element.resource?.content.geometry.type
+      const type = element.resource?.type as number
+      if (element.resource) {
+        if (MapElementEnum.PIN === type) {
+          const coordinates = element.resource?.content.geometry
+            .coordinates as GeojsonCoordinate
+          if (transformType === 'wgs84-gcj02') {
+            const transResult = wgs84togcj02(
+              coordinates[0],
+              coordinates[1]
+            ) as GeojsonCoordinate
+            element.resource.content.geometry.coordinates = transResult
+          } else if (transformType === 'gcj02-wgs84') {
+            const transResult = gcj02towgs84(
+              coordinates[0],
+              coordinates[1]
+            ) as GeojsonCoordinate
+            element.resource.content.geometry.coordinates = transResult
+          }
+        } else if (MapElementEnum.LINE === type && geoType === 'LineString') {
+          const coordinates = element.resource?.content.geometry
+            .coordinates as GeojsonCoordinate[]
+          if (transformType === 'wgs84-gcj02') {
+            coordinates.forEach(coordinate => {
+              coordinate = wgs84togcj02(
+                coordinate[0],
+                coordinate[1]
+              ) as GeojsonCoordinate
+            })
+          } else if (transformType === 'gcj02-wgs84') {
+            coordinates.forEach(coordinate => {
+              coordinate = gcj02towgs84(
+                coordinate[0],
+                coordinate[1]
+              ) as GeojsonCoordinate
+            })
+          }
+          element.resource.content.geometry.coordinates = coordinates
+        } else if (MapElementEnum.LINE === type && geoType === 'Polygon') {
+          const coordinates = element.resource?.content.geometry
+            .coordinates[0] as GeojsonCoordinate[]
+
+          if (transformType === 'wgs84-gcj02') {
+            coordinates.forEach(coordinate => {
+              coordinate = wgs84togcj02(
+                coordinate[0],
+                coordinate[1]
+              ) as GeojsonCoordinate
+            })
+          } else if (transformType === 'gcj02-wgs84') {
+            coordinates.forEach(coordinate => {
+              coordinate = gcj02towgs84(
+                coordinate[0],
+                coordinate[1]
+              ) as GeojsonCoordinate
+            })
+          }
+          element.resource.content.geometry.coordinates = [coordinates]
+        }
+      }
+    }
+    return {
+      draw,
+      mouseMode,
+      drawVisible,
+      osdVisible,
+      pin,
+      state,
+      M30,
+      deviceInfo,
+      EGear,
+      EModeCode,
+      str,
+      EDockModeCode,
+      dockControlPanelVisible,
+      setDockControlPanelVisible,
+      onCloseControlPanel,
+      NetworkStateTypeEnum,
+      NetworkStateQualityEnum,
+      RainfallEnum,
+      DroneInDockEnum
+    }
   }
-)
-
-function draw (type: MapDoodleType, bool: boolean) {
-  state.currentType = type
-  useMouseToolHook.mouseTool(type, getDrawCallback)
-  mouseMode.value = bool
-}
-
-// dock 控制面板
-const {
-  dockControlPanelVisible,
-  setDockControlPanelVisible,
-  onCloseControlPanel,
-} = useDockControl()
-
-// 连接或断开drc
-useConnectMqtt()
-
-onMounted(async () => {
-  await nextTick()
-  const app = getApp()
-  setTimeout(() => {
-    useGMapManageHook.globalPropertiesConfig(app)
-  }, 1000)
 })
-
-function getDrawCallback ({ obj }) {
-  switch (state.currentType) {
-    case MapDoodleEnum.PIN:
-      postPinPositionResource(obj)
-      break
-    case MapDoodleEnum.POLYLINE:
-      postPolylineResource(obj)
-      break
-    case MapDoodleEnum.POLYGON:
-      postPolygonResource(obj)
-      break
-    default:
-      break
-  }
-}
-async function postPinPositionResource (obj) {
-  const req = getPinPositionResource(obj)
-  setLayers(req)
-  const coordinates = req.resource.content.geometry.coordinates
-  updateCoordinates('gcj02-wgs84', req);
-  (req.resource.content.geometry.coordinates as GeojsonCoordinate).push((coordinates as GeojsonCoordinate)[2])
-  const result = await postElementsReq(shareId.value, req)
-  obj.setExtData({ id: req.id, name: req.name })
-  store.state.coverList.push(obj)
-  // console.log(store.state.coverList)
-}
-async function postPolylineResource (obj) {
-  const req = getPolylineResource(obj)
-  setLayers(req)
-  updateCoordinates('gcj02-wgs84', req)
-  const result = await postElementsReq(shareId.value, req)
-  obj.setExtData({ id: req.id, name: req.name })
-  store.state.coverList.push(obj)
-  // console.log(store.state.coverList)
-}
-async function postPolygonResource (obj) {
-  const req = getPoygonResource(obj)
-  setLayers(req)
-  updateCoordinates('gcj02-wgs84', req)
-  const result = await postElementsReq(shareId.value, req)
-  obj.setExtData({ id: req.id, name: req.name })
-  store.state.coverList.push(obj)
-  // console.log(store.state.coverList)
-}
-
-function getPinPositionResource (obj) {
-  const position = obj.getPosition()
-  const resource = generatePointContent(position)
-  const name = obj._originOpts.title
-  const id = uuidv4()
-  return {
-    id,
-    name,
-    resource
-  }
-}
-function getPolylineResource (obj) {
-  const path = obj.getPath()
-  const resource = generateLineContent(path)
-  const { name, id } = getBaseInfo(obj._opts)
-  return {
-    id,
-    name,
-    resource
-  }
-}
-function getPoygonResource (obj) {
-  const path = obj.getPath()
-  const resource = generatePolyContent(path)
-  const { name, id } = getBaseInfo(obj._opts)
-  return {
-    id,
-    name,
-    resource
-  }
-}
-function getBaseInfo (obj) {
-  const name = obj.title
-  const id = uuidv4()
-  return { name, id }
-}
-function setLayers (resource: PostElementsBody) {
-  const layers = store.state.Layers
-  const layer = layers.find(item => item.id.includes(shareId.value))
-  // layer.id = 'private_layer' + uuidv4()
-  // layer?.elements.push(resource)
-  if (layer?.elements) {
-    ; (layer?.elements as any[]).push(resource)
-  }
-  console.log('layers', layers)
-  store.commit('SET_LAYER_INFO', layers)
-}
-function updateCoordinates (transformType: string, element: any) {
-  const geoType = element.resource?.content.geometry.type
-  const type = element.resource?.type as number
-  if (element.resource) {
-    if (MapElementEnum.PIN === type) {
-      const coordinates = element.resource?.content.geometry
-        .coordinates as GeojsonCoordinate
-      if (transformType === 'wgs84-gcj02') {
-        const transResult = wgs84togcj02(
-          coordinates[0],
-          coordinates[1]
-        ) as GeojsonCoordinate
-        element.resource.content.geometry.coordinates = transResult
-      } else if (transformType === 'gcj02-wgs84') {
-        const transResult = gcj02towgs84(
-          coordinates[0],
-          coordinates[1]
-        ) as GeojsonCoordinate
-        element.resource.content.geometry.coordinates = transResult
-      }
-    } else if (MapElementEnum.LINE === type && geoType === 'LineString') {
-      const coordinates = element.resource?.content.geometry
-        .coordinates as GeojsonCoordinate[]
-      if (transformType === 'wgs84-gcj02') {
-        coordinates.forEach(coordinate => {
-          coordinate = wgs84togcj02(
-            coordinate[0],
-            coordinate[1]
-          ) as GeojsonCoordinate
-        })
-      } else if (transformType === 'gcj02-wgs84') {
-        coordinates.forEach(coordinate => {
-          coordinate = gcj02towgs84(
-            coordinate[0],
-            coordinate[1]
-          ) as GeojsonCoordinate
-        })
-      }
-      element.resource.content.geometry.coordinates = coordinates
-    } else if (MapElementEnum.LINE === type && geoType === 'Polygon') {
-      const coordinates = element.resource?.content.geometry
-        .coordinates[0] as GeojsonCoordinate[]
-
-      if (transformType === 'wgs84-gcj02') {
-        coordinates.forEach(coordinate => {
-          coordinate = wgs84togcj02(
-            coordinate[0],
-            coordinate[1]
-          ) as GeojsonCoordinate
-        })
-      } else if (transformType === 'gcj02-wgs84') {
-        coordinates.forEach(coordinate => {
-          coordinate = gcj02towgs84(
-            coordinate[0],
-            coordinate[1]
-          ) as GeojsonCoordinate
-        })
-      }
-      element.resource.content.geometry.coordinates = [coordinates]
-    }
-  }
-}
 </script>
 
-<style lang="scss" scoped>.g-map-wrapper {
+<style lang="scss" scoped>
+
+.g-map-wrapper {
   height: 100%;
   width: 100%;
 
@@ -887,7 +846,6 @@
     position: absolute;
     top: 16px;
     right: 16px;
-
     .g-action-item {
       width: 28px;
       height: 28px;
@@ -898,26 +856,23 @@
       text-align: center;
       margin-bottom: 2px;
     }
-
     .g-action-item:hover {
       border: 1px solid $primary;
       border-radius: 2px;
     }
   }
-
   .selection {
     border: 1px solid $primary;
     border-radius: 2px;
   }
 
   // antd button 光晕
-  &:deep(.ant-btn) {
+  &:deep(.ant-btn){
     &::after {
       display: none;
     }
   }
 }
-
 .osd-panel {
   position: absolute;
   left: 10px;
@@ -928,8 +883,7 @@
   border-radius: 2px;
   opacity: 0.8;
 }
-
-.osd>div:not(.dock-control-panel) {
+.osd > div:not(.dock-control-panel) {
   margin-top: 5px;
   padding-left: 5px;
 }
@@ -944,15 +898,12 @@
   .capacity-percent {
     background: #00ee8b;
   }
-
   .return-home {
     background: #ff9f0a;
   }
-
   .landing {
     background: #f5222d;
   }
-
   .white-point {
     width: 4px;
     height: 4px;
@@ -960,7 +911,6 @@
     background: white;
     bottom: -0.5px;
   }
-
   .battery {
     background: #141414;
     color: #00ee8b;
@@ -971,9 +921,9 @@
     padding: 0 5px;
   }
 }
-
-.battery-slide>div {
+.battery-slide > div {
   position: absolute;
   min-height: 2px;
   border-radius: 2px;
-}</style>
+}
+</style>

--
Gitblit v1.9.3