From 54fcbcbd3ab58cad74e0c66bcc15cd9a30fbb9ca 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 08:44:32 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E9=93=BE=E8=B7=AF=EF=BC=9Aads=E5=8D=8F?= =?UTF-8?q?=E8=AE=AE=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/dasadmin/src/views/backend/node/utils.ts | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/ui/dasadmin/src/views/backend/node/utils.ts b/ui/dasadmin/src/views/backend/node/utils.ts index bfa4fc60..4eaaf2a1 100644 --- a/ui/dasadmin/src/views/backend/node/utils.ts +++ b/ui/dasadmin/src/views/backend/node/utils.ts @@ -330,16 +330,16 @@ export const excelDefaultConfig: any = { } ], R0C4: [ - "1、32位浮点数(高位在第一个寄存器)", - "2、32位浮点数(高位在第二个寄存器)", - "2、16位归一化值", - "4、32位归一化值(高位在第一个寄存器)", - "5、32位归一化值(高位在第二个寄存器)", - "6、32位浮点数(小端系统模式)", - "7、32位BCD数据（*高位在第一个寄存器*）", - "8、32位BCD数据（*高位在第二个寄存器*）", - "9、16位BCD数据", - "10、8位归一化值" + "0. 32位浮点数(高位在第一个寄存器)", + "1. 32位浮点数(高位在第二个寄存器)", + "2. 16位归一化值", + "3. 32位归一化值(高位在第一个寄存器)", + "4. 32位归一化值(高位在第二个寄存器)", + "5. 32位浮点数(小端系统模式)", + "6. 32位BCD数据（*高位在第一个寄存器*）", + "7. 32位BCD数据（*高位在第二个寄存器*）", + "8. 16位BCD数据", + "9. 8位归一化值" ], // 数据类型的提示 }, //遥控147 CONTROL From cccf3b902e64b18b3521394b8bc8b3f5a6d7c13e 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 09:34:31 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/das/modules/data/service/TDEngineService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/das/src/main/java/com/das/modules/data/service/TDEngineService.java b/das/src/main/java/com/das/modules/data/service/TDEngineService.java index 7eba306c..be7da2d3 100644 --- a/das/src/main/java/com/das/modules/data/service/TDEngineService.java +++ b/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; } From 792753971f045be489cb325245317f1fd411041a Mon Sep 17 00:00:00 2001 From: fengrong Date: Thu, 5 Dec 2024 10:26:40 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E9=A6=96=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/backend/auth/Enumeration/index.vue | 4 ++++ ui/dasadmin/src/views/backend/home/windMatrix.vue | 11 ++++++----- .../src/views/backend/powerCurvefactor/index.vue | 15 --------------- 3 files changed, 10 insertions(+), 20 deletions(-) diff --git a/ui/dasadmin/src/views/backend/auth/Enumeration/index.vue b/ui/dasadmin/src/views/backend/auth/Enumeration/index.vue index 3b6fb745..678cac5b 100644 --- a/ui/dasadmin/src/views/backend/auth/Enumeration/index.vue +++ b/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 diff --git a/ui/dasadmin/src/views/backend/home/windMatrix.vue b/ui/dasadmin/src/views/backend/home/windMatrix.vue index edcd4c72..4cbc660f 100644 --- a/ui/dasadmin/src/views/backend/home/windMatrix.vue +++ b/ui/dasadmin/src/views/backend/home/windMatrix.vue @@ -90,11 +90,12 @@ const props = defineProps({ const getAnimationStyle = (item) => { const irotorspeed = item.attributeMap?.irotorspeed ?? 0 let animationDuration; - if(irotorspeed>10){ - animationDuration= 60 / irotorspeed - }else{ - animationDuration = 60 / irotorspeed / 5 - } + animationDuration = 60 / irotorspeed / 5 + // if(irotorspeed>10){ + // animationDuration= 60 / irotorspeed + // }else{ + // animationDuration = 60 / irotorspeed / 5 + // } return { 'animation-duration': `${animationDuration}s`, diff --git a/ui/dasadmin/src/views/backend/powerCurvefactor/index.vue b/ui/dasadmin/src/views/backend/powerCurvefactor/index.vue index 7b1d4e86..4e631dc9 100644 --- a/ui/dasadmin/src/views/backend/powerCurvefactor/index.vue +++ b/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 { From cb09ec03b7d1b3647520ae701b19fd34355f4bb9 Mon Sep 17 00:00:00 2001 From: fengrong Date: Thu, 5 Dec 2024 10:30:37 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E9=A6=96=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/dasadmin/src/views/backend/home/windMatrix.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/dasadmin/src/views/backend/home/windMatrix.vue b/ui/dasadmin/src/views/backend/home/windMatrix.vue index 4cbc660f..40561547 100644 --- a/ui/dasadmin/src/views/backend/home/windMatrix.vue +++ b/ui/dasadmin/src/views/backend/home/windMatrix.vue @@ -90,7 +90,7 @@ const props = defineProps({ const getAnimationStyle = (item) => { const irotorspeed = item.attributeMap?.irotorspeed ?? 0 let animationDuration; - animationDuration = 60 / irotorspeed / 5 + animationDuration = 60 / irotorspeed / 3 // if(irotorspeed>10){ // animationDuration= 60 / irotorspeed // }else{ From 7b4e361e6efcd5fd041f7e9ae6f88eb03135d2b0 Mon Sep 17 00:00:00 2001 From: fengrong Date: Thu, 5 Dec 2024 10:31:10 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E9=A6=96=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/dasadmin/src/views/backend/home/windMatrix.vue | 5 ----- 1 file changed, 5 deletions(-) diff --git a/ui/dasadmin/src/views/backend/home/windMatrix.vue b/ui/dasadmin/src/views/backend/home/windMatrix.vue index 40561547..8a11ff67 100644 --- a/ui/dasadmin/src/views/backend/home/windMatrix.vue +++ b/ui/dasadmin/src/views/backend/home/windMatrix.vue @@ -91,11 +91,6 @@ const getAnimationStyle = (item) => { const irotorspeed = item.attributeMap?.irotorspeed ?? 0 let animationDuration; animationDuration = 60 / irotorspeed / 3 - // if(irotorspeed>10){ - // animationDuration= 60 / irotorspeed - // }else{ - // animationDuration = 60 / irotorspeed / 5 - // } return { 'animation-duration': `${animationDuration}s`,