ClientApps/pqs-9100_client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

暂态写入写出时间

Browse Source
This commit is contained in:
caozehui
2026-07-08 15:51:11 +08:00
parent 49ded8c568
commit 8f12d0e03e
3 changed files with 100 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
frontend/src/views/machine/testScript/components/scriptForm.ts
View File

@@ -39,7 +39,9 @@ let scriptForm: any = {
ftransValue: '', // 暂态幅值 ftransValue: '', // 暂态幅值
retainTime: '', // 暂态持续时间 retainTime: '', // 暂态持续时间
fpreTime:2.0, fpreTime:2.0,
fafterTime:3.0 fafterTime:3.0,
frampIn:0.001, //写入时间
frampOut:0.001 //写出时间
} //暂态 } //暂态
}, },
{ {
@@ -71,7 +73,9 @@ let scriptForm: any = {
ftransValue: '', // 暂态幅值 ftransValue: '', // 暂态幅值
retainTime: '', // 暂态持续时间 retainTime: '', // 暂态持续时间
fpreTime:2.0, fpreTime:2.0,
fafterTime:3.0 fafterTime:3.0,
frampIn:0.001, //写入时间
frampOut:0.001 //写出时间
} //暂态 } //暂态
}, },
{ {
@@ -103,7 +107,9 @@ let scriptForm: any = {
ftransValue: '', // 暂态幅值 ftransValue: '', // 暂态幅值
retainTime: '', // 暂态持续时间 retainTime: '', // 暂态持续时间
fpreTime:2.0, fpreTime:2.0,
fafterTime:3.0 fafterTime:3.0,
frampIn:0.001, //写入时间
frampOut:0.001 //写出时间
} //暂态 } //暂态
}, },
{ {
@@ -135,7 +141,9 @@ let scriptForm: any = {
ftransValue: '', // 暂态幅值 ftransValue: '', // 暂态幅值
retainTime: '', // 暂态持续时间 retainTime: '', // 暂态持续时间
fpreTime:2.0, fpreTime:2.0,
fafterTime:3.0 fafterTime:3.0,
frampIn:0.001, //写入时间
frampOut:0.001 //写出时间
} //暂态 } //暂态
}, },
{ {
@@ -167,7 +175,9 @@ let scriptForm: any = {
ftransValue: '', // 暂态幅值 ftransValue: '', // 暂态幅值
retainTime: '', // 暂态持续时间 retainTime: '', // 暂态持续时间
fpreTime:2.0, fpreTime:2.0,
fafterTime:3.0 fafterTime:3.0,
frampIn:0.001, //写入时间
frampOut:0.001 //写出时间
} //暂态 } //暂态
}, },
{ {
@@ -199,7 +209,9 @@ let scriptForm: any = {
ftransValue: '', // 暂态幅值 ftransValue: '', // 暂态幅值
retainTime: '', // 暂态持续时间 retainTime: '', // 暂态持续时间
fpreTime:2.0, fpreTime:2.0,
fafterTime:3.0 fafterTime:3.0,
frampIn:0.001, //写入时间
frampOut:0.001 //写出时间
} //暂态 } //暂态
} }
] ]

82
frontend/src/views/machine/testScript/components/testProjectPopup.vue
View File

