diff --git a/frontend/src/views/machine/testScript/components/scriptForm.ts b/frontend/src/views/machine/testScript/components/scriptForm.ts index 360c887..721e82d 100644 --- a/frontend/src/views/machine/testScript/components/scriptForm.ts +++ b/frontend/src/views/machine/testScript/components/scriptForm.ts @@ -39,7 +39,9 @@ let scriptForm: any = { ftransValue: '', // 暂态幅值 retainTime: '', // 暂态持续时间 fpreTime:2.0, - fafterTime:3.0 + fafterTime:3.0, + frampIn:0.001, //写入时间 + frampOut:0.001 //写出时间 } //暂态 }, { @@ -71,7 +73,9 @@ let scriptForm: any = { ftransValue: '', // 暂态幅值 retainTime: '', // 暂态持续时间 fpreTime:2.0, - fafterTime:3.0 + fafterTime:3.0, + frampIn:0.001, //写入时间 + frampOut:0.001 //写出时间 } //暂态 }, { @@ -103,7 +107,9 @@ let scriptForm: any = { ftransValue: '', // 暂态幅值 retainTime: '', // 暂态持续时间 fpreTime:2.0, - fafterTime:3.0 + fafterTime:3.0, + frampIn:0.001, //写入时间 + frampOut:0.001 //写出时间 } //暂态 }, { @@ -135,7 +141,9 @@ let scriptForm: any = { ftransValue: '', // 暂态幅值 retainTime: '', // 暂态持续时间 fpreTime:2.0, - fafterTime:3.0 + fafterTime:3.0, + frampIn:0.001, //写入时间 + frampOut:0.001 //写出时间 } //暂态 }, { @@ -167,7 +175,9 @@ let scriptForm: any = { ftransValue: '', // 暂态幅值 retainTime: '', // 暂态持续时间 fpreTime:2.0, - fafterTime:3.0 + fafterTime:3.0, + frampIn:0.001, //写入时间 + frampOut:0.001 //写出时间 } //暂态 }, { @@ -199,7 +209,9 @@ let scriptForm: any = { ftransValue: '', // 暂态幅值 retainTime: '', // 暂态持续时间 fpreTime:2.0, - fafterTime:3.0 + fafterTime:3.0, + frampIn:0.001, //写入时间 + frampOut:0.001 //写出时间 } //暂态 } ] diff --git a/frontend/src/views/machine/testScript/components/testProjectPopup.vue b/frontend/src/views/machine/testScript/components/testProjectPopup.vue index 06e9d38..8d847b2 100644 --- a/frontend/src/views/machine/testScript/components/testProjectPopup.vue +++ b/frontend/src/views/machine/testScript/components/testProjectPopup.vue @@ -8,14 +8,14 @@
- +
@@ -162,7 +162,7 @@ - + @@ -314,6 +314,16 @@ const setFAfterTime = (val: any) => { item.dipData.fafterTime = val }) } +const setFRampIn = (val: any) => { + form.value.channelList.forEach((item: any) => { + item.dipData.frampIn = val + }) +} +const setFRampOut = (val: any) => { + form.value.channelList.forEach((item: any) => { + item.dipData.frampOut = val + }) +} // 保存数据 const save = () => { @@ -745,37 +755,37 @@ defineExpose({ open }) flex: 0 0 auto; } -.test-pane-scroll { - height: 295px; - display: flex; - justify-content: flex-start; - align-items: flex-start; - overflow-x: auto; - overflow-y: auto; -} - -.test-radio-group { - display: flex; - align-items: flex-start; - min-width: 100%; - flex-direction: column; -} +.test-pane-scroll { + height: 295px; + display: flex; + justify-content: flex-start; + align-items: flex-start; + overflow-x: auto; + overflow-y: auto; +} + +.test-radio-group { + display: flex; + align-items: flex-start; + min-width: 100%; + flex-direction: column; +} .left-tabs { flex: 1 1 auto; min-width: 0; } -:deep(.test-radio-group .el-radio) { - width: max-content; - max-width: none; -} - -:deep(.test-radio-group .test-radio-item) { - margin: 0 0 10px 0; -} - -:deep(.test-radio-group .el-radio__label) { - white-space: nowrap; -} +:deep(.test-radio-group .el-radio) { + width: max-content; + max-width: none; +} + +:deep(.test-radio-group .test-radio-item) { + margin: 0 0 10px 0; +} + +:deep(.test-radio-group .el-radio__label) { + white-space: nowrap; +} diff --git a/frontend/src/views/machine/testScript/components/testScriptDipTab.vue b/frontend/src/views/machine/testScript/components/testScriptDipTab.vue index 697fdf2..be5818d 100644 --- a/frontend/src/views/machine/testScript/components/testScriptDipTab.vue +++ b/frontend/src/views/machine/testScript/components/testScriptDipTab.vue @@ -31,7 +31,7 @@ @@ -39,7 +39,7 @@ + + + + + + @@ -135,6 +153,20 @@ const validateFAfterTime = value => { emit('setFAfterTime', value ) } } +const validateFRampIn = value => { + if (value <= 0) { + ElMessage.warning('写入时间不能小于等于0S!') + props.childForm[0].dipData.frampIn = 0.001 + emit('setFRampIn', 0.001) + } +} +const validateFRampOut = value => { + if (value <= 0) { + ElMessage.warning('写出时间不能小于等于0S!') + props.childForm[0].dipData.frampOut = 0.001 + emit('setFRampOut', 0.001) + } +}