Merge branch 'master' into yn

frontend/src/views/home/components/test.vue

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

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

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