检测计划新增数据处理原则字段、全局配置中移除数据处理原则字段

This commit is contained in:
caozehui
2025-05-14 08:58:21 +08:00
parent f8b7c224b7
commit 2a53f577aa
5 changed files with 56 additions and 25 deletions

View File

@@ -47,6 +47,16 @@
:value="option.value"
/>
</el-select>
</el-form-item>
<el-form-item label="数据处理原则" prop="dataRule" :label-width="110">
<el-select v-model="formContent.dataRule" placeholder="请选择数据处理原则" autocomplete="off" :disabled="isSelectDisabled" clearable>
<el-option
v-for="item in dictStore.getDictData('Data_Rule')"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item label="守时检测" :label-width="100" prop='timeCheck'>
<el-radio-group v-model="formContent.timeCheck">
@@ -181,6 +191,7 @@ const filterMethod = (query: string, item: { label?: string }) => {
associateReport:0,
reportTemplateName:'',
reportTemplateVersion:'',
dataRule:'',
})
return { dialogVisible, titleType, formContent }
}
@@ -214,6 +225,7 @@ const filterMethod = (query: string, item: { label?: string }) => {
associateReport:0,
reportTemplateName:'',
reportTemplateVersion:'',
dataRule:'',
}
)
@@ -233,6 +245,7 @@ const baseRules: Record<string, Array<FormItemRule>> = {
datasourceIds: [{ required: true, message: '数据源必选!', trigger: 'change' }],
scriptId: [{ required: true, message: '检测脚本必选!', trigger: 'change' }],
errorSysId: [{ required: true, message: '误差体系必选!', trigger: 'change' }],
dataRule: [{ required: true, message: '数据处理原则必选!', trigger: 'change' }],
};
// 使用计算属性根据 scene 动态生成规则
@@ -278,12 +291,19 @@ const rules = computed(() => {
if (formContent.id) {
// 把数据处理原则转成字典ID
const patternItem = dictStore.getDictData('Data_Rule').find(item => item.name === formContent.dataRule);
if (patternItem) {
formContent.dataRule = patternItem.id;
}
if( mode.value === '比对式'){
await updatePlan(formContent)
}else{
await updatePlan({...formContent,'sourceIds':[formContent.sourceIds],'datasourceIds':[formContent.datasourceIds]});
}
ElMessage.success({ message: `${dialogTitle.value}成功!` })
} else {
@@ -292,6 +312,11 @@ const rules = computed(() => {
if (patternItem) {
formContent.pattern = patternItem.id;
}
// 把数据处理原则转成字典ID
const patternItem2 = dictStore.getDictData('Data_Rule').find(item => item.name === formContent.dataRule);
if (patternItem2) {
formContent.dataRule = patternItem2.id;
}
if( mode.value === '比对式'){
await addPlan(formContent);
}else{