diff --git a/build/extraResources/java/entrance.jar b/build/extraResources/java/entrance.jar
index aafe48f..936cb97 100644
Binary files a/build/extraResources/java/entrance.jar and b/build/extraResources/java/entrance.jar differ
diff --git a/frontend/src/views/machine/testScript/components/setValuePopup.vue b/frontend/src/views/machine/testScript/components/setValuePopup.vue
deleted file mode 100644
index 8e8347f..0000000
--- a/frontend/src/views/machine/testScript/components/setValuePopup.vue
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/frontend/src/views/machine/testScript/components/setValueTable.vue b/frontend/src/views/machine/testScript/components/setValueTable.vue
index a630a83..268d11a 100644
--- a/frontend/src/views/machine/testScript/components/setValueTable.vue
+++ b/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 = () => {
diff --git a/frontend/src/views/plan/planList/components/planPopup.vue b/frontend/src/views/plan/planList/components/planPopup.vue
index cb48b40..03bf776 100644
--- a/frontend/src/views/plan/planList/components/planPopup.vue
+++ b/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')"
/>
+