Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client
This commit is contained in:
@@ -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}`
|
//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, {
|
Object.assign(formContent, {
|
||||||
...resFormContent,
|
...resFormContent,
|
||||||
dataRule: dataRuleName,
|
|
||||||
chnNum: chnList.length > 0 ? chnList[0].value : '',
|
chnNum: chnList.length > 0 ? chnList[0].value : '',
|
||||||
})
|
})
|
||||||
originErrorSysId = formContent.errorSysId
|
originErrorSysId = formContent.errorSysId
|
||||||
|
|||||||
Reference in New Issue
Block a user