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

das/src/main/java/com/das/modules/data/service/TDEngineService.java

@@ -878,7 +878,7 @@ public class TDEngineService {
                 result = rs.getDouble(1);
             }
         } catch (Exception e) {
-            log.error("获取数据异常");
+            log.error("获取数据异常",e);
         }
         return result;
     }
@@ -901,7 +901,7 @@ public class TDEngineService {
                 result = rs.getDouble(1);
             }
         } catch (Exception e) {
-            log.error("获取数据异常");
+            log.error("获取数据异常",e);
         }
         return result;
     }

ui/dasadmin/src/views/backend/auth/Enumeration/index.vue

@@ -290,6 +290,10 @@ const handleNodeClick = (data: any) => {
     enumTypeId.value=data.id
     queryListData.enumTypeId=data.id
     queryListData.description=queryName.value
+    /*if (currentPage.value !== 1) {
+        currentPage.value = 1
+        return
+    }*/
     queryListData.pageNum=currentPage.value
     queryListData.pageSize=currentPageSize.value
     nodename.value=data.description

ui/dasadmin/src/views/backend/home/windMatrix.vue

@@ -90,11 +90,7 @@ const props = defineProps({
 const getAnimationStyle = (item) => {
     const irotorspeed = item.attributeMap?.irotorspeed ?? 0
     let animationDuration;
-    if(irotorspeed>10){
+    animationDuration = 60 / irotorspeed / 3
-        animationDuration= 60 / irotorspeed
-    }else{
-        animationDuration = 60 / irotorspeed / 5
-    }
 
     return {
         'animation-duration': `${animationDuration}s`,

ui/dasadmin/src/views/backend/node/utils.ts

@@ -330,16 +330,16 @@ export const excelDefaultConfig: any = {
                 }
             ],
             R0C4: [
-                "1、32位浮点数(高位在第一个寄存器)",
+                "0. 32位浮点数(高位在第一个寄存器)",
-                "2、32位浮点数(高位在第二个寄存器)",
+                "1. 32位浮点数(高位在第二个寄存器)",
-                "2、16位归一化值",
+                "2. 16位归一化值",
-                "4、32位归一化值(高位在第一个寄存器)",
+                "3. 32位归一化值(高位在第一个寄存器)",
-                "5、32位归一化值(高位在第二个寄存器)",
+                "4. 32位归一化值(高位在第二个寄存器)",
-                "6、32位浮点数(小端系统模式)",
+                "5. 32位浮点数(小端系统模式)",
-                "7、32位BCD数据（*高位在第一个寄存器*）",
+                "6. 32位BCD数据（*高位在第一个寄存器*）",
-                "8、32位BCD数据（*高位在第二个寄存器*）",
+                "7. 32位BCD数据（*高位在第二个寄存器*）",
-                "9、16位BCD数据",
+                "8. 16位BCD数据",
-                "10、8位归一化值"
+                "9. 8位归一化值"
             ], // 数据类型的提示
         },
         //遥控147 CONTROL

ui/dasadmin/src/views/backend/powerCurvefactor/index.vue

@@ -55,7 +55,6 @@ import {powerCurveQuery,powerImport,powerExport} from "/@/api/backend/powerCurve
 import { ElMessage } from 'element-plus'
 import { encrypt_aes, generateRandomNumber } from '/@/utils/crypto'
 import type { TableColumnCtx } from 'element-plus'
-import { dataMethods } from './utils'
 
 
 interface User {
@@ -79,20 +78,6 @@ interface SpanMethodProps {
 }
 
 const objectSpanMethod = ({row, column, rowIndex, columnIndex,}: SpanMethodProps) => {
-    /*if (columnIndex === 0) {
-       if (rowIndex % 7 === 0) {
-           return {
-               rowspan: 7,
-               colspan: 1,
-           };
-       } else {
-           return {
-               rowspan: 0,
-               colspan: 0,
-           };
-       }
-   }*/
-
     if (columnIndex === 0) {
         if (row.NameIndex === 1) {
             return {