sx/map
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
zhouhuang 2024-12-05 11:05:05 +08:00
commit 49a2553d79
5 changed files with 17 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
das/src/main/java/com/das/modules/data/service/TDEngineService.java
View File

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

4
ui/dasadmin/src/views/backend/auth/Enumeration/index.vue
View File

@ -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

6
ui/dasadmin/src/views/backend/home/windMatrix.vue
View File

@ -90,11 +90,7 @@ 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 / 3
return {
'animation-duration': `${animationDuration}s`,

20
ui/dasadmin/src/views/backend/node/utils.ts
View File

@ -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

15
ui/dasadmin/src/views/backend/powerCurvefactor/index.vue
View File

@ -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 {