From 144a66f47a3c0bac6b287ede27452f0db4569684 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=B7=E6=88=90=E4=BC=9F?= Date: Thu, 5 Dec 2024 11:50:17 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E7=BC=93=E5=AD=98BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/EquipmentCacheImpl.java | 2 +- .../calc/functions/FunctionSaveCalcData.java | 23 ------------------- 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/das/src/main/java/com/das/modules/cache/service/impl/EquipmentCacheImpl.java b/das/src/main/java/com/das/modules/cache/service/impl/EquipmentCacheImpl.java index 1c784d47..e08ce6fc 100644 --- a/das/src/main/java/com/das/modules/cache/service/impl/EquipmentCacheImpl.java +++ b/das/src/main/java/com/das/modules/cache/service/impl/EquipmentCacheImpl.java @@ -87,7 +87,7 @@ public class EquipmentCacheImpl implements EquipmentCache { } else{ deviceInfoCaches.add(deviceInfoCache); - index = deviceInfoCaches.size(); + index = deviceInfoCaches.size() - 1; deviceCodeIndex.put(deviceInfoCache.getDeviceCode(),index); deviceIdIndex.put(equipment.getId(),index); } diff --git a/das/src/main/java/com/das/modules/calc/functions/FunctionSaveCalcData.java b/das/src/main/java/com/das/modules/calc/functions/FunctionSaveCalcData.java index 73de903e..cd88c7ee 100644 --- a/das/src/main/java/com/das/modules/calc/functions/FunctionSaveCalcData.java +++ b/das/src/main/java/com/das/modules/calc/functions/FunctionSaveCalcData.java @@ -35,29 +35,6 @@ public class FunctionSaveCalcData extends AbstractVariadicFunction { return "save"; } -// @Override -// public AviatorObject call(Map env, AviatorObject deviceCode, AviatorObject attributes) { -// //设备Code -// String code = (String)deviceCode.getValue(env); -// DeviceInfoCache deviceInfoCache = cacheService.getDeviceInfoCache(code); -// //属性列表 -// List list = (List)attributes.getValue(env); -// List attrs = list.stream().map(String::toLowerCase).toList(); -// SnapshotValueQueryParam snapshotValueQueryParam = new SnapshotValueQueryParam(); -// snapshotValueQueryParam.setDeviceId(String.valueOf(deviceInfoCache.getDeviceId())); -// snapshotValueQueryParam.setAttributes(attrs); -// Map> stringMapMap = dataService.querySnapshotValues(List.of(snapshotValueQueryParam)); -// Map data = stringMapMap.get(String.valueOf(deviceInfoCache.getDeviceId())); -// log.info("{}", data); -// Map result = new HashMap<>(list.size()); -// for (String s : list) { -// String key = s.toLowerCase(); -// Object value = data.get(key); -// result.put(s, value); -// } -// return AviatorRuntimeJavaType.valueOf(result); -// } - @SneakyThrows @Override public AviatorObject variadicCall(Map env, AviatorObject... args) { From 2542150c4f7e5ef3028c265a9ff3e173758da499 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E4=BA=91=E9=B9=8F?= Date: Thu, 5 Dec 2024 12:02:50 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=8A=82=E7=82=B9=E9=93=BE=E8=B7=AF?= =?UTF-8?q?=EF=BC=9A=E5=88=86=E9=A1=B5bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/dasadmin/src/views/backend/node/index.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ui/dasadmin/src/views/backend/node/index.vue b/ui/dasadmin/src/views/backend/node/index.vue index c4a0ae9f..95979094 100644 --- a/ui/dasadmin/src/views/backend/node/index.vue +++ b/ui/dasadmin/src/views/backend/node/index.vue @@ -121,6 +121,7 @@ background :pager-count="7" layout="prev, pager, next, jumper,sizes,total" + @change="changePage" > @@ -503,6 +504,10 @@ const paginationOptions = reactive({ pageSizes: [20, 50, 100], }) +const changePage = ()=>{ + getLinkData(clickTreeData.value!.id!) +} + const getLinkData = (nodeId: string, linkName?: string) => { getLinkListReq({ nodeId, linkName, pageNum: paginationOptions.current, pageSize: paginationOptions.pageSize }) .then((res) => { From c603b40b497e8a01df8954edd29c21afe9460a83 Mon Sep 17 00:00:00 2001 From: geting <13585118195@163.com> Date: Thu, 5 Dec 2024 12:26:23 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=88=86=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/dasadmin/src/lang/common/zh-cn/statAnalysis.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/dasadmin/src/lang/common/zh-cn/statAnalysis.ts b/ui/dasadmin/src/lang/common/zh-cn/statAnalysis.ts index 691f733d..77c95ada 100644 --- a/ui/dasadmin/src/lang/common/zh-cn/statAnalysis.ts +++ b/ui/dasadmin/src/lang/common/zh-cn/statAnalysis.ts @@ -1,7 +1,7 @@ export default { PowerCurveAnalysis: '功率曲线分析', - trendAnalysis: '趋势分析', - trendComparison: '趋势对比', + trendAnalysis: '单机分析', + trendComparison: '多机对比', deviceId: '风机', attributes: '测点名称', interval: '间隔',