Merge branch 'master' into yn

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

@@ -1,13 +0,0 @@
-<template>
-    <div>
-
-    </div>
-</template>
-
-<script setup lang="ts">
-
-</script>
-
-<style scoped>
-
-</style>

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

@@ -321,13 +321,18 @@ const setUnit = (row: any) => {
         row.name == '电流有效值' ? (text = o) : ''
         row.name == '电流相角' ? (text = '°') : ''
     } else if (row.name == '电压序分量') {
-      text = '%Un V'
+      text = props.valueCode == 'Absolute'? 'V':'%Un V'
     } else if (row.name == '电流序分量') {
-      text = '%In A'
+      text = props.valueCode == 'Absolute'? 'A':'%In A'
+    } else if (row.name == '视在功率') {
+      text = props.valueCode == 'Absolute' ? 'VA' : '%Un*In VA'
+    } else if (row.name == '无功功率') {
+      text = props.valueCode == 'Absolute' ? 'Var' : '%Un*In Var'
+    } else if (row.name == '功率因数') {
+      text = ''
     } else {
       text = unit.filter(item => item.label == row.pname)[0]?.unit
     }
-
     return text || ''
 }
 const save = () => {

frontend/src/views/plan/planList/components/planPopup.vue

@@ -112,8 +112,8 @@
                                 :key="index"
                                 :label="option.label"
                                 :value="option.value"
-                                :disabled="option.fluke!=1&&pqSourceArray?.find(item=>formContent.sourceIds==item.value)?.label.includes('FLUKE')"
                             />
+<!--                          :disabled="option.fluke!=1&&pqSourceArray?.find(item=>formContent.sourceIds==item.value)?.label.includes('FLUKE')"-->
                         </el-select>
                     </el-form-item>
                     <el-form-item :label-width="110" label="误差体系" prop="errorSysId">