libingkun/skyeyesystem
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

修复亮度变化，波形变化，tooltip显示等bug

Browse Source
This commit is contained in:
wxs 2026-02-10 17:05:21 +08:00
parent 2f0067e232
commit 3e6c17fc3d
8 changed files with 70 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/Skyeye-sys-ui/src/api/task.js
View File

@ -86,7 +86,7 @@ export const changePayloadRadarOpenState = params =>
export const changeJobStatus = params => export const changeJobStatus = params =>
req('post', '/sar/job/status', params) req('post', '/sar/job/status/selectTask', params)
export const execBrightnessexport = params => export const execBrightnessexport = params =>
req('post', '/jm/job/exec/brightnessexport', params) req('post', '/jm/job/exec/brightness', params)

2
frontend/Skyeye-sys-ui/src/utils/index.js
View File

@ -353,7 +353,7 @@ export function decimalLastNonZeroDecimal(num) {
/** /**
* 数值（经度或纬度）转度分秒 * 数值（经度或纬度）转度分秒
* @param {any} decimal * @param {any} decimal
* @param {any} type lon | lat 经度 or 维度 * @param {any} type lon | lat 经度 or 纬度
* @returns {any} * @returns {any}
*/ */
export function decimalToDMS(decimal, type) { export function decimalToDMS(decimal, type) {

4
frontend/Skyeye-sys-ui/src/views/home/components/device-manage/index.js
View File

@ -252,7 +252,7 @@ export default {
{ name: '惯导状态', value: '位置+速度+航向', unit: '' }, { name: '惯导状态', value: '位置+速度+航向', unit: '' },
{ name: '年月日', value: moment().format('YYYY-MM-DD'), unit: '' }, { name: '年月日', value: moment().format('YYYY-MM-DD'), unit: '' },
{ name: '经度', value: '120.34534', unit: '°' }, { name: '经度', value: '120.34534', unit: '°' },
{ name: '维度', value: '40.34534', unit: '°' }, { name: '纬度', value: '40.34534', unit: '°' },
{ name: '高度', value: 45002, unit: 'm' }, { name: '高度', value: 45002, unit: 'm' },
], ],
imu: [ imu: [
@ -2674,7 +2674,7 @@ export default {
{ name: '惯导状态', value: this.imuStatus[data.imuStatus], unit: '' }, { name: '惯导状态', value: this.imuStatus[data.imuStatus], unit: '' },
{ name: '年月日', value: data.date, unit: '' }, { name: '年月日', value: data.date, unit: '' },
{ name: '经度', value: data.longitude, unit: '°' }, { name: '经度', value: data.longitude, unit: '°' },
{ name: '维度', value: data.latitude, unit: '°' }, { name: '纬度', value: data.latitude, unit: '°' },
{ name: '高度', value: data.altitude, unit: 'm' }, { name: '高度', value: data.altitude, unit: 'm' },
] ]
this.detailUav.statusInfo.imu = [ this.detailUav.statusInfo.imu = [

4
frontend/Skyeye-sys-ui/src/views/home/components/device1-manage/index.js
View File

@ -128,7 +128,7 @@ export default {
// 操作雷达 // 操作雷达
async handleRadar(row, type) { async handleRadar(row, type) {
if (type === 1) { if (type === 1) {
deviceControlTurnon({ payloadId: row.id }).then(res => { deviceControlTurnon({ payloadId: row.ip }).then(res => {
if (res.data.code === 200) { if (res.data.code === 200) {
this.$message.success('雷达开机成功') this.$message.success('雷达开机成功')
} }
@ -141,7 +141,7 @@ export default {
type: 'warning' type: 'warning'
}) })
if (!bool) return; if (!bool) return;
deviceControlEndall({ payloadId: row.id }).then(res => { deviceControlEndall({ payloadId: row.ip }).then(res => {
if (res.data.code === 200) { if (res.data.code === 200) {
this.$message.success('雷达关机成功') this.$message.success('雷达关机成功')
} }

4
frontend/Skyeye-sys-ui/src/views/home/components/device1-manage/index.vue
View File

@ -101,6 +101,7 @@
effect="light" effect="light"
content="修改" content="修改"
placement="top" placement="top"
:hide-after="1000"
> >
<el-button <el-button
type="primary" type="primary"
@ -116,6 +117,7 @@
effect="light" effect="light"
content="手动开机" content="手动开机"
placement="top" placement="top"
:hide-after="1000"
> >
<el-button <el-button
icon="el-icon-switch-button" icon="el-icon-switch-button"
@ -136,6 +138,7 @@
icon="el-icon-close" icon="el-icon-close"
size="mini" size="mini"
circle circle
:hide-after="1000"
@click="handleRadar(scope.row, 2)" @click="handleRadar(scope.row, 2)"
></el-button> ></el-button>
</el-tooltip> </el-tooltip>
@ -145,6 +148,7 @@
effect="light" effect="light"
content="删除" content="删除"
placement="top" placement="top"
:hide-after="1000"
> >
<el-button <el-button
type="danger" type="danger"

10
frontend/Skyeye-sys-ui/src/views/home/components/task-manage/index.vue
View File

@ -20,7 +20,12 @@
</span> </span>
</template> </template>
<template v-slot:command> <template v-slot:command>
<el-tooltip effect="dark" content="新增任务" placement="top"> <el-tooltip
effect="dark"
content="新增任务"
placement="top"
:hide-after="1000"
>
<i class="ri-add-circle-line" @click="openAddForm"></i> <i class="ri-add-circle-line" @click="openAddForm"></i>
</el-tooltip> </el-tooltip>
</template> </template>
@ -48,6 +53,7 @@
effect="dark" effect="dark"
:content="item.check ? '隐藏' : '显示'" :content="item.check ? '隐藏' : '显示'"
placement="top" placement="top"
:hide-after="1000"
> >
<i <i
:class="item.check ? 'ri-eye-off-line' : 'ri-eye-line'" :class="item.check ? 'ri-eye-off-line' : 'ri-eye-line'"
@ -59,6 +65,7 @@
effect="dark" effect="dark"
content="执行" content="执行"
placement="top" placement="top"
:hide-after="1000"
> >
<i <i
class="ri-arrow-up-circle-line" class="ri-arrow-up-circle-line"
@ -70,6 +77,7 @@
content="重新执行" content="重新执行"
placement="top" placement="top"
v-if="item.status === 2" v-if="item.status === 2"
:hide-after="1000"
> >
<i <i
class="ri-restart-line" class="ri-restart-line"

74
frontend/Skyeye-sys-ui/src/views/home/components/twin-situation/index.js
View File

@ -21,7 +21,11 @@ import {
getTaskItemDetail, getTaskItemDetail,
getTaskListData, getTaskListData,
getUavListData, getUavListData,
reRunTask, stopTaskFly, getExecJobs, execBrightnessexport reRunTask,
stopTaskFly,
getExecJobs,
execBrightnessexport,
changeJobStatus
} from '@/api/task' } from '@/api/task'
import UavTarget from './uavTarget' import UavTarget from './uavTarget'
import PicturesUpload from '../pictures-upload/index.vue' import PicturesUpload from '../pictures-upload/index.vue'
@ -259,7 +263,7 @@ export default {
{ name: '惯导状态', value: '位置+速度+航向', unit: '' }, { name: '惯导状态', value: '位置+速度+航向', unit: '' },
{ name: '年月日', value: moment().format('YYYY-MM-DD'), unit: '' }, { name: '年月日', value: moment().format('YYYY-MM-DD'), unit: '' },
{ name: '经度', value: '', unit: '°' }, { name: '经度', value: '', unit: '°' },
{ name: '维度', value: '', unit: '°' }, { name: '纬度', value: '', unit: '°' },
{ name: '高度', value: '', unit: 'm' }, { name: '高度', value: '', unit: 'm' },
], ],
imu: [ imu: [
@ -397,7 +401,9 @@ export default {
emptyImg: require('@/assets/img/common/empty.svg'), emptyImg: require('@/assets/img/common/empty.svg'),
lightPercent: 0, lightPercent: 0,
contrastPercent: 10, contrastPercent: 10,
imageInfos: undefined imageInfos: {
brightness: null
}
} }
}, },
computed: { computed: {
@ -588,14 +594,13 @@ export default {
} }
}, },
// 亮度设置变化 // 亮度设置变化
onLightChange: debounce(function (value) { onLightChange() {
const imageInfos = { ...this.imageInfos } const imageInfos = { ...this.imageInfos }
imageInfos.brightness = value
execBrightnessexport(imageInfos).then(res => { execBrightnessexport(imageInfos).then(res => {
console.log('亮度调整成功'); console.log('亮度调整成功');
// this.$message.success('亮度调整成功') // this.$message.success('亮度调整成功')
}) })
}, 500), },
// startTest() { // startTest() {
// let testHeight = 1000 // let testHeight = 1000
// window.detectType = { // window.detectType = {
@ -1128,7 +1133,8 @@ export default {
status: item.status, status: item.status,
statusName: item.statusName, statusName: item.statusName,
uav, uav,
sar sar,
stopTooltipVisible: false
}) })
// TODO // TODO
// item.pointList = [item.pointList] // item.pointList = [item.pointList]
@ -1141,10 +1147,7 @@ export default {
// this.addUavToScene(item) // this.addUavToScene(item)
}) })
if (data.length) { if (data.length) {
this.detailUav.chart.data[0].data = [] this.resetChartData()
this.detailUav.chart.data[1].data = []
this.detailUav.chart.data[2].data = []
this.detailUav.chart.data[3].data = []
this.detailUav.id = data.length ? data[0].id : 1 this.detailUav.id = data.length ? data[0].id : 1
this.detailUav.visible = data.length ? true : false this.detailUav.visible = data.length ? true : false
} }
@ -1342,14 +1345,11 @@ export default {
}, },
addJobLine(info, isFinish) { addJobLine(info, isFinish) {
// 参数和数据校验 // 参数和数据校验
console.log(info, info.uavList, 777777777777);
if (!info || !Array.isArray(info.uavList) || info.uavList.length === 0) return; if (!info || !Array.isArray(info.uavList) || info.uavList.length === 0) return;
const uav = info.uavList[0]; const uav = info.uavList[0];
if (!Array.isArray(uav.airlineList) || uav.airlineList.length === 0) return; if (!Array.isArray(uav.airlineList) || uav.airlineList.length === 0) return;
const key = `${info.id}-${uav.uavId}`; const key = `${info.id}-${uav.uavId}`;
let load = renderTaskInfo[key]; let load = renderTaskInfo[key];
console.log(load, key, 3333333);
if (load) { if (load) {
return; return;
@ -1555,6 +1555,8 @@ export default {
}, },
toggleTaskSceneShow(info, index) { toggleTaskSceneShow(info, index) {
console.log(info, 12312123);
// console.log('切换的info', info) // console.log('切换的info', info)
// console.log('无人机详情面板', this.detailInfo) // console.log('无人机详情面板', this.detailInfo)
if (info.check) { if (info.check) {
@ -1613,7 +1615,6 @@ export default {
} }
}) })
}) })
}, },
/** /**
* 重新执行 * 重新执行
@ -2747,7 +2748,7 @@ export default {
{ name: '惯导状态', value: this.imuStatus[data.imuStatus], unit: '' }, { name: '惯导状态', value: this.imuStatus[data.imuStatus], unit: '' },
{ name: '年月日', value: data.date, unit: '' }, { name: '年月日', value: data.date, unit: '' },
{ name: '经度', value: data.longitude, unit: '°' }, { name: '经度', value: data.longitude, unit: '°' },
{ name: '维度', value: data.latitude, unit: '°' }, { name: '纬度', value: data.latitude, unit: '°' },
{ name: '高度', value: data.altitude, unit: 'm' }, { name: '高度', value: data.altitude, unit: 'm' },
] ]
this.detailUav.statusInfo.imu = [ this.detailUav.statusInfo.imu = [
@ -2789,9 +2790,8 @@ export default {
} }
}, },
handleWebsocketWave(info) { handleWebsocketWave(info) {
console.log('SAR波形', JSON.parse(info.body)) // console.log('SAR波形', JSON.parse(info.body))
let data = JSON.parse(info.body) let data = JSON.parse(info.body)
console.log('id对比', this.detailUav.id, data.payloadId);
if (this.detailUav.visible && this.detailUav.id === data.jobId) { if (this.detailUav.visible && this.detailUav.id === data.jobId) {
let channel1False = [] let channel1False = []
let channel1Real = [] let channel1Real = []
@ -2813,8 +2813,6 @@ export default {
this.detailUav.chart.data[1].data = channel1Real this.detailUav.chart.data[1].data = channel1Real
this.detailUav.chart.data[2].data = channel2False this.detailUav.chart.data[2].data = channel2False
this.detailUav.chart.data[3].data = channel2Real this.detailUav.chart.data[3].data = channel2Real
console.log(this.detailUav.chart.data, 'ssssssssssssssss');
if (this.detailUav.activeNames.includes('4')) { if (this.detailUav.activeNames.includes('4')) {
if (this.$refs.uavDetailChart) { if (this.$refs.uavDetailChart) {
this.$refs.uavDetailChart.updateData(this.detailUav.chart.data) this.$refs.uavDetailChart.updateData(this.detailUav.chart.data)
@ -2825,7 +2823,9 @@ export default {
handleWebsocketImage(info) { handleWebsocketImage(info) {
// console.log('SAR图像', info.body) // console.log('SAR图像', info.body)
let data = JSON.parse(info.body) let data = JSON.parse(info.body)
this.imageInfos = data this.imageInfos = Object.assign({}, this.imageInfos, data)
console.log(this.imageInfos, 444444444);
console.log('SAR图像2', data) console.log('SAR图像2', data)
this.addMarkPicture2(data) this.addMarkPicture2(data)
// console.log('灭有匹配到吗taskUavCollection', taskUavCollection, taskUavCollection[data.jobId]) // console.log('灭有匹配到吗taskUavCollection', taskUavCollection, taskUavCollection[data.jobId])
@ -2896,9 +2896,9 @@ export default {
material: new DT.Cesium.ImageMaterialProperty({ material: new DT.Cesium.ImageMaterialProperty({
image: window.config.imagePath + data.relativePath, image: window.config.imagePath + data.relativePath,
}), }),
outline: true, outline: false,
outlineColor: DT.Cesium.Color.WHITE, outlineColor: DT.Cesium.Color.RED,
outlineWidth: 2, //很多电脑当宽度>1时，没用 outlineWidth: 0, //很多电脑当宽度>1时，没用
} }
}) })
let markLineArr = [] let markLineArr = []
@ -3038,10 +3038,7 @@ export default {
taskListResource.splice(findIndex, 1) taskListResource.splice(findIndex, 1)
this.getTaskList() this.getTaskList()
this.removeTaskTarget(data.jobId) this.removeTaskTarget(data.jobId)
this.detailUav.chart.data[0].data = [] this.resetChartData()
this.detailUav.chart.data[1].data = []
this.detailUav.chart.data[2].data = []
this.detailUav.chart.data[3].data = []
this.detailUav.id = '' this.detailUav.id = ''
this.detailUav.visible = false this.detailUav.visible = false
let entitys = [...viewer.entities.values] let entitys = [...viewer.entities.values]
@ -3110,6 +3107,11 @@ export default {
//#endregion //#endregion
// 打开状态和波形信息展示 // 打开状态和波形信息展示
openSarStatusDetail(data) { openSarStatusDetail(data) {
console.log(data, 444444444444);
// changeJobStatus(data.id).then(() => {
// this.$message.success('已切换到状态展示')
// })
let entitys = [...viewer.entities.values] let entitys = [...viewer.entities.values]
entitys.forEach(item => { entitys.forEach(item => {
if (item.id.includes(this.detailUav.id)) { if (item.id.includes(this.detailUav.id)) {
@ -3126,14 +3128,21 @@ export default {
this.toggleTaskSceneShow(item, index) this.toggleTaskSceneShow(item, index)
} }
}) })
this.resetChartData()
this.detailUav.id = data.id
this.detailUav.visible = true
},
resetChartData() {
this.detailUav.chart.data[0].data = [] this.detailUav.chart.data[0].data = []
this.detailUav.chart.data[1].data = [] this.detailUav.chart.data[1].data = []
this.detailUav.chart.data[2].data = [] this.detailUav.chart.data[2].data = []
this.detailUav.chart.data[3].data = [] this.detailUav.chart.data[3].data = []
this.detailUav.id = data.id if (this.detailUav.activeNames.includes('4')) {
this.detailUav.visible = true if (this.$refs.uavDetailChart) {
this.$refs.uavDetailChart.updateData(this.detailUav.chart.data)
}
}
}, },
//#region //#region
handleUavDetailCollapse(actives) { handleUavDetailCollapse(actives) {
console.log('展开的', actives) console.log('展开的', actives)
@ -3151,11 +3160,8 @@ export default {
//#region 航线详情 //#region 航线详情
openTaskLineDetail(info) { openTaskLineDetail(info) {
this.taskLineDetail.visible = false this.taskLineDetail.visible = false
console.log(taskListResource, 555);
let find = taskListResource.find(item => item.id === info.id) let find = taskListResource.find(item => item.id === info.id)
console.log('信息', find)
if (find && find.uavList) { if (find && find.uavList) {
let line = [] let line = []
find.uavList.forEach(item => { find.uavList.forEach(item => {

14
frontend/Skyeye-sys-ui/src/views/home/components/twin-situation/index.vue
View File

@ -95,6 +95,7 @@
effect="dark" effect="dark"
:content="item.check ? '隐藏' : '显示'" :content="item.check ? '隐藏' : '显示'"
placement="top" placement="top"
:hide-after="1000"
> >
<i <i
:class="item.check ? 'ri-eye-line' : 'ri-eye-off-line'" :class="item.check ? 'ri-eye-line' : 'ri-eye-off-line'"
@ -105,6 +106,7 @@
effect="dark" effect="dark"
content="结束任务" content="结束任务"
placement="top" placement="top"
:hide-after="1000"
v-if="item.status === 1" v-if="item.status === 1"
> >
<i <i
@ -134,17 +136,21 @@
</left-slide> </left-slide>
<div <div
class="image-set" class="image-set"
v-if="taskList.visible && taskList.data.length && imageInfos" v-if="
taskList.visible &&
taskList.data.length &&
imageInfos.brightness !== null
"
> >
<div class="image-set__item"> <div class="image-set__item">
<div class="is-label">亮度：</div> <div class="is-label">亮度：</div>
<el-slider <el-slider
v-model="lightPercent" v-model="imageInfos.brightness"
show-input show-input
max="30" :max="30"
input-size="mini" input-size="mini"
:show-input-controls="false" :show-input-controls="false"
@input="onLightChange" @change="onLightChange"
> >
</el-slider> </el-slider>
</div> </div>