Compare commits
No commits in common. "68308574151e7fc41dab7881c49c59a949cf1854" and "9065e497712a402f6948097c8243cb3e7d6b8aeb" have entirely different histories.
6830857415
...
9065e49771
@ -195,7 +195,7 @@ export default {
|
||||
]
|
||||
},
|
||||
detailUav: {
|
||||
visible: true,
|
||||
visible: false,
|
||||
id: 1,
|
||||
baseInfo: {
|
||||
url: require('@/assets/img/uav.png'),
|
||||
@ -206,7 +206,7 @@ export default {
|
||||
longitude: 123.232312,
|
||||
latitude: 23.232312,
|
||||
},
|
||||
activeNames: ['3', '4'],
|
||||
activeNames: ['1'],
|
||||
activeTab: 'DEV',
|
||||
basicsInfo: {
|
||||
name: '无人机1',
|
||||
@ -240,38 +240,38 @@ export default {
|
||||
],
|
||||
statusInfo: {
|
||||
dev: [
|
||||
// { name: '是否开机', value: '是', unit: '' },
|
||||
{ name: '是否开机', value: '是', unit: '' },
|
||||
{ name: '时钟锁定', value: '是', unit: '' },
|
||||
// { name: 'GPU温度', value: '正常', unit: '' },
|
||||
{ name: 'CPU温度', value: '', unit: '℃' },
|
||||
{ name: '射频温度', value: '', unit: '℃' },
|
||||
{ name: '天线温度', value: '', unit: '℃' },
|
||||
{ name: '硬盘温度', value: '', unit: '℃' },
|
||||
{ name: 'FPGA温度', value: '', unit: '℃' },
|
||||
{ name: '硬盘容量', value: '', unit: '%' },
|
||||
{ name: '内存容量', value: '', unit: 'MB' },
|
||||
{ name: 'GPU温度', value: '正常', unit: '' },
|
||||
{ name: 'CPU温度', value: 40, unit: '℃' },
|
||||
{ name: '射频温度', value: 40, unit: '℃' },
|
||||
{ name: '天线温度', value: 40, unit: '℃' },
|
||||
{ name: '硬盘温度', value: 40, unit: '℃' },
|
||||
{ name: 'FPGA温度', value: 40, unit: '℃' },
|
||||
{ name: '硬盘容量', value: 40, unit: '%' },
|
||||
{ name: '内存容量', value: 40, unit: 'MB' },
|
||||
],
|
||||
gps: [
|
||||
// { name: '定位状态', value: '正常', unit: '' },
|
||||
// { name: '定向状态', value: '正常', unit: '' },
|
||||
{ name: '定位状态', value: '正常', unit: '' },
|
||||
{ name: '定向状态', value: '正常', unit: '' },
|
||||
{ name: 'rtk状态', value: '无效', unit: '' },
|
||||
{ name: '卫星个数', value: '', unit: '' },
|
||||
{ name: '卫星个数', value: 0, unit: '' },
|
||||
{ name: '惯导状态', value: '位置+速度+航向', unit: '' },
|
||||
{ name: '年月日', value: moment().format('YYYY-MM-DD'), unit: '' },
|
||||
{ name: '经度', value: '', unit: '°' },
|
||||
{ name: '维度', value: '', unit: '°' },
|
||||
{ name: '高度', value: '', unit: 'm' },
|
||||
{ name: '经度', value: '120.34534', unit: '°' },
|
||||
{ name: '维度', value: '40.34534', unit: '°' },
|
||||
{ name: '高度', value: 45002, unit: 'm' },
|
||||
],
|
||||
imu: [
|
||||
{ name: '配置状态', value: '', unit: '' },
|
||||
{ name: '天线方位角', value: '', unit: '°' },
|
||||
{ name: '天线俯仰角', value: '', unit: '°' },
|
||||
{ name: '东向速度', value: '', unit: 'm/s' },
|
||||
{ name: '北向速度', value: '', unit: 'm/s' },
|
||||
{ name: '天向速度', value: '', unit: 'm/s' },
|
||||
{ name: '俯仰角', value: '', unit: '°' },
|
||||
{ name: '翻转角', value: '', unit: '°' },
|
||||
{ name: '偏航角', value: '', unit: '°' },
|
||||
{ name: '配置状态', value: '正常', unit: '' },
|
||||
{ name: '天线方位角', value: 1.5, unit: '°' },
|
||||
{ name: '天线俯仰角', value: 0.95, unit: '°' },
|
||||
{ name: '东向速度', value: 69.28, unit: 'm/s' },
|
||||
{ name: '北向速度', value: 41.28, unit: 'm/s' },
|
||||
{ name: '天向速度', value: 0, unit: 'm/s' },
|
||||
{ name: '俯仰角', value: 3.96, unit: '°' },
|
||||
{ name: '翻转角', value: 1.02, unit: '°' },
|
||||
{ name: '偏航角', value: 65.62, unit: '°' },
|
||||
],
|
||||
dev2: {
|
||||
isWork: true,
|
||||
@ -2672,9 +2672,9 @@ export default {
|
||||
this.detailUav.baseInfo.latitude = data.latitude.toFixed(3)
|
||||
this.detailUav.baseInfo.status = data.connected
|
||||
this.detailUav.statusInfo.dev = [
|
||||
// { name: '是否开机', value: this.sarWorkStatus[data.dIsBoot], unit: '' },
|
||||
{ name: '是否开机', value: this.sarWorkStatus[data.dIsBoot], unit: '' },
|
||||
{ name: '时钟锁定', value: this.successStatus[data.clockLock], unit: '' },
|
||||
// { name: 'GPU温度', value: '正常', unit: '' },
|
||||
{ name: 'GPU温度', value: '正常', unit: '' },
|
||||
{ name: 'CPU温度', value: data.cpuC, unit: '℃' },
|
||||
{ name: '射频温度', value: data.rfC, unit: '℃' },
|
||||
{ name: '天线温度', value: data.antC, unit: '℃' },
|
||||
@ -2684,8 +2684,8 @@ export default {
|
||||
{ name: '内存容量', value: data.memoryCapacity, unit: 'MB' },
|
||||
]
|
||||
this.detailUav.statusInfo.gps = [
|
||||
// { name: '定位状态', value: '正常', unit: '' },
|
||||
// { name: '定向状态', value: '正常', unit: '' },
|
||||
{ name: '定位状态', value: '正常', unit: '' },
|
||||
{ name: '定向状态', value: '正常', unit: '' },
|
||||
{ name: 'rtk状态', value: data.rtkStatusLabel, unit: '' },
|
||||
{ name: '卫星个数', value: data.satelliteNum, unit: '' },
|
||||
{ name: '惯导状态', value: this.imuStatus[data.imuStatus], unit: '' },
|
||||
@ -2735,9 +2735,7 @@ export default {
|
||||
handleWebsocketWave(info) {
|
||||
console.log('SAR波形', JSON.parse(info.body))
|
||||
let data = JSON.parse(info.body)
|
||||
console.log('id对比', this.detailUav.id, data.payloadId);
|
||||
// && this.detailUav.id === data.payloadId
|
||||
if (this.detailUav.visible) {
|
||||
if (this.detailUav.visible && this.detailUav.id === data.payloadId) {
|
||||
let channel1False = []
|
||||
let channel1Real = []
|
||||
let channel2False = []
|
||||
@ -2758,8 +2756,6 @@ export default {
|
||||
this.detailUav.chart.data[1].data = channel1Real
|
||||
this.detailUav.chart.data[2].data = channel2False
|
||||
this.detailUav.chart.data[3].data = channel2Real
|
||||
console.log(this.detailUav.chart.data, 'ssssssssssssssss');
|
||||
|
||||
if (this.detailUav.activeNames.includes('4')) {
|
||||
if (this.$refs.uavDetailChart) {
|
||||
this.$refs.uavDetailChart.updateData(this.detailUav.chart.data)
|
||||
@ -2984,9 +2980,6 @@ export default {
|
||||
this.taskList.data[findIndex].statusName = this.jobStatus[data.jobStatus + '']
|
||||
taskListResource[findIndex].statusName = this.jobStatus[data.jobStatus + '']
|
||||
}
|
||||
if (data.jobStatus === 1) {
|
||||
this.updateUavInfo(data.sarStatus)
|
||||
}
|
||||
this.taskList.data[findIndex].status = data.jobStatus
|
||||
taskListResource[findIndex].status = data.jobStatus
|
||||
console.log('整体状态变更1', findIndex, this.taskList.data[findIndex])
|
||||
|
||||
@ -1176,11 +1176,11 @@
|
||||
.detail-uav {
|
||||
width: 460px;
|
||||
position: fixed;
|
||||
top: 60px;
|
||||
top: 90px;
|
||||
//bottom: 5px;
|
||||
right: 10px;
|
||||
//right: 510px;
|
||||
height: calc(100vh - 70px);
|
||||
height: calc(100vh - 90px);
|
||||
//height: calc(100vh - 620px);
|
||||
transition: 0.2s ease-in-out;
|
||||
z-index: 2;
|
||||
@ -1399,7 +1399,3 @@
|
||||
position: relative;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
::v-deep .el-collapse {
|
||||
border-top: unset;
|
||||
}
|
||||
|
||||
@ -354,6 +354,41 @@
|
||||
:showDivider="false"
|
||||
>
|
||||
<div class="detail-uav__content">
|
||||
<div class="image-info">
|
||||
<img :src="detailUav.baseInfo.url" alt="" />
|
||||
<div class="status-info">
|
||||
<div>
|
||||
<span
|
||||
:class="
|
||||
detailUav.baseInfo.status
|
||||
? 'uav-status-online'
|
||||
: 'uav-status-offline'
|
||||
"
|
||||
></span>
|
||||
<span>{{ detailUav.baseInfo.status ? '在线' : '离线' }}</span>
|
||||
<!-- <span style="opacity: 0;"><i class="ri-battery-saver-line"></i>{{detailUav.baseInfo.battery}}%</span>-->
|
||||
<span
|
||||
><i class="ri-expand-vertical-line"></i
|
||||
>{{ detailUav.baseInfo.flyHeight }}m</span
|
||||
>
|
||||
<!-- <span><i class="ri-expand-horizontal-line"></i>{{detailUav.baseInfo.flyWidth}}m</span>-->
|
||||
</div>
|
||||
<div>
|
||||
<span>{{ detailUav.baseInfo.longitude }}</span>
|
||||
<span>{{ detailUav.baseInfo.latitude }}</span>
|
||||
<i
|
||||
class="iconfont icon-zhuizong"
|
||||
@click.stop="
|
||||
flyToTarget(
|
||||
detailUav.baseInfo.longitude,
|
||||
detailUav.baseInfo.latitude,
|
||||
detailUav.baseInfo.flyHeight
|
||||
)
|
||||
"
|
||||
></i>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="other-info">
|
||||
<el-collapse
|
||||
v-model="detailUav.activeNames"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user