@@ -8,14 +8,14 @@
<!-- 全局设置菜单内容 --> <!-- 全局设置菜单内容 -->
<div class="test-pane-scroll"> <div class="test-pane-scroll">
<el-radio-group v-model="form.subType" class="test-radio-group"> <el-radio-group v-model="form.subType" class="test-radio-group">
<el-radio <el-radio
v-for="item in tabChildren" v-for="item in tabChildren"
:key="item" :key="item"
:label="item.label" :label="item.label"
:value="item.code" :value="item.code"
border border
class="test-radio-item" class="test-radio-item"
/> />
<!-- <el-radio v-for="item in tabChildren" :value="item.value" border>{{ item.label }}</el-radio> --> <!-- <el-radio v-for="item in tabChildren" :value="item.value" border>{{ item.label }}</el-radio> -->
</el-radio-group> </el-radio-group>
</div> </div>
@@ -162,7 +162,7 @@
<TestScriptFlickerTab :childForm="childForm" /> <TestScriptFlickerTab :childForm="childForm" />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="暂态编辑" v-if="childForm[0].dipFlag || childForm[1].dipFlag"> <el-tab-pane label="暂态编辑" v-if="childForm[0].dipFlag || childForm[1].dipFlag">
<TestScriptDipTab :childForm="childForm" @setRetainTime="setRetainTime" @setFPreTime="setFPreTime" @setFAfterTime="setFAfterTime" /> <TestScriptDipTab :childForm="childForm" @setRetainTime="setRetainTime" @setFPreTime="setFPreTime" @setFAfterTime="setFAfterTime" @setFRampIn="setFRampIn" @setFRampOut="setFRampOut"/>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</div> </div>
@@ -314,6 +314,16 @@ const setFAfterTime = (val: any) => {
item.dipData.fafterTime = val 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 = () => { const save = () => {
@@ -745,37 +755,37 @@ defineExpose({ open })
flex: 0 0 auto; flex: 0 0 auto;
} }
.test-pane-scroll { .test-pane-scroll {
height: 295px; height: 295px;
display: flex; display: flex;
justify-content: flex-start; justify-content: flex-start;
align-items: flex-start; align-items: flex-start;
overflow-x: auto; overflow-x: auto;
overflow-y: auto; overflow-y: auto;
} }
.test-radio-group { .test-radio-group {
display: flex; display: flex;
align-items: flex-start; align-items: flex-start;
min-width: 100%; min-width: 100%;
flex-direction: column; flex-direction: column;
} }
.left-tabs { .left-tabs {
flex: 1 1 auto; flex: 1 1 auto;
min-width: 0; min-width: 0;
} }
:deep(.test-radio-group .el-radio) { :deep(.test-radio-group .el-radio) {
width: max-content; width: max-content;
max-width: none; max-width: none;
} }
:deep(.test-radio-group .test-radio-item) { :deep(.test-radio-group .test-radio-item) {
margin: 0 0 10px 0; margin: 0 0 10px 0;
} }
:deep(.test-radio-group .el-radio__label) { :deep(.test-radio-group .el-radio__label) {
white-space: nowrap; white-space: nowrap;
} }
</style> </style>

40
frontend/src/views/machine/testScript/components/testScriptDipTab.vue
View File

@@ -31,7 +31,7 @@
<el-input <el-input
type="number" type="number"
@input="handleInput" @input="handleInput"
v-model="form[0].dipData.ftransValue" v-model.number="form[0].dipData.ftransValue"
:disabled="!form[0].dipFlag" :disabled="!form[0].dipFlag"
onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)))" onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)))"
/> />
@@ -39,7 +39,7 @@
<el-form-item label="持续时间(周波)"> <el-form-item label="持续时间(周波)">
<el-input <el-input
type="number" type="number"
v-model="form[0].dipData.retainTime" v-model.number="form[0].dipData.retainTime"
@input="handleInputRetainTime" @input="handleInputRetainTime"
:disabled="!form[0].dipFlag" :disabled="!form[0].dipFlag"
onkeypress="return (/[\d.]/.test(String.fromCharCode(event.keyCode)))" onkeypress="return (/[\d.]/.test(String.fromCharCode(event.keyCode)))"
@@ -48,7 +48,7 @@
<el-form-item label="前延时间(S)"> <el-form-item label="前延时间(S)">
<el-input <el-input
type="number" type="number"
v-model="form[0].dipData.fpreTime" v-model.number="form[0].dipData.fpreTime"
@input="validateFPreTime" @input="validateFPreTime"
:disabled="!form[0].dipFlag" :disabled="!form[0].dipFlag"
onkeypress="return (/[\d.]/.test(String.fromCharCode(event.keyCode)))" onkeypress="return (/[\d.]/.test(String.fromCharCode(event.keyCode)))"
@@ -57,12 +57,30 @@
<el-form-item label="后延时间(S)"> <el-form-item label="后延时间(S)">
<el-input <el-input
type="number" type="number"
v-model="form[0].dipData.fafterTime" v-model.number="form[0].dipData.fafterTime"
@input="validateFAfterTime" @input="validateFAfterTime"
:disabled="!form[0].dipFlag" :disabled="!form[0].dipFlag"
onkeypress="return (/[\d.]/.test(String.fromCharCode(event.keyCode)))" onkeypress="return (/[\d.]/.test(String.fromCharCode(event.keyCode)))"
/> />
</el-form-item> </el-form-item>
<el-form-item label="写入时间(S)">
<el-input
type="number"
v-model.number="form[0].dipData.frampIn"
@input="validateFRampIn"
:disabled="!form[0].dipFlag"
onkeypress="return (/[\d.]/.test(String.fromCharCode(event.keyCode)))"
/>
</el-form-item>
<el-form-item label="写出时间(S)">
<el-input
type="number"
v-model.number="form[0].dipData.frampOut"
@input="validateFRampOut"
:disabled="!form[0].dipFlag"
onkeypress="return (/[\d.]/.test(String.fromCharCode(event.keyCode)))"
/>
</el-form-item>
</el-form> </el-form>
</div> </div>
</div> </div>
@@ -135,6 +153,20 @@ const validateFAfterTime = value => {
emit('setFAfterTime', 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)
}
}
</script> </script>