fix: 修复检测规则新增时参数不符要求导致新增失败,以及编辑时修改状态不生效的问题

This commit is contained in:
刘洪洪
2023-10-20 14:56:56 +08:00
parent 9208a4fff2
commit 48b3e2aebd
3 changed files with 6 additions and 5 deletions

View File

@@ -177,12 +177,12 @@
<!--Library--> <!--Library-->
<el-form-item :label="$t('detection.library')" prop="knowledgeId" class="form-setting__block margin-b-20"> <el-form-item :label="$t('detection.library')" prop="knowledgeId" class="form-setting__block margin-b-20">
<el-select v-model="indicatorRuleObj.name" class="form-setting__select" placeholder=" " size="mini"> <el-select v-model="indicatorRuleObj.knowledgeId" class="form-setting__select" placeholder=" " size="mini">
<el-option <el-option
v-for="item in libraryList" v-for="item in libraryList"
:key="item.name" :key="item.knowledgeId"
:label="item.name" :label="item.name"
:value="item.name" :value="item.knowledgeId"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>

View File

@@ -88,7 +88,7 @@
<div class="form-setting__btn1"> <div class="form-setting__btn1">
<div class="btn1"> <div class="btn1">
<el-button @click="createPolicy">{{ $t('overall.create') }}</el-button> <el-button @click="createPolicy('')">{{ $t('overall.create') }}</el-button>
</div> </div>
<el-button @click="createPolicy('enabled')">{{ $t('overall.create') }} & {{ $t('detection.create.enablePolicy') }}</el-button> <el-button @click="createPolicy('enabled')">{{ $t('overall.create') }} & {{ $t('detection.create.enablePolicy') }}</el-button>
</div> </div>
@@ -256,6 +256,7 @@ export default {
// 将时间转为参数所需如5分钟转为PT5 // 将时间转为参数所需如5分钟转为PT5
formObj.ruleTrigger.resetInterval = getDurationsTimeByType(formObj.ruleTrigger.resetInterval, formObj.ruleTrigger.intervalVal) formObj.ruleTrigger.resetInterval = getDurationsTimeByType(formObj.ruleTrigger.resetInterval, formObj.ruleTrigger.intervalVal)
formObj.ruleTrigger.interval = getDurationsTimeByType(formObj.ruleTrigger.interval, formObj.ruleTrigger.intervalVal) formObj.ruleTrigger.interval = getDurationsTimeByType(formObj.ruleTrigger.interval, formObj.ruleTrigger.intervalVal)
formObj.ruleTrigger.atLeast = parseInt(formObj.ruleTrigger.atLeast)
formObj.ruleTrigger = JSON.stringify(formObj.ruleTrigger) formObj.ruleTrigger = JSON.stringify(formObj.ruleTrigger)
// 删除多余参数 // 删除多余参数
delete formObj.ruleConfigObj delete formObj.ruleConfigObj

View File

@@ -154,7 +154,7 @@ export default {
if (t.ruleType === 'indicator_match') { if (t.ruleType === 'indicator_match') {
t.library = _.get(t, 'ruleConfigObj.knowledgeBase.name', '-') t.library = _.get(t, 'ruleConfigObj.knowledgeBase.name', '-')
} else if (t.ruleType === 'threshold') { } else if (t.ruleType === 'threshold') {
t.dimensions = t.ruleConfigObj.dimensions t.dimensions = _.get(t, 'ruleConfigObj.dimensions', '-')
} }
}) })
} }