diff --git a/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue b/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue index 5919af3..a562d8f 100644 --- a/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue +++ b/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue @@ -426,11 +426,8 @@ const open = async (_deviceId: string, chnNum: string, _scriptType: string | nul //label: item.label == '1' ? `${item.value}` : item.label == '2' ? `${item.value}(不符合)` : `${item.value}` })) - let dataRuleName = dictStore.getDictData('Data_Rule').find(item => item.id == resFormContent.dataRule)?.name - Object.assign(formContent, { ...resFormContent, - dataRule: dataRuleName, chnNum: chnList.length > 0 ? chnList[0].value : '', }) originErrorSysId = formContent.errorSysId diff --git a/frontend/src/views/machine/testScript/components/testScriptDetail.vue b/frontend/src/views/machine/testScript/components/testScriptDetail.vue index 769db75..2116d8c 100644 --- a/frontend/src/views/machine/testScript/components/testScriptDetail.vue +++ b/frontend/src/views/machine/testScript/components/testScriptDetail.vue @@ -23,8 +23,8 @@ inline-prompt :active-value="1" :inactive-value="0" - active-text="启用" - inactive-text="禁用" + active-text="禁用" + inactive-text="启用" @change="enableScript" size="large" width="80px"