Merge branch 'master' into yn

frontend/src/views/machine/testScript/components/setValueTable.vue

@@ -324,9 +324,9 @@ const setUnit = (row: any) => {
       text = props.valueCode == 'Absolute'? 'V':'%Un V'
     } else if (row.name == '电流序分量') {
       text = props.valueCode == 'Absolute'? 'A':'%In A'
-    } else if (row.name == '视在功率') {
+    } else if (row.name.includes('视在功率')) {
       text = props.valueCode == 'Absolute' ? 'VA' : '%Un*In VA'
-    } else if (row.name == '无功功率') {
+    } else if (row.name.includes('无功功率')) {
       text = props.valueCode == 'Absolute' ? 'Var' : '%Un*In Var'
     } else if (row.name == '功率因数') {
       text = ''