From 490dfddd9ae4b68b0fe039c2ee151e9bd748775d Mon Sep 17 00:00:00 2001
From: husq <931347610@qq.com>
Date: Tue, 19 Sep 2023 11:11:12 +0800
Subject: [PATCH] 英文名称修改为中文
---
src/components/GMap.vue | 9 ++--
src/pages/page-web/projects/tsa.vue | 4 +-
src/components/g-map/DroneControlPanel.vue | 49 ++++++++++++------------
src/types/drone-control.ts | 10 ++--
4 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/src/components/GMap.vue b/src/components/GMap.vue
index 3c6e07c..93e0979 100644
--- a/src/components/GMap.vue
+++ b/src/components/GMap.vue
@@ -917,10 +917,10 @@
}
// 下拉框选择变化
const selectChange = async (e) => {
- await closeFly()
- setTimeout(async () => {
- await flyOnStart()
- }, 500)
+ // await closeFly()
+ // setTimeout(async () => {
+ await flyOnStart()
+ // }, 500)
}
// 关闭设备直播
const onClose = async () => {
@@ -936,6 +936,7 @@
}
// 飞机设备播放
const flyOnStart = async () => {
+ aircraftUrl.value = ''
const videoId = deviceInfo.dock.basic_osd?.sub_device?.device_sn + '/' + aircraSelected.value + '/' + 'normal-0'
const streamId = deviceInfo.dock.basic_osd?.sub_device?.device_sn + '-' + aircraSelected.value + '-' + 'normal-0'
const liveURL = config.rtmpURL + streamId
diff --git a/src/components/g-map/DroneControlPanel.vue b/src/components/g-map/DroneControlPanel.vue
index 266589d..4e75eac 100644
--- a/src/components/g-map/DroneControlPanel.vue
+++ b/src/components/g-map/DroneControlPanel.vue
@@ -48,15 +48,15 @@
<template #formContent>
<div class="form-content">
<div>
- <span class="form-label">latitude:</span>
+ <span class="form-label">纬度:</span>
<a-input-number v-model:value="flyToPointPopoverData.latitude"/>
</div>
<div>
- <span class="form-label">longitude:</span>
+ <span class="form-label">经度:</span>
<a-input-number v-model:value="flyToPointPopoverData.longitude"/>
</div>
<div>
- <span class="form-label">height(m):</span>
+ <span class="form-label">高度(m):</span>
<a-input-number v-model:value="flyToPointPopoverData.height"/>
</div>
</div>
@@ -77,27 +77,27 @@
<template #formContent>
<div class="form-content">
<div>
- <span class="form-label">latitude:</span>
+ <span class="form-label">纬度:</span>
<a-input-number v-model:value="takeoffToPointPopoverData.latitude"/>
</div>
<div>
- <span class="form-label">longitude:</span>
+ <span class="form-label">经度:</span>
<a-input-number v-model:value="takeoffToPointPopoverData.longitude"/>
</div>
<div>
- <span class="form-label">height(m):</span>
+ <span class="form-label">高度(m):</span>
<a-input-number v-model:value="takeoffToPointPopoverData.height"/>
</div>
<div>
- <span class="form-label">Safe Takeoff Altitude(m):</span>
+ <span class="form-label">安全起飞高度(m):</span>
<a-input-number v-model:value="takeoffToPointPopoverData.securityTakeoffHeight"/>
</div>
<div>
- <span class="form-label">Return-to-Home Altitude(m):</span>
+ <span class="form-label">返回原点高度(m):</span>
<a-input-number v-model:value="takeoffToPointPopoverData.rthAltitude"/>
</div>
<div>
- <span class="form-label">Lost Action:</span>
+ <span class="form-label">失控操作:</span>
<a-select
v-model:value="takeoffToPointPopoverData.rcLostAction"
style="width: 120px"
@@ -105,7 +105,7 @@
></a-select>
</div>
<div>
- <span class="form-label">Wayline Lost Action:</span>
+ <span class="form-label">线路丢失操作:</span>
<a-select
v-model:value="takeoffToPointPopoverData.exitWaylineWhenRcLost"
style="width: 120px"
@@ -140,7 +140,7 @@
<template #formContent>
<div class="form-content">
<div>
- <span class="form-label">reset mode:</span>
+ <span class="form-label">重置模式:</span>
<a-select
v-model:value="gimbalResetPopoverData.resetMode"
style="width: 180px"
@@ -178,7 +178,7 @@
<template #formContent>
<div class="form-content">
<div>
- <span class="form-label">camera type:</span>
+ <span class="form-label">相机类型:</span>
<a-select
v-model:value="zoomFactorPopoverData.cameraType"
style="width: 120px"
@@ -186,7 +186,7 @@
></a-select>
</div>
<div>
- <span class="form-label">zoom factor:</span>
+ <span class="form-label">缩放:</span>
<a-input-number v-model:value="zoomFactorPopoverData.zoomFactor" :min="2" :max="200" />
</div>
</div>
@@ -204,7 +204,7 @@
<template #formContent>
<div class="form-content">
<div>
- <span class="form-label">camera type:</span>
+ <span class="form-label">相机类型:</span>
<a-select
v-model:value="cameraAimPopoverData.cameraType"
style="width: 120px"
@@ -212,7 +212,7 @@
></a-select>
</div>
<div>
- <span class="form-label">locked:</span>
+ <span class="form-label">锁定:</span>
<a-switch v-model:checked="cameraAimPopoverData.locked"/>
</div>
<div>
@@ -271,7 +271,6 @@
const initCmdList = baseCmdList.find(item => item.cmdKey === DeviceCmd.ReturnHome) as DeviceCmdItem
const cmdItem = ref(initCmdList)
-console.log(cmdItem, 'cmdItem')
const {
sendDockControlCmd
@@ -285,10 +284,10 @@
action: cmdItem.action
}, false)
if (result && flightController.value) {
- message.success('Return home successful')
+ message.success('返航成功')
exitFlightCOntrol()
} else {
- message.error('Failed to return home')
+ message.error('返航失败')
}
cmdItem.loading = false
}
@@ -316,7 +315,7 @@
async function onFlyToConfirm (confirm: boolean) {
if (confirm) {
if (!flyToPointPopoverData.height || !flyToPointPopoverData.latitude || !flyToPointPopoverData.longitude) {
- message.error('Input error')
+ message.error('输入错误')
return
}
try {
@@ -371,7 +370,7 @@
!takeoffToPointPopoverData.longitude ||
!takeoffToPointPopoverData.securityTakeoffHeight ||
!takeoffToPointPopoverData.rthAltitude) {
- message.error('Input error')
+ message.error('输入错误')
return
}
try {
@@ -432,7 +431,7 @@
if (droneControlSource.value !== ControlSource.A) {
await postFlightAuth(props.sn)
}
- message.success('Get flight control successfully')
+ message.success('获取飞行控制成功')
}
} catch (error: any) {
}
@@ -449,7 +448,7 @@
flightController.value = false
deviceTopicInfo.subTopic = ''
deviceTopicInfo.pubTopic = ''
- message.success('Exit flight control')
+ message.success('退出飞行控制成功')
}
} catch (error: any) {
}
@@ -575,7 +574,7 @@
async function onGimbalResetConfirm (confirm: boolean) {
if (confirm) {
if (gimbalResetPopoverData.resetMode === null) {
- message.error('Please select reset mode')
+ message.error('请选择重置模式')
return
}
gimbalResetPopoverData.loading = true
@@ -639,7 +638,7 @@
async function onZoomFactorConfirm (confirm: boolean) {
if (confirm) {
if (!zoomFactorPopoverData.zoomFactor || zoomFactorPopoverData.cameraType === null) {
- message.error('Please input Zoom Factor')
+ message.error('请输入缩放程度')
return
}
zoomFactorPopoverData.loading = true
@@ -676,7 +675,7 @@
async function onCameraAimConfirm (confirm: boolean) {
if (confirm) {
if (cameraAimPopoverData.cameraType === null || cameraAimPopoverData.x === null || cameraAimPopoverData.y === null) {
- message.error('Input error')
+ message.error('输入错误')
return
}
try {
diff --git a/src/pages/page-web/projects/tsa.vue b/src/pages/page-web/projects/tsa.vue
index f76341e..9a630cb 100644
--- a/src/pages/page-web/projects/tsa.vue
+++ b/src/pages/page-web/projects/tsa.vue
@@ -116,7 +116,7 @@
<div :class="hmsInfo[dock.sn][0].level === EHmsLevel.CAUTION ? 'caution' :
hmsInfo[dock.sn][0].level === EHmsLevel.WARN ? 'warn' : 'notice'"
style="margin-left: 3px; width: 62px; height: 16px;">
- <span class="word-loop">{{ hmsInfo[dock.sn][0].message_en }}</span>
+ <span class="word-loop">{{ hmsInfo[dock.sn][0].message_zh }}</span>
</div>
<template #content>
<a-collapse style="background: black; height: 300px; overflow-y: auto;" :bordered="false"
@@ -127,7 +127,7 @@
<template #header="{ isActive }">
<div class="flex-row flex-align-center" style="width: 130px;">
<div style="width: 110px;">
- <span class="word-loop">{{ hms.message_en }}</span>
+ <span class="word-loop">{{ hms.message_zh }}</span>
</div>
<div style="width: 20px; height: 15px; font-size: 10px; z-index: 2 "
class="flex-row flex-align-center flex-justify-center"
diff --git a/src/types/drone-control.ts b/src/types/drone-control.ts
index 4c16619..be48bb4 100644
--- a/src/types/drone-control.ts
+++ b/src/types/drone-control.ts
@@ -42,14 +42,14 @@
}
export const WaylineLostControlActionInCommandFlightOptions = [
- { label: 'Continue', value: WaylineLostControlActionInCommandFlight.CONTINUE },
- { label: 'Execute Lost Action', value: WaylineLostControlActionInCommandFlight.EXEC_LOST_ACTION }
+ { label: '持续', value: WaylineLostControlActionInCommandFlight.CONTINUE },
+ { label: '执行失控操作', value: WaylineLostControlActionInCommandFlight.EXEC_LOST_ACTION }
]
export const LostControlActionInCommandFLightOptions = [
- { label: 'Return Home', value: LostControlActionInCommandFLight.RETURN_HOME },
- { label: 'Hover', value: LostControlActionInCommandFLight.HOVER },
- { label: 'Landing', value: LostControlActionInCommandFLight.Land }
+ { label: '返航', value: LostControlActionInCommandFLight.RETURN_HOME },
+ { label: '悬停', value: LostControlActionInCommandFLight.HOVER },
+ { label: '着陆', value: LostControlActionInCommandFLight.Land }
]
// 云台重置模式
--
Gitblit v1.9.3