From d0c6aa5b9ba4ceb9f86945853a941b260ab2a66c Mon Sep 17 00:00:00 2001 From: fengrong Date: Thu, 12 Dec 2024 10:40:48 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=A6=96=E9=A1=B5=EF=BC=9A=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E9=A3=8E=E6=9C=BA=E7=8A=B6=E6=80=81=E5=92=8C=E8=83=8C?= =?UTF-8?q?=E6=99=AF=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/backend/home/windMatrix.vue | 31 ++++++++++++------- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/ui/dasadmin/src/views/backend/home/windMatrix.vue b/ui/dasadmin/src/views/backend/home/windMatrix.vue index 5d0ae852..03bfcc45 100644 --- a/ui/dasadmin/src/views/backend/home/windMatrix.vue +++ b/ui/dasadmin/src/views/backend/home/windMatrix.vue @@ -6,32 +6,35 @@ @click="handleClick(item)" @contextmenu.prevent="windContextMenu($event,item)" > -
-
- - +
+ +
+ + {{ item.name }} 并网 待机 启动 维护 + >维护 离线 限功率运行 正常停机 外部因素导致停机 + >外部因素导致停机 停机 解缆状态 电网故障停机 + >电网故障停机 安全链停机 + >安全链停机 + 通讯中断
@@ -254,6 +257,10 @@ const sendManualCommand = (type: 1 | 0) => { background-image: linear-gradient(180deg, #f0f6ff 0%, #ffffff 50%); border: 1px solid #e1edf6; } +.wind-offline { + background-image: linear-gradient(180deg, #eeeeee 0%, #eeeeee 50%); + border: 1px solid #eeeeee; +} .wind-picture { display: none; } From 65b4650f969d6a0b1ba4ca7646532fabb6cd22ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=B7=E6=88=90=E4=BC=9F?= Date: Thu, 12 Dec 2024 10:44:32 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=96=B0=E5=A2=9EisOnline=E5=87=BD?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/das/modules/calc/service/CalcService.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/das/src/main/java/com/das/modules/calc/service/CalcService.java b/das/src/main/java/com/das/modules/calc/service/CalcService.java index c9669f0e..3b1ed193 100644 --- a/das/src/main/java/com/das/modules/calc/service/CalcService.java +++ b/das/src/main/java/com/das/modules/calc/service/CalcService.java @@ -138,6 +138,9 @@ public class CalcService { FunctionWindSpeedFactor windSpeedFactor = new FunctionWindSpeedFactor(dataService,cacheService); aviator.addFunction(windSpeedFactor); + + FunctionIsOnline isOnline = new FunctionIsOnline(adminRedisTemplate, cacheService); + aviator.addFunction(isOnline); } /** From 9572a597cf0f1de8e4c8ca1b957911bb2639a82a Mon Sep 17 00:00:00 2001 From: geting <13585118195@163.com> Date: Thu, 12 Dec 2024 10:53:43 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=8A=9F=E7=8E=87=E6=9B=B2=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/backend/statAnalysis/powerCurveAnalysis.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/dasadmin/src/views/backend/statAnalysis/powerCurveAnalysis.vue b/ui/dasadmin/src/views/backend/statAnalysis/powerCurveAnalysis.vue index 3c2fdfe5..46a52313 100644 --- a/ui/dasadmin/src/views/backend/statAnalysis/powerCurveAnalysis.vue +++ b/ui/dasadmin/src/views/backend/statAnalysis/powerCurveAnalysis.vue @@ -414,7 +414,7 @@ const statAnalysisExport = () => { const calculateAverages = (data: any) => { let maxWindSpeed = Math.max(...data.map((item: any) => item[0])) - let interval = 5 // 每5m/s一个区间 + let interval = 0.5 let result = [] for (let windSpeed = 0; windSpeed <= maxWindSpeed; windSpeed += interval) {