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

物模型：属性表单添加数据类型验证

Browse Source 
链路：测点添加设备编码、属性编码字段
This commit is contained in:
高云鹏 2024-10-18 11:01:39 +08:00
parent 84b92bc0dd
commit 1cbfb80f50
2 changed files with 58 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ui/dasadmin/src/views/backend/auth/model/index.vue
View File

@ -796,6 +796,15 @@ const attributeAndServiceRules = {
serviceName: [{ required: true, message: '请输入方法名称', trigger: 'blur' }],
serviceType: [{ required: true, message: '请选择方法类型', trigger: 'change' }],
porder: [{ required: true, message: '请输入序号', trigger: 'blur' }],
dataType: {
validator: (rule: any, value: any, callback: any) => {
if (attributeForm.value.attributeType !== 140 && !value) {
callback(new Error('请选择数据类型'))
} else {
callback()
}
},
},
}
const addModelAttributeAndService = () => {

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

@ -24,8 +24,8 @@ export const excelDefaultConfig: any = {
code: 'col4',
},
],
R0C3: ['03', '04'],
R0C4: [
R0C4: ['03', '04'],
R0C5: [
'0 - 32位浮点数(高位在第一个寄存器)',
'1 - 32位浮点数(高位在第二个寄存器)',
'2 - 16位归一化值',
@ -36,7 +36,7 @@ export const excelDefaultConfig: any = {
'7 - 32位BCD数据(*高位在第二个寄存器*)',
'8 - 16位BCD数据',
], // 数据类型的提示
R0C5: ['0 - 无符号', '1 - 有符号'], // 数据符号的提示
R0C6: ['0 - 无符号', '1 - 有符号'], // 数据符号的提示
},
//遥控147 CONTROL
147: {
@ -84,8 +84,8 @@ export const excelDefaultConfig: any = {
code: 'col10',
},
],
R0C3: ['05', '15', '06', '16'],
R0C4: ['0 - 直接执行', '1 - 预置执行'],
R0C4: ['05', '15', '06', '16'],
R0C5: ['0 - 直接执行', '1 - 预置执行'],
},
//遥调146 SETPOINT
146: {
@ -116,9 +116,9 @@ export const excelDefaultConfig: any = {
code: 'col6',
},
],
R0C3: ['0 - 16位整型值', '1 - 32位值高位在第一个寄存器', '2 - 32位值高位在第二个寄存器'],
R0C4: ['06', '16'],
R0C5: ['0 - 直接执行', '1 - 预置执行'],
R0C4: ['0 - 16位整型值', '1 - 32位值高位在第一个寄存器', '2 - 32位值高位在第二个寄存器'],
R0C5: ['06', '16'],
R0C6: ['0 - 直接执行', '1 - 预置执行'],
},
//遥脉139 ACCUMULATOR
139: {
@ -137,8 +137,8 @@ export const excelDefaultConfig: any = {
code: 'col3',
},
],
R0C3: ['03', '04'],
R0C4: [
R0C4: ['03', '04'],
R0C5: [
'0 - 16位无符号整型值',
'1 - 32位无符号整型值(高位在第一个寄存器)',
'2 - 32位有符号整型值(高位在第一个寄存器)',
@ -166,7 +166,7 @@ export const excelDefaultConfig: any = {
code: 'col3',
},
],
R0C3: ['01', '02', '03', '04'],
R0C4: ['01', '02', '03', '04'],
},
},
// MODBASETCP主
@ -192,8 +192,8 @@ export const excelDefaultConfig: any = {
code: 'col4',
},
],
R0C3: ['03', '04'],
R0C4: [
R0C4: ['03', '04'],
R0C5: [
'0 - 32位浮点数(高位在第一个寄存器)',
'1 - 32位浮点数(高位在第二个寄存器)',
'2 - 16位归一化值',
@ -204,7 +204,7 @@ export const excelDefaultConfig: any = {
'7 - 32位BCD数据(*高位在第二个寄存器*)',
'8 - 16位BCD数据',
], // 数据类型的提示
R0C5: ['0 - 无符号', '1 - 有符号'], // 数据符号的提示
R0C6: ['0 - 无符号', '1 - 有符号'], // 数据符号的提示
},
//遥控147 CONTROL
147: {
@ -252,8 +252,8 @@ export const excelDefaultConfig: any = {
code: 'col10',
},
],
R0C3: ['05', '15', '06', '16'],
R0C4: ['0 - 直接执行', '1 - 预置执行'],
R0C4: ['05', '15', '06', '16'],
R0C5: ['0 - 直接执行', '1 - 预置执行'],
},
//遥调146 SETPOINT
146: {
@ -284,9 +284,9 @@ export const excelDefaultConfig: any = {
code: 'col6',
},
],
R0C3: ['0 - 16位整型值', '1 - 32位值高位在第一个寄存器', '2 - 32位值高位在第二个寄存器'],
R0C4: ['06', '16'],
R0C5: ['0 - 直接执行', '1 - 预置执行'],
R0C4: ['0 - 16位整型值', '1 - 32位值高位在第一个寄存器', '2 - 32位值高位在第二个寄存器'],
R0C5: ['06', '16'],
R0C6: ['0 - 直接执行', '1 - 预置执行'],
},
//遥脉139 ACCUMULATOR
139: {
@ -305,8 +305,8 @@ export const excelDefaultConfig: any = {
code: 'col3',
},
],
R0C3: ['03', '04'],
R0C4: [
R0C4: ['03', '04'],
R0C5: [
'0 - 16位无符号整型值',
'1 - 32位无符号整型值(高位在第一个寄存器)',
'2 - 32位有符号整型值(高位在第一个寄存器)',
@ -334,7 +334,7 @@ export const excelDefaultConfig: any = {
code: 'col3',
},
],
R0C3: ['01', '02', '03', '04'],
R0C4: ['01', '02', '03', '04'],
},
},
// IEC104主
@ -401,7 +401,7 @@ export const excelDefaultConfig: any = {
code: 'ts',
},
],
R0C2: ['否--0', '是--1']
R0C4: ['否--0', '是--1']
},
//遥控147 CONTROL
147: {
@ -412,7 +412,7 @@ export const excelDefaultConfig: any = {
code: 'ts',
},
],
R0C2: ['否--0', '是--1']
R0C4: ['否--0', '是--1']
},
//遥调146 SETPOINT
146: {
@ -423,7 +423,7 @@ export const excelDefaultConfig: any = {
code: 'ts',
},
],
R0C2: ['否--0', '是--1']
R0C4: ['否--0', '是--1']
},
//遥脉139 ACCUMULATOR
139: {
@ -434,7 +434,7 @@ export const excelDefaultConfig: any = {
code: 'ts',
},
],
R0C2: ['否--0', '是--1']
R0C4: ['否--0', '是--1']
},
//遥信140 DISCRETE
140: {
@ -445,7 +445,7 @@ export const excelDefaultConfig: any = {
code: 'ts',
},
],
R0C2: ['否--0', '是--1']
R0C4: ['否--0', '是--1']
},
}
}
@ -467,6 +467,7 @@ const DEFAULT_WORKBOOK_DATA = {
rgb: '#eceff7',
},
},
},
sheets: {},
}
@ -482,7 +483,7 @@ const createHeaderData = (protocol: string | number) => {
Object.keys(excelDefaultConfig[protocol!]).forEach((item) => {
const dynamicData: any = {}
excelDefaultConfig[protocol!][item].head.forEach((head: any, index: number) => {
const key = index + 2
const key = index + 4
dynamicData[key] = {
v: head.label,
s: '1',
@ -496,11 +497,21 @@ const createHeaderData = (protocol: string | number) => {
s: '1',
custom: 'equipmentName',
},
1: {
1:{
v: '设备编码',
s: '1',
custom: 'equipmentCode',
},
2: {
v: '属性名称',
s: '1',
custom: 'name',
},
3:{
v: '属性编码',
s: '1',
custom: 'code',
},
...dynamicData,
},
}
@ -561,6 +572,15 @@ export const createWookbookData = (protocol: number, linkId: string, data: any =
w: 300,
h: 0,
},
2: {
w: 300,
h: 0,
},
3: {
w: 300,
h: 0,
},
},
rowHeader: {
width: 46,