From 48b3e2aebdc12c69237f08f13351c15b194a3661 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B4=AA=E6=B4=AA?= <2498601771@qq.com>
Date: Fri, 20 Oct 2023 14:56:56 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=A3=80=E6=B5=8B?=
 =?UTF-8?q?=E8=A7=84=E5=88=99=E6=96=B0=E5=A2=9E=E6=97=B6=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E4=B8=8D=E7=AC=A6=E8=A6=81=E6=B1=82=E5=AF=BC=E8=87=B4=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=A4=B1=E8=B4=A5=EF=BC=8C=E4=BB=A5=E5=8F=8A=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E6=97=B6=E4=BF=AE=E6=94=B9=E7=8A=B6=E6=80=81=E4=B8=8D?=
 =?UTF-8?q?=E7=94=9F=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/table/detection/RuleDefinition.vue | 6 +++---
 src/views/detectionsNew/DetectionForm.vue         | 3 ++-
 src/views/detectionsNew/DetectionTable.vue        | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/components/table/detection/RuleDefinition.vue b/src/components/table/detection/RuleDefinition.vue
index 75bed92e..42c7b2ad 100644
--- a/src/components/table/detection/RuleDefinition.vue
+++ b/src/components/table/detection/RuleDefinition.vue
@@ -177,12 +177,12 @@
 
         <!--Library-->
         <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
                 v-for="item in libraryList"
-                :key="item.name"
+                :key="item.knowledgeId"
                 :label="item.name"
-                :value="item.name"
+                :value="item.knowledgeId"
             />
           </el-select>
         </el-form-item>
diff --git a/src/views/detectionsNew/DetectionForm.vue b/src/views/detectionsNew/DetectionForm.vue
index 6a1522a6..320a7e37 100644
--- a/src/views/detectionsNew/DetectionForm.vue
+++ b/src/views/detectionsNew/DetectionForm.vue
@@ -88,7 +88,7 @@
 
               <div class="form-setting__btn1">
                 <div class="btn1">
-                  <el-button @click="createPolicy">{{ $t('overall.create') }}</el-button>
+                  <el-button @click="createPolicy('')">{{ $t('overall.create') }}</el-button>
                 </div>
                 <el-button @click="createPolicy('enabled')">{{ $t('overall.create') }} & {{ $t('detection.create.enablePolicy') }}</el-button>
               </div>
@@ -256,6 +256,7 @@ export default {
             // 将时间转为参数所需，如5分钟转为PT5
             formObj.ruleTrigger.resetInterval = getDurationsTimeByType(formObj.ruleTrigger.resetInterval, 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)
             // 删除多余参数
             delete formObj.ruleConfigObj
diff --git a/src/views/detectionsNew/DetectionTable.vue b/src/views/detectionsNew/DetectionTable.vue
index c049835b..18de2be7 100644
--- a/src/views/detectionsNew/DetectionTable.vue
+++ b/src/views/detectionsNew/DetectionTable.vue
@@ -154,7 +154,7 @@ export default {
             if (t.ruleType === 'indicator_match') {
               t.library = _.get(t, 'ruleConfigObj.knowledgeBase.name', '-')
             } else if (t.ruleType === 'threshold') {
-              t.dimensions = t.ruleConfigObj.dimensions
+              t.dimensions = _.get(t, 'ruleConfigObj.dimensions', '-')
             }
           })
         }