Merge branch 'main' of https://git.jsspisoft.com/ry-das

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);
             }

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<String, Object> env, AviatorObject deviceCode, AviatorObject attributes) {
-//        //设备Code
-//        String code = (String)deviceCode.getValue(env);
-//        DeviceInfoCache deviceInfoCache = cacheService.getDeviceInfoCache(code);
-//        //属性列表
-//        List<String> list = (List<String>)attributes.getValue(env);
-//        List<String> attrs = list.stream().map(String::toLowerCase).toList();
-//        SnapshotValueQueryParam snapshotValueQueryParam = new SnapshotValueQueryParam();
-//        snapshotValueQueryParam.setDeviceId(String.valueOf(deviceInfoCache.getDeviceId()));
-//        snapshotValueQueryParam.setAttributes(attrs);
-//        Map<String, Map<String, Object>> stringMapMap = dataService.querySnapshotValues(List.of(snapshotValueQueryParam));
-//        Map<String,Object> data = stringMapMap.get(String.valueOf(deviceInfoCache.getDeviceId()));
-//        log.info("{}", data);
-//        Map<String,Object> 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<String, Object> env, AviatorObject... args) {

ui/dasadmin/src/lang/common/zh-cn/statAnalysis.ts

@@ -1,7 +1,7 @@
 export default {
     PowerCurveAnalysis: '功率曲线分析',
-    trendAnalysis: '趋势分析',
-    trendComparison: '趋势对比',
+    trendAnalysis: '单机分析',
+    trendComparison: '多机对比',
     deviceId: '风机',
     attributes: '测点名称',
     interval: '间隔',

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"
                     ></el-pagination>
                 </div>
             </template>
@@ -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) => {