diff --git a/frontend/src/views/machine/testScript/components/testProjectPopup.vue b/frontend/src/views/machine/testScript/components/testProjectPopup.vue
index 7c74737..137d2b1 100644
--- a/frontend/src/views/machine/testScript/components/testProjectPopup.vue
+++ b/frontend/src/views/machine/testScript/components/testProjectPopup.vue
@@ -31,7 +31,11 @@
:show-header="false"
:span-method="arraySpanMethod"
:cell-style="tableStyle.cellStyle"
- :header-cell-style="{ textAlign: 'center', backgroundColor: 'var(--el-color-primary)', color: '#fff' }"
+ :header-cell-style="{
+ textAlign: 'center',
+ backgroundColor: 'var(--el-color-primary)',
+ color: '#fff'
+ }"
@cell-click="handleRowClick"
:key="key"
>
@@ -89,18 +93,22 @@
@@ -114,7 +122,13 @@
@@ -154,7 +168,7 @@
:formContent="props.formContent"
:form="form"
:key="initial"
- :valueCode=valueCode
+ :valueCode="valueCode"
@recalculation="recalculation"
/>
@@ -277,6 +291,12 @@ const close = () => {
dialogVisible.value = false
emit('close')
}
+// 设置持续时间
+const setRetainTime = (val: any) => {
+ form.value.channelList.forEach((item: any) => {
+ item.dipData.retainTime = val
+ })
+}
// 保存数据
const save = () => {
@@ -612,13 +632,19 @@ const copyRow = (num: number, index: number) => {
}
const validateFreq = () => {
- if (form.value.ffreq < 40) {
- ElMessage.warning("频率不能低于40Hz")
- form.value.ffreq = 40
- } else if (form.value.ffreq > 60) {
- ElMessage.warning("频率不能高于60Hz")
- form.value.ffreq = 60
- }
+ if (form.value.ffreq < 40) {
+ ElMessage.warning('频率不能低于40Hz')
+ form.value.ffreq = 40
+ } else if (form.value.ffreq > 60) {
+ ElMessage.warning('频率不能高于60Hz')
+ form.value.ffreq = 60
+ }
+}
+// 点击使能按钮
+const handleHarmFlag = (e: boolean, i: number) => {
+ if (e) {
+ form.value.channelList[i].channelFlag = true
+ }
}
// 打开 drawer(新增、编辑)
diff --git a/frontend/src/views/machine/testScript/components/testScriptDipTab.vue b/frontend/src/views/machine/testScript/components/testScriptDipTab.vue
index a8f6f88..5c47b86 100644
--- a/frontend/src/views/machine/testScript/components/testScriptDipTab.vue
+++ b/frontend/src/views/machine/testScript/components/testScriptDipTab.vue
@@ -64,6 +64,7 @@ const form: any = computed({
},
set(value) {}
})
+const emit = defineEmits(['setRetainTime'])
const handleInput = value => {
if (value < 0) {
ElMessage.warning("设定幅度不能小于0%")
@@ -78,11 +79,18 @@ const handleInputRetainTime = value => {
if (value < 0) {
ElMessage.warning("持续时间不能小于0周波")
props.childForm[0].dipData.retainTime = 0
+ emit('setRetainTime', 0 )
}else if (value > 300) {
ElMessage.warning("持续时间不能大于300周波")
props.childForm[0].dipData.retainTime = 300
+ emit('setRetainTime', 300 )
+ }else{
+ console.log(props);
+
+ emit('setRetainTime', value )
}
}
+