diff --git a/frontend/src/views/machine/testScript/components/scriptForm.ts b/frontend/src/views/machine/testScript/components/scriptForm.ts index 74f187a..4059ac7 100644 --- a/frontend/src/views/machine/testScript/components/scriptForm.ts +++ b/frontend/src/views/machine/testScript/components/scriptForm.ts @@ -37,7 +37,9 @@ let scriptForm: any = { }, //闪变 dipData: { ftransValue: '', // 暂态幅值 - retainTime: '' // 暂态持续时间 + retainTime: '', // 暂态持续时间 + fpreTime:2.0, + fafterTime:3.0 } //暂态 }, { @@ -67,7 +69,9 @@ let scriptForm: any = { }, //闪变 dipData: { ftransValue: '', // 暂态幅值 - retainTime: '' // 暂态持续时间 + retainTime: '', // 暂态持续时间 + fpreTime:2.0, + fafterTime:3.0 } //暂态 }, { @@ -97,7 +101,9 @@ let scriptForm: any = { }, //闪变 dipData: { ftransValue: '', // 暂态幅值 - retainTime: '' // 暂态持续时间 + retainTime: '', // 暂态持续时间 + fpreTime:2.0, + fafterTime:3.0 } //暂态 }, { @@ -127,7 +133,9 @@ let scriptForm: any = { }, //闪变 dipData: { ftransValue: '', // 暂态幅值 - retainTime: '' // 暂态持续时间 + retainTime: '', // 暂态持续时间 + fpreTime:2.0, + fafterTime:3.0 } //暂态 }, { @@ -157,7 +165,9 @@ let scriptForm: any = { }, //闪变 dipData: { ftransValue: '', // 暂态幅值 - retainTime: '' // 暂态持续时间 + retainTime: '', // 暂态持续时间 + fpreTime:2.0, + fafterTime:3.0 } //暂态 }, { @@ -187,7 +197,9 @@ let scriptForm: any = { }, //闪变 dipData: { ftransValue: '', // 暂态幅值 - retainTime: '' // 暂态持续时间 + retainTime: '', // 暂态持续时间 + fpreTime:2.0, + fafterTime:3.0 } //暂态 } ] diff --git a/frontend/src/views/machine/testScript/components/testProjectPopup.vue b/frontend/src/views/machine/testScript/components/testProjectPopup.vue index 1df972c..e3bacd9 100644 --- a/frontend/src/views/machine/testScript/components/testProjectPopup.vue +++ b/frontend/src/views/machine/testScript/components/testProjectPopup.vue @@ -162,7 +162,7 @@ - + @@ -303,6 +303,18 @@ const setRetainTime = (val: any) => { }) } +const setFPreTime = (val: any) => { + form.value.channelList.forEach((item: any) => { + item.dipData.fpreTime = val + }) +} + +const setFAfterTime = (val: any) => { + form.value.channelList.forEach((item: any) => { + item.dipData.fafterTime = val + }) +} + // 保存数据 const save = () => { let copyForm = handleHarmData() @@ -644,6 +656,8 @@ const validateFreq = () => { form.value.ffreq = 60 } } + + // 点击使能按钮 const handleHarmFlag = (e: boolean, i: number) => { if (e) { diff --git a/frontend/src/views/machine/testScript/components/testScriptDipTab.vue b/frontend/src/views/machine/testScript/components/testScriptDipTab.vue index 65f8d74..7bb5c39 100644 --- a/frontend/src/views/machine/testScript/components/testScriptDipTab.vue +++ b/frontend/src/views/machine/testScript/components/testScriptDipTab.vue @@ -3,7 +3,7 @@
- +
+ - - + + - - + + + + + + + + +
@@ -60,11 +78,12 @@ const props = defineProps({ }) const form: any = computed({ get() { + console.log(props.childForm) return props.childForm }, set(value) {} }) -const emit = defineEmits(['setRetainTime']) +const emit = defineEmits(['setRetainTime','setFPreTime','setFAfterTime']) const handleInput = value => { if (value < 0) { ElMessage.warning("设定幅度不能小于0%") @@ -91,6 +110,34 @@ const handleInputRetainTime = value => { } } +const validateFPreTime = value => { + if (value < 0.01) { + ElMessage.warning('暂态前延时间不能低于0.01S') + props.childForm[0].dipData.fPreTime = 0.01 + emit('setFPreTime', 0.01 ) + } else if (value > 60) { + ElMessage.warning('暂态前延时间不能高于60S') + props.childForm[0].dipData.fPreTime = 60 + emit('setFPreTime', 60 ) + }else{ + emit('setFPreTime', value ) + } +} + +const validateFAfterTime = value => { + if (value < 0.01) { + ElMessage.warning('暂态后延时间不能低于0.01S') + props.childForm[0].dipData.fafterTime = 0.01 + emit('setFAfterTime', 0.01 ) + } else if (value > 60) { + ElMessage.warning('暂态后延时间不能高于60S') + props.childForm[0].dipData.fafterTime = 60 + emit('setFAfterTime', 60 ) + }else{ + emit('setFAfterTime', value ) + } +} +