From 744f3b89a2ed8832f669f322ace820d65cba33fc Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 13 Oct 2023 10:25:40 +0800
Subject: [PATCH] 调整表格宽度
---
src/components/GMap.vue | 293 ++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 192 insertions(+), 101 deletions(-)
diff --git a/src/components/GMap.vue b/src/components/GMap.vue
index 8d32862..693bfce 100644
--- a/src/components/GMap.vue
+++ b/src/components/GMap.vue
@@ -113,13 +113,13 @@
<a-col span="6">
<a-tooltip title="海拔高度">
<span>ASL</span>
- <span class="ml5">{{ deviceInfo.device.height === str ? str : deviceInfo.device.height.toFixed(2) + ' m'}}</span>
+ <span class="ml5">{{ 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="ml5">{{ deviceInfo.device.elevation === str ? str : deviceInfo.device.elevation.toFixed(2) +' m' }}</span>
+ <span class="ml5">{{ deviceInfo.device.elevation === str ? str : deviceInfo.device.elevation.toFixed(2) + 'm' }}</span>
</a-tooltip>
</a-col>
<a-col span="6">
@@ -197,10 +197,10 @@
{{ EDockModeText[deviceInfo.dock.basic_osd?.mode_code] }}</a-col>
<!-- <a-col span="1">{{ hmsInfo[sn]?.length || 1 }}</a-col> -->
<a-col span="1" class="num" v-if="hmsInfo[sn]">{{ hmsInfo[sn]?.length }}</a-col>
- <a-col span="14" v-if="hmsInfo[sn] && hmsInfo[sn].length>0" style="width: 100%;padding-left:5px ;">
+ <a-col span="14" v-if="hmsInfo[sn] && hmsInfo[sn].length > 0" style="width: 100%;padding-left:5px ;">
<a-tooltip :title="hmsInfo[sn][0].message_zh">
- <div class="overflow">{{ hmsInfo[sn][0].message_zh }}</div>
- </a-tooltip>
+ <div class="overflow">{{ hmsInfo[sn][0].message_zh }}</div>
+ </a-tooltip>
</a-col>
</a-row>
<a-row>
@@ -253,6 +253,58 @@
<span class="ml5">{{ deviceInfo.dock.link_osd?.media_file_detail?.remain_upload }}</span>
</a-tooltip>
</div>
+ </div>
+ </a-col>
+ <!-- <a-col span="12">
+ <a-tooltip title="激活时间">
+ <span><FieldTimeOutlined /></span>
+ <span class="ml5">{{ new Date((deviceInfo.dock.work_osd?.activation_time ?? 0) * 1000).toLocaleString() }}
+ </span>
+ </a-tooltip>
+ </a-col> -->
+ </a-row>
+ <a-row>
+ <!-- <a-col span="12">
+ <a-tooltip title="累计运行时间">
+ <span><HistoryOutlined /></span>
+ <span class="ml5">
+ <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="9">
+ <a-tooltip title="设备上的无人机">
+ <span>
+ <RocketOutlined />
+ </span>
+ <span class="ml5">{{ DroneInDockEnum[deviceInfo.dock.basic_osd?.drone_in_dock] }}</span>
+ </a-tooltip>
+ </a-col>
+ <a-col span="15" style="width: 100%;">
+ <div class="env-box span5 op_btn">
+ <a-col span="6">
+ <a-tooltip title="设备湿度">
+ <span>💦</span>
+ <span class="ml5">{{ deviceInfo.dock.basic_osd?.humidity }}</span>
+ </a-tooltip>
+ </a-col>
+ <a-col span="8">
+ <a-button :class="[showMonitor ? 'active-color' : 'unactive-color']" class="width-100" type="primary"
+ size="small" @click="openMonitor">
+ 监控
+ </a-button>
+ </a-col>
+ <a-col span="2"></a-col>
+ <a-col span="8">
+ <a-button :class="[airPortOption ? 'active-color' : 'unactive-color']" class="width-100" type="primary"
+ size="small" @click="openFlySetting">
+ 操作
+ </a-button>
+ </a-col>
</div>
</a-col>
<!-- <a-col span="12">
@@ -353,19 +405,20 @@
</a-tooltip>
</a-col>
</a-row> -->
- <a-row class="p5" justify="space-between">
+ <!-- <a-row class="p5" justify="space-between">
<a-col span="11">
- <a-button :class="[showMonitor?'active-color':'unactive-color']" class="width-100" type="primary" size="small" @click="openMonitor">
+ <a-button :class="[showMonitor ? 'active-color' : 'unactive-color']" class="width-100" type="primary"
+ size="small" @click="openMonitor">
监控
</a-button>
</a-col>
<a-col span="11">
- <a-button :class="[showOption?'active-color':'unactive-color']" class="width-100" type="primary" :disabled="dockControlPanelVisible" size="small"
- @click="openFlySetting">
+ <a-button :class="[showOption ? 'active-color' : 'unactive-color']" class="width-100" type="primary"
+ :disabled="dockControlPanelVisible" size="small" @click="openFlySetting">
操作
</a-button>
</a-col>
- </a-row>
+ </a-row> -->
<!-- 机场控制面板 -->
<DockControlPanel v-if="dockControlPanelVisible" :sn="osdVisible.gateway_sn" :deviceInfo="deviceInfo"
@close-control-panel="closeOperate">
@@ -374,7 +427,7 @@
</div>
<a-row class="p5" v-if="showMonitor" justify="center" align="middle">
<!-- <a-spin :spinning="spinning"> -->
- <Jessibuca v-if="airPortUrl" @timeout="airTimeout" :videoUrl="airPortUrl" width="100%" height="300px" />
+ <Jessibuca v-if="airPortUrl" @timeout="airTimeout" :videoUrl="airPortUrl" width="100%" height="300px" />
<!-- </a-spin> -->
</a-row>
<!-- 飞机-->
@@ -390,25 +443,41 @@
<div class="osd flex-1">
<a-row class="mr-20" align="middle">
<a-col span="9"
- :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]
+ :style="deviceInfo.device || deviceInfo.device?.mode_code !== EModeCode.Disconnected ? 'color: rgb(25,190,107)' : deviceInfo.dock.basic_osd?.drone_in_dock === 0 ?'color: red; font-weight: 700;': '' ">
+ <!-- DroneInDockEnum[deviceInfo.dock.basic_osd?.drone_in_dock] -->
+ {{ deviceInfo.device ? EModeText[deviceInfo.device?.mode_code] : (deviceInfo.dock.basic_osd?.drone_in_dock === 1) ? '舱内关机' : EModeText[EModeCode.Disconnected]
}}</a-col>
<a-col span="15">
- <a-select :showArrow="false" v-model:value="aircraSelected" :bordered="false" :options="aircraftList" :placeholder="aircraftList.length==0?'N/A':'请选择'" :disabled="aircraftList.length==0?true:false" size="small" style="width:100%;background-color: #5d5f61;color: #fff;" @change="selectChange"></a-select>
+ <div style="width:100%;padding:0 5px;background-color: #5d5f61;color: #fff;font-size: 10px;">{{deviceInfo.device?.mode_code == 14 || !deviceInfo.device ? 'N/A' : '当前正常'}}</div>
+ <!-- <a-select :showArrow="false" v-model:value="aircraSelected" :bordered="false" :options="aircraftList"
+ :placeholder="aircraftList.length == 0 ? 'N/A' : '请选择'" :disabled="aircraftList.length == 0 ? true : false"
+ size="small" style="width:100%;background-color: #5d5f61;color: #fff;" @change="selectChange"></a-select> -->
</a-col>
</a-row>
<a-row align="middle" justify="center">
- <a-col span="24"> <div v-if="deviceInfo.device?.mode_code == 14 || !deviceInfo.device" style="color:#494949;" class="flex-display flex-justify-center mt5 mb5">当前设备已关机，无法进行直播</div> </a-col>
+ <a-col span="24">
+ <div v-if="deviceInfo.device?.mode_code == 14 || !deviceInfo.device" style="color:#494949;"
+ class="flex-display flex-justify-center mt5 mb5">当前设备已关机，无法进行直播</div>
+ </a-col>
</a-row>
- <a-row class="p5" align="middle" justify="space-between">
+ <a-row class="p5" v-if="deviceInfo.device?.mode_code != 14 && deviceInfo.device" align="middle" justify="space-between">
<a-col span="11">
- <a-button :disabled="deviceInfo.device?.mode_code == 14 || !deviceInfo.device?true:false" :class="[showAircraft?'active-color':'unactive-color']" class="width-100" type="primary" size="small" @click="openAircra">
- 飞行控制
+ <a-button :class="[aircrafIndex === 0 ? 'active-color' : 'unactive-color']" class="width-100" type="primary" size="small"
+ @click="openAircra(0)">
+ 飞行相机
</a-button>
</a-col>
<a-col span="11">
- <a-button :class="[openDroneControl?'active-color':'unactive-color']" class="width-100" type="primary" size="small"
- @click="openDeviceSetting">
+ <a-button :class="[aircrafIndex === 1 ? 'active-color' : 'unactive-color']" class="width-100" type="primary"
+ size="small" @click="openAircra(1)">
+ M30T相机
+ </a-button>
+ </a-col>
+ </a-row>
+ <a-row v-if="deviceInfo.device?.mode_code != 14 && deviceInfo.device" class="p5" align="middle" justify="space-between">
+ <a-col span="24">
+ <a-button :class="[openDroneControl ? 'active-color' : 'unactive-color']" class="width-100" type="primary"
+ size="small" @click="openDeviceSetting">
操作
</a-button>
</a-col>
@@ -418,12 +487,12 @@
<!-- 飞机直播 -->
<a-row class="p5" v-if="showAircraft">
<!-- <a-spin :spinning="spinning"> -->
- <Jessibuca v-if="aircraftUrl" @timeout="flyTimeout" :videoUrl="aircraftUrl" width="100%" height="300px" />
+ <Jessibuca v-if="aircraftUrl" @timeout="flyTimeout" :videoUrl="aircraftUrl" width="100%" height="300px" />
<!-- </a-spin> -->
</a-row>
<!-- 飞机图标信息 -->
<div class="osd-info flex-1">
- <!-- <a-row align="middle">
+ <!-- <a-row align="middle">
<a-col span="6">
<a-tooltip title="向上质量">
<span>
@@ -547,63 +616,63 @@
</a-tooltip>
</a-col>
</a-row> -->
- <a-row align="middle">
- <a-col span="6" class="flex-row flex-align-center flex-justify-start">
- <a-tooltip title="飞行模式">
- <span>
- <ControlOutlined class="fz16" />
- </span>
- <span class="ml5">{{ deviceInfo.device ? EGear[deviceInfo.device?.gear] : str }}</span>
- </a-tooltip>
- </a-col>
- <a-col span="6">
- <a-tooltip title="RTK">
- <span>
- <TrademarkOutlined class="fz14" />
- </span>
- <span class="ml5">{{ deviceInfo.device ? deviceInfo.device.position_state.rtk_number : str }}</span>
- </a-tooltip>
- </a-col>
- <a-col span="6">
- <a-tooltip title="无人机电池电量">
- <span>
- <ThunderboltOutlined class="fz14" />
- </span>
- <span class="ml5">{{ deviceInfo.device && deviceInfo.device.battery.capacity_percent !== str ?
- deviceInfo.device?.battery.capacity_percent + ' %' : str }}</span>
- </a-tooltip>
- </a-col>
- </a-row>
- <a-row align="middle" class="mt10">
- <a-col span="6">
- <a-tooltip title="海拔高度">
- <span>ASL</span>
- <span class="ml5">{{ !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="ml5">{{ !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>H.S</span>
- <span class="ml5">{{ !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="ml5">{{ !deviceInfo.device || deviceInfo.device.vertical_speed === str ? str :
- deviceInfo.device?.vertical_speed.toFixed(2) + ' m/s' }}</span>
- </a-tooltip>
- </a-col>
- </a-row>
+ <a-row align="middle">
+ <a-col span="6" class="flex-row flex-align-center flex-justify-start">
+ <a-tooltip title="飞行模式">
+ <span>
+ <ControlOutlined class="fz16" />
+ </span>
+ <span class="ml5">{{ deviceInfo.device ? EGear[deviceInfo.device?.gear] : str }}</span>
+ </a-tooltip>
+ </a-col>
+ <a-col span="6">
+ <a-tooltip title="RTK">
+ <span>
+ <TrademarkOutlined class="fz14" />
+ </span>
+ <span class="ml5">{{ deviceInfo.device ? deviceInfo.device.position_state.rtk_number : str }}</span>
+ </a-tooltip>
+ </a-col>
+ <a-col span="6">
+ <a-tooltip title="无人机电池电量">
+ <span>
+ <ThunderboltOutlined class="fz14" />
+ </span>
+ <span class="ml5">{{ deviceInfo.device && deviceInfo.device.battery.capacity_percent !== str ?
+ deviceInfo.device?.battery.capacity_percent + ' %' : str }}</span>
+ </a-tooltip>
+ </a-col>
+ </a-row>
+ <a-row align="middle" class="mt10">
+ <a-col span="6">
+ <a-tooltip title="海拔高度">
+ <span>ASL</span>
+ <span class="ml5">{{ !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="ml5">{{ !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>H.S</span>
+ <span class="ml5">{{ !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="ml5">{{ !deviceInfo.device || deviceInfo.device.vertical_speed === str ? str :
+ deviceInfo.device?.vertical_speed.toFixed(2) + ' m/s' }}</span>
+ </a-tooltip>
+ </a-col>
+ </a-row>
</div>
<!-- 飞行控制 -->
<!-- <div class="fly-control flex-display">
@@ -628,7 +697,8 @@
</div>
</div>
<!-- 飞行指令 -->
- <DroneControlPanel v-model="openDroneControl" :sn="osdVisible.gateway_sn" :deviceInfo="deviceInfo" :payloads="osdVisible.payloads">
+ <DroneControlPanel v-model="openDroneControl" :sn="osdVisible.gateway_sn" :deviceInfo="deviceInfo"
+ :payloads="osdVisible.payloads">
</DroneControlPanel>
</div>
</div>
@@ -706,21 +776,20 @@
const useGMapManageHook = useGMapManage()
const deviceTsaUpdateHook = deviceTsaUpdate()
interface SelectOption {
- value: any,
- label: string,
- more?: any
-}
+ value: any,
+ label: string,
+ more?: any
+ }
// 打开飞行控制
const openDroneControl = ref(false)
const root = getRoot()
// 监控显示
const showMonitor = ref(false)
- // 操作显示
- const showOption = ref(false)
const mouseMode = ref(false)
const store = useMyStore()
// 机场直播地址
const airPortUrl = ref('')
+ const airPortOption = ref(false)
// 设备列表
const droneList = ref()
// 设备相机
@@ -738,7 +807,8 @@
const showAircraft = ref(false)
// 飞机视频列表
const aircraftList = ref([])
- const aircraSelected = ref('')
+ const aircraSelected = ref(undefined)
+ const aircrafIndex = ref(-1)
const state = reactive({
currentType: '',
coverIndex: 0
@@ -812,10 +882,17 @@
}
}
// 打开飞机监控
- const openAircra = () => {
+ const openAircra = (type: number) => {
showAircraft.value = !showAircraft.value
+ if (type === aircrafIndex.value) {
+ showAircraft.value = false
+ aircrafIndex.value = -1
+ } else {
+ showAircraft.value = true
+ aircrafIndex.value = type
+ }
if (showAircraft.value) {
- loadDroneVideo()
+ loadDroneVideo(type)
} else {
closeFly()
}
@@ -869,7 +946,7 @@
})
}
// 加载无人机的视频信息
- const loadDroneVideo = async () => {
+ const loadDroneVideo = async (index: number) => {
aircraftList.value = []
await getLiveCapacity({ id: store.state.common.projectId })
.then(res => {
@@ -878,7 +955,6 @@
console.warn('warning: get live capacity is null!!!')
return
}
- const resData: Array<[]> = res.data
const drone = res.data.find(v => v.sn === deviceInfo.dock.basic_osd.sub_device?.device_sn)
const temp: Array<SelectOption> = []
if (drone) {
@@ -894,7 +970,7 @@
vadeosList: v.videos_list
}
})
- aircraSelected.value = aircraftList.value[0].value
+ aircraSelected.value = aircraftList.value[index].value
flyOnStart()
} else {
showAircraft.value = false
@@ -963,6 +1039,7 @@
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
+ console.log('飞机设备播放事件触发')
await startLivestream({
url: liveURL,
video_id: videoId,
@@ -995,11 +1072,17 @@
// 打开机场操作
const openFlySetting = () => {
openDroneControl.value = false
- setDockControlPanelVisible(true)
+ airPortOption.value = !airPortOption.value
+ if (airPortOption.value) {
+ setDockControlPanelVisible(true)
+ } else {
+ setDockControlPanelVisible(false)
+ }
}
// 打开无人机操作
const openDeviceSetting = () => {
setDockControlPanelVisible(false)
+ airPortOption.value = false
openDroneControl.value = !openDroneControl.value
}
watch(() => store.state.deviceStatusEvent,
@@ -1041,7 +1124,7 @@
aircraftUrl.value = ''
showAircraft.value = false
aircraftList.value = []
- aircraSelected.value = ''
+ aircraSelected.value = undefined
airPortUrl.value = ''
droneList.value = []
if (deviceInfo.dock.basic_osd?.mode_code === 2) {
@@ -1119,7 +1202,8 @@
onCloseControlPanel,
} = useDockControl()
// 关闭设备控制方法
- const closeOperate = (sn:string) => {
+ const closeOperate = (sn: string) => {
+ airPortOption.value = false
if (deviceInfo.dock.basic_osd?.mode_code === 2) {
onCloseControlPanel(sn)
} else {
@@ -1313,7 +1397,6 @@
hmsInfo,
sn,
showMonitor,
- showOption,
airPortUrl,
openMonitor,
droneIndex,
@@ -1329,7 +1412,9 @@
openFlySetting,
openDeviceSetting,
airTimeout,
- flyTimeout
+ flyTimeout,
+ aircrafIndex,
+ airPortOption
}
}
})
@@ -1380,10 +1465,10 @@
left: 10px;
top: 10px;
width: 480px;
- background: #000;
+ background-color: #232323;
color: #fff;
border-radius: 2px;
- opacity: 0.8;
+ // opacity: 0.8;
}
.overflow {
@@ -1394,9 +1479,11 @@
white-space: nowrap;
text-overflow: ellipsis;
}
+
.osd-info {
margin: 15px 10px;
}
+
.num {
padding: 0 5px;
background-color: #ff9900;
@@ -1409,9 +1496,14 @@
padding-right: 20px;
}
+.op_btn {
+ justify-content: space-between;
+}
+
.osd>div:not(.dock-control-panel) {
margin-top: 5px;
padding-left: 5px;
+ margin-bottom: 5px;
}
.circle {
@@ -1456,5 +1548,4 @@
position: absolute;
min-height: 2px;
border-radius: 2px;
-}
-</style>
+}</style>
--
Gitblit v1.9.3