From 450f8c323673e4e8d9c48c0bbe494f30eda5598f Mon Sep 17 00:00:00 2001
From: husq <931347610@qq.com>
Date: Thu, 14 Sep 2023 16:40:25 +0800
Subject: [PATCH] 机场设备 修改
---
src/components/GMap.vue | 88 +++++++++++++++--------------
src/components/g-map/DeviceSettingBox.vue | 14 ++--
src/components/g-map/DockControlPanel.vue | 4
src/pages/page-web/projects/tsa.vue | 10 +--
src/types/device-cmd.ts | 4
src/components/g-map/DroneControlPanel.vue | 31 +++++-----
6 files changed, 75 insertions(+), 76 deletions(-)
diff --git a/src/components/GMap.vue b/src/components/GMap.vue
index 1a99fcc..4da5129 100644
--- a/src/components/GMap.vue
+++ b/src/components/GMap.vue
@@ -37,7 +37,7 @@
</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)'">{{ EModeCode[deviceInfo.device.mode_code] }}</a-col>
+ <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">
@@ -54,14 +54,14 @@
</a-col>
<a-col span="6">
- <a-tooltip title="Drone Battery Level">
+ <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 Fixed">
+ <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>
@@ -82,25 +82,25 @@
</a-row>
<a-row>
<a-col span="6">
- <a-tooltip title="Flight Mode">
+ <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="Altitude above sea level">
+ <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="Altitude above takeoff level">
+ <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="Distance to Home Point">
+ <a-tooltip title="到起点距离">
<span>H</span>
<span class="ml10">{{ deviceInfo.device.home_distance === str ? str : deviceInfo.device.home_distance.toFixed(2) + ' m' }}</span>
</a-tooltip>
@@ -108,19 +108,19 @@
</a-row>
<a-row>
<a-col span="6">
- <a-tooltip title="Horizontal Speed">
+ <a-tooltip title="水平速度">
<span>H.S</span>
<span class="ml10">{{ deviceInfo.device.horizontal_speed === str ? str : deviceInfo.device.horizontal_speed.toFixed(2) + ' m/s'}}</span>
</a-tooltip>
</a-col>
<a-col span="6">
- <a-tooltip title="Vertical Speed">
+ <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="Wind Speed">
+ <a-tooltip title="风速">
<span>W.S</span>
<span class="ml10">{{ deviceInfo.device.wind_speed === str ? str : (deviceInfo.device.wind_speed / 10).toFixed(2) + ' m/s'}}</span>
</a-tooltip>
@@ -159,11 +159,11 @@
<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>
+ {{ EDockModeText[deviceInfo.dock.basic_osd?.mode_code] }}</a-col>
</a-row>
<a-row>
<a-col span="12">
- <a-tooltip title="Accumulated Running Time">
+ <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>
@@ -175,7 +175,7 @@
</a-tooltip>
</a-col>
<a-col span="12">
- <a-tooltip title="Activation time">
+ <a-tooltip title="激活时间">
<span><FieldTimeOutlined /></span>
<span class="ml10">{{ new Date((deviceInfo.dock.work_osd?.activation_time ?? 0) * 1000).toLocaleString() }}
</span>
@@ -184,7 +184,7 @@
</a-row>
<a-row>
<a-col span="6">
- <a-tooltip title="Network State">
+ <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 /></span>
@@ -194,13 +194,13 @@
</a-tooltip>
</a-col>
<a-col span="6">
- <a-tooltip title="The total number of times the dock has performed missions.">
+ <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="Media File Remain Upload">
+ <a-tooltip title="媒体文件剩余上传">
<span><CloudUploadOutlined class="fz14"/></span>
<span class="ml10">{{ deviceInfo.dock.link_osd?.media_file_detail?.remain_upload }}</span>
</a-tooltip>
@@ -208,8 +208,8 @@
<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>
+ <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">
@@ -221,25 +221,25 @@
</a-row>
<a-row>
<a-col span="6">
- <a-tooltip title="Wind Speed">
+ <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="Rainfall">
+ <a-tooltip title="降雨量">
<span>🌧</span>
- <span class="ml10">{{ RainfallEnum[deviceInfo.dock.basic_osd?.rainfall] }}</span>
+ <span class="ml10">{{ RainfallEnum[deviceInfo.dock.basic_osd?.降雨量] }}</span>
</a-tooltip>
</a-col>
<a-col span="6">
- <a-tooltip title="Environment Temperature">
+ <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="Dock Temperature">
+ <a-tooltip title="设备温度">
<span>°C</span>
<span class="ml10">{{ deviceInfo.dock.basic_osd?.temperature }}</span>
</a-tooltip>
@@ -247,25 +247,25 @@
</a-row>
<a-row>
<a-col span="6">
- <a-tooltip title="Dock Humidity">
+ <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="Working Voltage">
+ <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="Working Current">
+ <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="Drone in dock">
+ <a-tooltip title="设备上的无人机">
<span><RocketOutlined /></span>
<span class="ml10">{{ DroneInDockEnum[deviceInfo.dock.basic_osd?.drone_in_dock] }}</span>
</a-tooltip>
@@ -274,7 +274,7 @@
<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>
@@ -296,23 +296,23 @@
<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>
+ {{ !deviceInfo.device ? EModeText[EModeCode.Disconnected] : EModeText[deviceInfo.device?.mode_code] }}</a-col>
</a-row>
<a-row>
<a-col span="6">
- <a-tooltip title="Upward Quality">
+ <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="Downward Quality">
+ <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="Drone Battery Level">
+ <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>
@@ -320,8 +320,8 @@
<a-col span="6">
<a-tooltip>
<template #title>
- <p>total: {{ deviceInfo.device?.storage?.total }}</p>
- <p>used: {{ deviceInfo.device?.storage?.used }}</p>
+ <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">
@@ -332,7 +332,7 @@
</a-col>
</a-row>
<a-row>
- <a-tooltip title="RTK Fixed">
+ <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>
@@ -353,25 +353,25 @@
</a-row>
<a-row>
<a-col span="6">
- <a-tooltip title="Flight Mode">
+ <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="Altitude above sea level">
+ <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="Altitude above takeoff level">
+ <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="Distance to Home Point">
+ <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>
@@ -379,19 +379,19 @@
</a-row>
<a-row>
<a-col span="6">
- <a-tooltip title="Horizontal Speed">
+ <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="Vertical Speed">
+ <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="Wind Speed">
+ <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>
@@ -437,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,
+ DeviceOsd, DeviceStatus, DockOsd, EGear, EModeCode, GatewayOsd, EDockModeCode, EDockModeText, EModeText,
NetworkStateQualityEnum, NetworkStateTypeEnum, RainfallEnum, DroneInDockEnum
} from '/@/types/device'
import pin from '/@/assets/icons/pin-2d8cf0.svg'
@@ -824,6 +824,8 @@
EModeCode,
str,
EDockModeCode,
+ EDockModeText,
+ EModeText,
dockControlPanelVisible,
setDockControlPanelVisible,
onCloseControlPanel,
diff --git a/src/components/g-map/DeviceSettingBox.vue b/src/components/g-map/DeviceSettingBox.vue
index 5f6f330..fc0b3de 100644
--- a/src/components/g-map/DeviceSettingBox.vue
+++ b/src/components/g-map/DeviceSettingBox.vue
@@ -1,6 +1,6 @@
<template>
<div class="device-setting-wrapper">
- <div class="device-setting-header">Device Property Set</div>
+ <div class="device-setting-header">设备属性设置</div>
<div class="device-setting-box">
<!-- 飞行器夜航灯 -->
<div class="control-setting-item">
@@ -21,7 +21,7 @@
<a-switch checked-children="开" un-checked-children="关" v-model:checked="deviceSettingFormModel.nightLightsState" />
</div>
</template>
- <a @click="onShowPopConfirm(deviceSetting[DeviceSettingKeyEnum.NIGHT_LIGHTS_MODE_SET].settingKey)">Edit</a>
+ <a @click="onShowPopConfirm(deviceSetting[DeviceSettingKeyEnum.NIGHT_LIGHTS_MODE_SET].settingKey)">编辑</a>
</DeviceSettingPopover>
</div>
</div>
@@ -45,7 +45,7 @@
m
</div>
</template>
- <a @click="onShowPopConfirm(deviceSetting[DeviceSettingKeyEnum.HEIGHT_LIMIT_SET].settingKey)">Edit</a>
+ <a @click="onShowPopConfirm(deviceSetting[DeviceSettingKeyEnum.HEIGHT_LIMIT_SET].settingKey)">编辑</a>
</DeviceSettingPopover>
</div>
</div>
@@ -70,7 +70,7 @@
m
</div>
</template>
- <a @click="onShowPopConfirm(deviceSetting[DeviceSettingKeyEnum.DISTANCE_LIMIT_SET].settingKey)">Edit</a>
+ <a @click="onShowPopConfirm(deviceSetting[DeviceSettingKeyEnum.DISTANCE_LIMIT_SET].settingKey)">编辑</a>
</DeviceSettingPopover>
</div>
</div>
@@ -93,7 +93,7 @@
<a-switch checked-children="开" un-checked-children="关" v-model:checked="deviceSettingFormModel.obstacleAvoidanceHorizon" />
</div>
</template>
- <a @click="onShowPopConfirm(deviceSetting[DeviceSettingKeyEnum.OBSTACLE_AVOIDANCE_HORIZON].settingKey)">Edit</a>
+ <a @click="onShowPopConfirm(deviceSetting[DeviceSettingKeyEnum.OBSTACLE_AVOIDANCE_HORIZON].settingKey)">编辑</a>
</DeviceSettingPopover>
</div>
</div>
@@ -116,7 +116,7 @@
<a-switch checked-children="开" un-checked-children="关" v-model:checked="deviceSettingFormModel.obstacleAvoidanceUpside" />
</div>
</template>
- <a @click="onShowPopConfirm(deviceSetting[DeviceSettingKeyEnum.OBSTACLE_AVOIDANCE_UPSIDE].settingKey)">Edit</a>
+ <a @click="onShowPopConfirm(deviceSetting[DeviceSettingKeyEnum.OBSTACLE_AVOIDANCE_UPSIDE].settingKey)">编辑</a>
</DeviceSettingPopover>
</div>
</div>
@@ -139,7 +139,7 @@
<a-switch checked-children="开" un-checked-children="关" v-model:checked="deviceSettingFormModel.obstacleAvoidanceDownside" />
</div>
</template>
- <a @click="onShowPopConfirm(deviceSetting[DeviceSettingKeyEnum.OBSTACLE_AVOIDANCE_DOWNSIDE].settingKey)">Edit</a>
+ <a @click="onShowPopConfirm(deviceSetting[DeviceSettingKeyEnum.OBSTACLE_AVOIDANCE_DOWNSIDE].settingKey)">编辑</a>
</DeviceSettingPopover>
</div>
</div>
diff --git a/src/components/g-map/DockControlPanel.vue b/src/components/g-map/DockControlPanel.vue
index ade675b..e6d40ab 100644
--- a/src/components/g-map/DockControlPanel.vue
+++ b/src/components/g-map/DockControlPanel.vue
@@ -2,7 +2,7 @@
<div class="dock-control-panel">
<!-- title -->
<div class="dock-control-panel-header fz16 pl5 pr5 flex-align-center flex-row flex-justify-between">
- <span>Device Control<span class="fz12 pl15">{{ props.sn}}</span></span>
+ <span>设备控制<span class="fz12 pl15">{{ props.sn}}</span></span>
<span @click="closeControlPanel">
<CloseOutlined />
</span>
@@ -12,7 +12,7 @@
<!-- cmd -->
<div class="control-cmd-wrapper">
<div class="control-cmd-header">
- Device Remote Debug
+ 远程调试
<a-switch class="debug-btn" checked-children="开" un-checked-children="关" v-model:checked="debugStatus" @change="onDeviceStatusChange"/>
</div>
<div class="control-cmd-box">
diff --git a/src/components/g-map/DroneControlPanel.vue b/src/components/g-map/DroneControlPanel.vue
index ea8956a..1956f4c 100644
--- a/src/components/g-map/DroneControlPanel.vue
+++ b/src/components/g-map/DroneControlPanel.vue
@@ -1,10 +1,10 @@
<template>
<div class="drone-control-wrapper">
- <div class="drone-control-header">Drone Flight Control</div>
+ <div class="drone-control-header">无人机飞行控制</div>
<div class="drone-control-box">
<div class="box">
<div class="row">
- <div class="drone-control"><Button :ghost="!flightController" size="small" @click="onClickFightControl">{{ flightController ? 'Exit Remote Control' : 'Enter Remote Control'}}</Button></div>
+ <div class="drone-control"><Button :ghost="!flightController" size="small" @click="onClickFightControl">{{ flightController ? '退出控制' : '进入控制'}}</Button></div>
</div>
<div class="row">
<div class="drone-control-direction">
@@ -35,7 +35,7 @@
</Button>
</div>
<Button type="primary" size="small" danger ghost @click="handleEmergencyStop" >
- <template #icon><PauseCircleOutlined/></template><span>Break</span>
+ <template #icon><PauseCircleOutlined/></template><span>结束</span>
</Button>
</div>
<div class="row">
@@ -62,11 +62,11 @@
</div>
</template>
<Button size="small" ghost @click="onShowFlyToPopover" >
- <span>Fly to</span>
+ <span>起飞</span>
</Button>
</DroneControlPopover>
<Button size="small" ghost @click="onStopFlyToPoint" >
- <span>Stop Fly to</span>
+ <span>停止起飞</span>
</Button>
<DroneControlPopover
:visible="takeoffToPointPopoverData.visible"
@@ -115,7 +115,7 @@
</div>
</template>
<Button size="small" ghost @click="onShowTakeoffToPointPopover" >
- <span>Take off</span>
+ <span>起飞</span>
</Button>
</DroneControlPopover>
<Button :loading="cmdItem.loading" size="small" ghost @click="sendControlCmd(cmdItem, 0)">
@@ -127,7 +127,7 @@
<div class="row">
<Select v-model:value="payloadSelectInfo.value" style="width: 110px; marginRight: 5px" :options="payloadSelectInfo.options" @change="handlePayloadChange"/>
<div class="drone-control">
- <Button type="primary" size="small" @click="onAuthPayload">Payload Control</Button>
+ <Button type="primary" size="small" @click="onAuthPayload">有效载荷控制</Button>
</div>
</div>
<div class="row">
@@ -150,24 +150,24 @@
</div>
</template>
<Button size="small" ghost @click="onShowGimbalResetPopover">
- <span>Gimbal Reset</span>
+ <span>复位</span>
</Button>
</DroneControlPopover>
<Button size="small" ghost @click="onSwitchCameraMode">
- <span>Camera Mode Switch</span>
+ <span>相机模式开关</span>
</Button>
</div>
<div class="row">
<Button size="small" ghost @click="onStartCameraRecording">
- <span>Start Recording</span>
+ <span>开始录制</span>
</Button>
<Button size="small" ghost @click="onStopCameraRecording">
- <span>Stop Recording</span>
+ <span>停止录制</span>
</Button>
</div>
<div class="row">
<Button size="small" ghost @click="onTakeCameraPhoto">
- <span>Take Photo</span>
+ <span>拍照</span>
</Button>
<DroneControlPopover
:visible="zoomFactorPopoverData.visible"
@@ -192,7 +192,7 @@
</div>
</template>
<Button size="small" ghost @click="($event) => onShowZoomFactorPopover()">
- <span class="word" @click=";">Zoom</span>
+ <span class="word" @click=";">聚焦</span>
</Button>
</DroneControlPopover>
<DroneControlPopover
@@ -226,14 +226,14 @@
</div>
</template>
<Button size="small" ghost @click="($event) => onShowCameraAimPopover()">
- <span class="word" @click=";">AIM</span>
+ <span class="word" @click=";">目标</span>
</Button>
</DroneControlPopover>
</div>
</div>
</div>
<!-- 信息提示 -->
- <DroneControlInfoPanel :message="drcInfo"></DroneControlInfoPanel>
+ <!-- <DroneControlInfoPanel :message="drcInfo"></DroneControlInfoPanel> -->
</div>
</template>
@@ -271,6 +271,7 @@
const initCmdList = baseCmdList.find(item => item.cmdKey === DeviceCmd.ReturnHome) as DeviceCmdItem
const cmdItem = ref(initCmdList)
+console.log(cmdItem, 'cmdItem')
const {
sendDockControlCmd
diff --git a/src/pages/page-web/projects/tsa.vue b/src/pages/page-web/projects/tsa.vue
index df0d40b..fc45c61 100644
--- a/src/pages/page-web/projects/tsa.vue
+++ b/src/pages/page-web/projects/tsa.vue
@@ -16,9 +16,6 @@
<a-empty style="color: #fff;" :image="simpleImage" description="暂无数据" :image-style="{ height: '60px' }" />
</div>
<div v-else class="fz12" style="color: white;">
- {{ onlineDocks.data }}
- =========
- {{ dockInfo }}
<div v-for="dock in onlineDocks.data" :key="dock.sn"
style="background: #3c3c3c; height: 90px; margin-bottom: 10px;">
<div style="border-radius: 2px; height: 100%; width: 100%;"
@@ -97,12 +94,11 @@
<div class="flex-row">
<span class="ml5 mr5">
<RocketOutlined />
- 123
</span>
<div class="font-bold text-hidden" style="max-width: 80px"
:style="deviceInfo[dock.sn] && deviceInfo[dock.sn].mode_code !== EModeCode.Disconnected ? 'color: #00ee8b' : 'color: red;'">
- {{ deviceInfo[dock.sn] ? EModeCode[deviceInfo[dock.sn].mode_code] :
- EModeCode[EModeCode.Disconnected] }}
+ {{ deviceInfo[dock.sn] ? EModeText[deviceInfo[dock.sn].mode_code] :
+ EModeText[EModeCode.Disconnected] }}
</div>
</div>
<div class="mr5 flex-align-center flex-row" style="width: 85px; margin-right: 0; height: 18px;">
@@ -249,7 +245,7 @@
import { EDeviceTypeName, ELocalStorageKey } from '/@/types'
import noData from '/@/assets/icons/no-data.png'
import rc from '/@/assets/icons/rc.png'
-import { OnlineDevice, EModeCode, OSDVisible, EDockModeCode, DeviceOsd, EDockModeText } from '/@/types/device'
+import { OnlineDevice, EModeCode, OSDVisible, EDockModeCode, DeviceOsd, EDockModeText, EModeText } from '/@/types/device'
import { useMyStore } from '/@/store'
import { getDeviceTopo, getUnreadDeviceHms, updateDeviceHms } from '/@/api/manage'
import { RocketOutlined, EyeInvisibleOutlined, EyeOutlined, RobotOutlined, DoubleRightOutlined } from '@ant-design/icons-vue'
diff --git a/src/types/device-cmd.ts b/src/types/device-cmd.ts
index c1e545d..6dd7be1 100644
--- a/src/types/device-cmd.ts
+++ b/src/types/device-cmd.ts
@@ -41,9 +41,9 @@
}
export const noDebugCmdList: DeviceCmdItem[] = [
{
- label: 'Return Home',
+ label: '返航',
status: '--',
- operateText: 'Return Home',
+ operateText: '返航',
cmdKey: DeviceCmd.ReturnHome,
func: 'returnHome',
loading: false,
--
Gitblit v1.9.3