ClientApps/pqs-9100_client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into yn

Browse Source
This commit is contained in:
caozehui
2026-07-08 09:06:34 +08:00
parent 3b6a7d9d5b 49ded8c568
commit 987b6cd57f
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/src/views/home/components/test.vue
View File

@@ -679,6 +679,12 @@ watch(webMsgSend, function(newValue, oldValue) {
case 'F_End': case 'F_End':
handleEndItem('F', newValue.desc, newValue.data) handleEndItem('F', newValue.desc, newValue.data)
break break
case 'Angle_Start':
handleStartItem('Angle', newValue.desc)
break
case 'Angle_End':
handleEndItem('Angle', newValue.desc, newValue.data)
break
// 检测结束 // 检测结束
case 'Quit': case 'Quit':

2
frontend/src/views/machine/testScript/components/setValueTable.vue
View File

@@ -328,7 +328,7 @@ const setUnit = (row: any) => {
text = props.valueCode == 'Absolute' ? 'VA' : '%Un*In VA' text = props.valueCode == 'Absolute' ? 'VA' : '%Un*In VA'
} else if (row.name.includes('无功功率')) { } else if (row.name.includes('无功功率')) {
text = props.valueCode == 'Absolute' ? 'Var' : '%Un*In Var' text = props.valueCode == 'Absolute' ? 'Var' : '%Un*In Var'
} else if (row.name == '功率因数') { } else if (row.name.includes('功率因数')) {
text = '' text = ''
} else { } else {
text = unit.filter(item => item.label == row.pname)[0]?.unit text = unit.filter(item => item.label == row.pname)[0]?.unit