- {{ $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 @@
-
-
+
+
+
+
-
-
+
+
+
+
From f4bbb14ab0cd629fa5b4f0197332fe86745b5330 Mon Sep 17 00:00:00 2001
From: wxs <211789910@qq.com>
Date: Sun, 8 Mar 2026 16:06:21 +0800
Subject: [PATCH 4/6] =?UTF-8?q?feat:=E8=AE=BE=E7=BD=AE=E4=BA=AE=E5=BA=A6?=
=?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/views/home/components/twin-situation/index.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 72d75bd..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: 1
+ brightness: 5
},
}
},
From 6764c7bfe10719b9c1188155c493082692e4a05e Mon Sep 17 00:00:00 2001
From: Bingkun Li
Date: Sun, 8 Mar 2026 16:05:37 +0800
Subject: [PATCH 5/6] Remove adjusting brightness in backend
---
.../main/java/com/zhangy/skyeye/publics/utils/ImageUtil.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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;
}
From 460af8d011d3612b72a46732efc595e96e7661f1 Mon Sep 17 00:00:00 2001
From: Bingkun Li
Date: Mon, 9 Mar 2026 10:47:07 +0800
Subject: [PATCH 6/6] Remove join image func, push each image to frontend
directly
---
.../sar/service/impl/SarImageServiceImpl.java | 24 ++++++++++---------
1 file changed, 13 insertions(+), 11 deletions(-)
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 b08d0ea..d13b8d1 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
@@ -67,7 +67,8 @@ public class SarImageServiceImpl implements ISarImageService {
* @param frameNo 当前帧号
* @return 返回非空的图像信息，其字段 imageNo 一定有值
*/
- private JmImage getBaseImage(Long airlineId, int singleWidth, int frameNo) {IMG_MAX_WITH=1;
+ private JmImage getBaseImage(Long airlineId, int singleWidth, int frameNo) {
+ // IMG_MAX_WITH=1;
List imageList = imageService.selectLowByAirline(airlineId);
String cacheKey = "jmImgJoin-" + airlineId;
JmImage base = null;
@@ -80,17 +81,18 @@ public class SarImageServiceImpl implements ISarImageService {
}
// 情况2：如果最后一张还能拼图，则直接返回继续拼
JmImage last = imageList.get(imageList.size() - 1);
- Integer startFrameNo = (Integer) redisUtil.hget(cacheKey, CACHE_FIELD_START_FRAME_NO);
- int currWidth = startFrameNo == null ? 0 : singleWidth * (frameNo - startFrameNo + 1); // 图宽（当前图+基准图）
- int surplusNum = (IMG_MAX_WITH - currWidth) / singleWidth; // 还可以拼图片数
- Integer baseNo = (Integer) redisUtil.hget("jmImgJoin-" + airlineId, CACHE_FIELD_CURR_FRAME_NO);
- if (startFrameNo == null || currWidth < IMG_MAX_WITH ||
- baseNo == null || (frameNo - baseNo + 1 <= surplusNum)) { // 当前图+填充 不能超过允许拼接数
- log.info("当前宽度：" + currWidth + " < " + IMG_MAX_WITH + " 可以继续拼接");
- return last;
- }
+// Integer startFrameNo = (Integer) redisUtil.hget(cacheKey, CACHE_FIELD_START_FRAME_NO);
+// int currWidth = startFrameNo == null ? 0 : singleWidth * (frameNo - startFrameNo + 1); // 图宽（当前图+基准图）
+// int surplusNum = (IMG_MAX_WITH - currWidth) / singleWidth; // 还可以拼图片数
+// log.info("surplusNum: = " + surplusNum);
+// Integer baseNo = (Integer) redisUtil.hget("jmImgJoin-" + airlineId, CACHE_FIELD_CURR_FRAME_NO);
+// 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();
redisUtil.hset(cacheKey, CACHE_FIELD_START_FRAME_NO, frameNo, CACHE_EXPIRE_SECOND);
base.setImageNo(last.getImageNo() + 1);