diff --git a/frontend/Skyeye-sys-ui/src/views/home/components/twin-situation/index.js b/frontend/Skyeye-sys-ui/src/views/home/components/twin-situation/index.js index 229d737..b167b20 100644 --- a/frontend/Skyeye-sys-ui/src/views/home/components/twin-situation/index.js +++ b/frontend/Skyeye-sys-ui/src/views/home/components/twin-situation/index.js @@ -195,7 +195,7 @@ export default { ] }, detailUav: { - visible: false, + visible: true, id: 1, baseInfo: { url: require('@/assets/img/uav.png'), @@ -206,7 +206,7 @@ export default { longitude: 123.232312, latitude: 23.232312, }, - activeNames: ['1'], + activeNames: ['3', '4'], 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: 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' }, + // { 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' }, ], gps: [ - { name: '定位状态', value: '正常', unit: '' }, - { name: '定向状态', value: '正常', unit: '' }, + // { name: '定位状态', value: '正常', unit: '' }, + // { name: '定向状态', value: '正常', unit: '' }, { name: 'rtk状态', value: '无效', unit: '' }, - { name: '卫星个数', value: 0, unit: '' }, + { name: '卫星个数', value: '', unit: '' }, { name: '惯导状态', value: '位置+速度+航向', unit: '' }, { name: '年月日', value: moment().format('YYYY-MM-DD'), unit: '' }, - { name: '经度', value: '120.34534', unit: '°' }, - { name: '维度', value: '40.34534', unit: '°' }, - { name: '高度', value: 45002, unit: 'm' }, + { name: '经度', value: '', unit: '°' }, + { name: '维度', value: '', unit: '°' }, + { name: '高度', value: '', unit: 'm' }, ], imu: [ - { 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: '°' }, + { 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: '°' }, ], 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,7 +2735,9 @@ export default { handleWebsocketWave(info) { console.log('SAR波形', JSON.parse(info.body)) let data = JSON.parse(info.body) - if (this.detailUav.visible && this.detailUav.id === data.payloadId) { + console.log('id对比', this.detailUav.id, data.payloadId); + // && this.detailUav.id === data.payloadId + if (this.detailUav.visible) { let channel1False = [] let channel1Real = [] let channel2False = [] @@ -2756,6 +2758,8 @@ 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) @@ -2980,6 +2984,9 @@ 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]) diff --git a/frontend/Skyeye-sys-ui/src/views/home/components/twin-situation/index.scss b/frontend/Skyeye-sys-ui/src/views/home/components/twin-situation/index.scss index ccd4d22..15c67e6 100644 --- a/frontend/Skyeye-sys-ui/src/views/home/components/twin-situation/index.scss +++ b/frontend/Skyeye-sys-ui/src/views/home/components/twin-situation/index.scss @@ -1176,11 +1176,11 @@ .detail-uav { width: 460px; position: fixed; - top: 90px; + top: 60px; //bottom: 5px; right: 10px; //right: 510px; - height: calc(100vh - 90px); + height: calc(100vh - 70px); //height: calc(100vh - 620px); transition: 0.2s ease-in-out; z-index: 2; @@ -1399,3 +1399,7 @@ position: relative; overflow: hidden; } + +::v-deep .el-collapse { + border-top: unset; +} diff --git a/frontend/Skyeye-sys-ui/src/views/home/components/twin-situation/index.vue b/frontend/Skyeye-sys-ui/src/views/home/components/twin-situation/index.vue index b181ca2..cd09c1a 100644 --- a/frontend/Skyeye-sys-ui/src/views/home/components/twin-situation/index.vue +++ b/frontend/Skyeye-sys-ui/src/views/home/components/twin-situation/index.vue @@ -354,41 +354,6 @@ :showDivider="false" >
-
- -
-
- - {{ detailUav.baseInfo.status ? '在线' : '离线' }} - - {{ detailUav.baseInfo.flyHeight }}m - -
-
- {{ detailUav.baseInfo.longitude }} - {{ detailUav.baseInfo.latitude }} - -
-
-