diff --git a/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/publics/utils/ImageUtil.java b/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/publics/utils/ImageUtil.java index 2374539..03b9f1c 100644 --- a/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/publics/utils/ImageUtil.java +++ b/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/publics/utils/ImageUtil.java @@ -45,7 +45,7 @@ public class ImageUtil { int lightRate = rotateDTO.getLightRate(); if (lightRate != 0) { //OpenCVUtil.multiply(image, lightRate); - OpenCVUtil.enhanceContrast(image, lightRate, 0); + // OpenCVUtil.enhanceContrast(image, lightRate, 0); } return image; } diff --git a/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/sar/service/impl/SarImageServiceImpl.java b/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/sar/service/impl/SarImageServiceImpl.java index 1f55d94..88aa2e4 100644 --- a/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/sar/service/impl/SarImageServiceImpl.java +++ b/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/sar/service/impl/SarImageServiceImpl.java @@ -78,18 +78,18 @@ public class SarImageServiceImpl implements ISarImageService { } // 情况2：如果最后一张还能拼图，则直接返回继续拼 JmImage last = imageList.get(imageList.size() - 1); - Integer startFrameNo = imageCache.get(cachePrefix + ":" + CACHE_FIELD_START_FRAME_NO, Integer.class); - int currWidth = startFrameNo == null ? 0 : singleWidth * (frameNo - startFrameNo + 1); - int surplusNum = (IMG_MAX_WITH - currWidth) / singleWidth; // 还可以拼图片数 - Integer baseNo = imageCache.get(cachePrefix + ":" + CACHE_FIELD_CURR_FRAME_NO, Integer.class); - - if (startFrameNo == null || currWidth < IMG_MAX_WITH || - baseNo == null || (frameNo - baseNo + 1 <= surplusNum)) { - log.info("当前宽度：{} < {} 可以继续拼接", currWidth, IMG_MAX_WITH); - return last; - } +// Integer startFrameNo = imageCache.get(cachePrefix + ":" + CACHE_FIELD_START_FRAME_NO, Integer.class); +// int currWidth = startFrameNo == null ? 0 : singleWidth * (frameNo - startFrameNo + 1); +// int surplusNum = (IMG_MAX_WITH - currWidth) / singleWidth; // 还可以拼图片数 +// Integer baseNo = imageCache.get(cachePrefix + ":" + CACHE_FIELD_CURR_FRAME_NO, Integer.class); +// +// if (startFrameNo == null || currWidth < IMG_MAX_WITH || +// baseNo == null || (frameNo - baseNo + 1 <= surplusNum)) { +// log.info("当前宽度：{} < {} 可以继续拼接", currWidth, IMG_MAX_WITH); +// return last; +// } // 情况3：已经拼接到最大数量，或者当前图+填充数量超过允许拼接数量，创建新图像文件 - log.info("当前宽度：{} > {} 重新拼接，当前帧号{}作为首帧", currWidth, IMG_MAX_WITH, frameNo); +// log.info("当前宽度：{} > {} 重新拼接，当前帧号{}作为首帧", currWidth, IMG_MAX_WITH, frameNo); base = new JmImage(); imageCache.put(cachePrefix + ":" + CACHE_FIELD_START_FRAME_NO, frameNo); base.setImageNo(last.getImageNo() + 1); @@ -105,9 +105,6 @@ public class SarImageServiceImpl implements ISarImageService { currAirline.setBeforeRight(before); } // 使用前一张图的右侧坐标作为后一张图的左侧，前提是没丢图 - if (!isFirst && !lostImage) { - // 注释部分保持原样 - } before[0] = imageFrame.getLon5(); before[1] = imageFrame.getLat5(); before[2] = imageFrame.getLon8(); diff --git a/frontend/Skyeye-sys-ui/src/lang/en.js b/frontend/Skyeye-sys-ui/src/lang/en.js index ee3f91f..c847c02 100644 --- a/frontend/Skyeye-sys-ui/src/lang/en.js +++ b/frontend/Skyeye-sys-ui/src/lang/en.js @@ -175,6 +175,8 @@ export default { left: 'Left', right: 'Right', }, + uavline: "Airline", + createAirline: 'Create Airline', rules: { inputTaskName: 'Please enter task name', startAltitude: 'Please enter start altitude', diff --git a/frontend/Skyeye-sys-ui/src/lang/zh.js b/frontend/Skyeye-sys-ui/src/lang/zh.js index 3c22390..4047d55 100644 --- a/frontend/Skyeye-sys-ui/src/lang/zh.js +++ b/frontend/Skyeye-sys-ui/src/lang/zh.js @@ -170,6 +170,12 @@ export default { stopTaskConfirm: '确定要结束该任务吗？', stopTaskSuccess: '任务已结束！', planArea: '规划区域', + direction: { + left: '左侧视', + right: '右侧视', + }, + uavline: "航线", + createAirline: '创建航线', rules: { inputTaskName: '请输入任务名称', startAltitude: '请输入起飞点高度', @@ -219,10 +225,6 @@ export default { tip: '提示', radarEndSuccess: '雷达关机成功', deleteConfirm: '确定要删除该？', - direction: { - left: '左侧视', - right: '右侧视', - }, }, picture: { list: '影像列表', diff --git a/frontend/Skyeye-sys-ui/src/views/home/components/task-manage/index.vue b/frontend/Skyeye-sys-ui/src/views/home/components/task-manage/index.vue index 0369c82..55da3c3 100644 --- a/frontend/Skyeye-sys-ui/src/views/home/components/task-manage/index.vue +++ b/frontend/Skyeye-sys-ui/src/views/home/components/task-manage/index.vue @@ -8,7 +8,6 @@ }" icon="ri-list-unordered" :title="this.$t('task.taskList')" - :visible.sync="taskList.visible" :scroll="false" :showClose="false" @@ -94,9 +93,15 @@ - {{ $t('task.editName') }} - {{ $t('task.copy') }} - {{ $t('task.delete') }} + {{ + $t('task.editName') + }} + {{ + $t('task.copy') + }} + {{ + $t('task.delete') + }} @@ -233,9 +238,11 @@ - +
-
{{ $t('task.createAirline') }}
+
+ {{ $t('task.createAirline') }} +
- + - + {{ $t('common.preview') }} - {{ $t('common.save') }} + {{ + $t('common.save') + }}
@@ -540,15 +555,25 @@
- - - + + + + + - - - + + + + + diff --git a/frontend/Skyeye-sys-ui/src/views/home/components/twin-situation/OrthoImageryManager.js b/frontend/Skyeye-sys-ui/src/views/home/components/twin-situation/OrthoImageryManager.js index 7d3620b..001ffe6 100644 --- a/frontend/Skyeye-sys-ui/src/views/home/components/twin-situation/OrthoImageryManager.js +++ b/frontend/Skyeye-sys-ui/src/views/home/components/twin-situation/OrthoImageryManager.js @@ -18,7 +18,7 @@ export default class OrthoImageryManager { /** * 添加或更新新推送的图片 */ - add(data) { + add(data, brightness) { const key = `${data.jobId}-${data.uavId}~${data.fileId}`; // 已存在则跳过 @@ -39,7 +39,7 @@ export default class OrthoImageryManager { const layer = this.viewer.cesiumViewer.imageryLayers.addImageryProvider(provider); // ✅ 使用全局亮度和透明度，保证新图生效 - layer.brightness = this.globalBrightness; + layer.brightness = brightness ? brightness : this.globalBrightness; layer.alpha = this.globalAlpha; this.layerMap.set(key, layer); @@ -52,7 +52,7 @@ export default class OrthoImageryManager { * 设置全局亮度，影响所有已有图片和未来新推送的图片 */ setBrightness(value) { - this.globalBrightness = value; + // this.globalBrightness = value; this.layerMap.forEach(layer => { layer.brightness = value; }); 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 d202725..4aed69b 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 @@ -375,7 +375,7 @@ export default { lightPercent: 0, contrastPercent: 10, imageInfos: { - brightness: 10 + brightness: 5 }, } }, @@ -487,7 +487,7 @@ export default { // ) orthoManager = new OrthoImageryManager(viewer, DT.Cesium, { maxLayers: 400, - brightness: 1.2, // 默认亮度 + brightness: 1, // 默认亮度 alpha: 1.0 // 默认透明度 }) // this.startTest() @@ -580,11 +580,11 @@ export default { // 亮度设置变化 onLightChange: debounce(function (val) { const imageInfos = { ...this.imageInfos } - orthoManager.setBrightness(val / 10) - execBrightnessexport(imageInfos).then(res => { - console.log('亮度调整成功'); - // this.$message.success('亮度调整成功') - }) + orthoManager.setBrightness(val) + // execBrightnessexport(imageInfos).then(res => { + // console.log('亮度调整成功'); + // // this.$message.success('亮度调整成功') + // }) }, 500), // startTest() { // let testHeight = 1000 @@ -2818,10 +2818,10 @@ export default { handleWebsocketImage(info) { // console.log('SAR图像', info.body) let data = JSON.parse(info.body) - this.imageInfos = Object.assign({}, this.imageInfos, data) - this.imageInfos.brightness = data.brightness + // this.imageInfos = Object.assign({}, this.imageInfos, data) + // this.imageInfos.brightness = data.brightness console.log('SAR图像2', data) - orthoManager.add(data) + orthoManager.add(data, this.imageInfos.brightness) // this.addMarkPicture2(data) // console.log('灭有匹配到吗taskUavCollection', taskUavCollection, taskUavCollection[data.jobId]) // if (taskUavCollection[data.jobId]) { @@ -3040,6 +3040,10 @@ export default { viewer.entities.remove(item) } }) + if (orthoManager) { + orthoManager.clearAll() + orthoManager = null + } } if (data.jobStatus === 1 && this.detailUav.id === data.jobId) { this.updateUavInfo(data.sarStatus) 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 b6293dd..37b4d19 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 @@ -14,7 +14,7 @@
@@ -91,9 +91,9 @@
- {{ $t('task.temperature') }}：{{ weatherInfo2.wendu }} + {{ $t('task.temperature') }}：{{ weatherInfo2.wendu }}
- {{ $t('task.humidity') }}：{{ weatherInfo2.shidu }} + {{ $t('task.humidity') }}：{{ weatherInfo2.shidu }}
- {{ $t('task.airQuality') }}：{{ weatherInfo2.quality }} + {{ $t('task.airQuality') }}：{{ weatherInfo2.quality }}
- {{ $t('task.pm25') }}：{{ weatherInfo2.pm25 }} + {{ $t('task.pm25') }}：{{ weatherInfo2.pm25 }}
- {{ $t('task.pm10') }}：{{ weatherInfo2.pm10 }} + {{ $t('task.pm10') }}：{{ weatherInfo2.pm10 }}
@@ -340,14 +345,18 @@
- - + + + + - - + + + +