Merge remote-tracking branch 'origin/dev' into dev

src/components/layout/Header.vue

@@ -791,10 +791,10 @@ export default {
         })
         return
       }
-      /* if (route === this.route) {
+      if (route === this.route) {
         this.refresh()
         return
-      } */
+      }
       if (route) {
         this.$router.push({
           path: route,

src/components/table/detection/GeneralSettings.vue

@@ -59,7 +59,7 @@
           <el-option
               v-for="item in eventTypeList"
               :key="item.value"
-              :label="$t(item.label)"
+              :label="item.label"
               :value="item.value"
           />
         </el-select>

src/components/table/setting/knowledgeBaseTableForCard.vue

@@ -750,7 +750,6 @@ export default {
     },
     tableData: {
       handler (n) {
-        console.info(n)
         if (this.tableData && this.tableData.length > 0) {
           this.aiTaggingList = []
           this.websketchList = []

src/utils/date-util.js

@@ -121,8 +121,6 @@ export function xAxisTimeFormatter (value) {
     ':' +
     (date.getMinutes() < 10 ? `0${date.getMinutes()}` : date.getMinutes())
   // 如果是一天的开始
-  console.info(date.getTime(), dayStart.getTime(), hourStart.getTime(), date.getTime() === dayStart.getTime(), date.getTime() === hourStart.getTime())
-  console.info(getSecond(date.getTime()), getSecond(dayStart.getTime()), getSecond(hourStart.getTime()))
   if (getSecond(date.getTime()) === getSecond(dayStart.getTime())) {
     return '{day|' + dateFormat(date, 'YYYY-MM-DD') + '}'
   } else if (getSecond(date.getTime()) === getSecond(hourStart.getTime())) {

src/views/detections/detectionPolicies/PolicyFilter.vue

@@ -31,7 +31,7 @@
         <div class="new-filter-content-content">
           <el-checkbox-group v-model="checkEventType" @change="onChangeCategory" style="display: flex;flex-direction: column">
             <el-checkbox v-for="item in eventTypeList" :key="item.name" class="new-filter-content-checkbox" :label="item.name">
-              {{ item.label }}
+              {{ item.name }}
             </el-checkbox>
           </el-checkbox-group>
         </div>
@@ -94,13 +94,7 @@ export default {
           }
 
           if (data.eventTypeList) {
-            this.eventTypeList = []
-            data.eventTypeList.forEach(item => {
-              const obj = detectionUnitList.eventTypeList.find(d => d.value === item.name)
-              if (obj) {
-                this.eventTypeList.push({ ...item, label: this.$t(obj.label) })
-              }
-            })
+            this.eventTypeList = data.eventTypeList
           } else {
             this.eventTypeList = []
           }

src/views/detections/detectionPolicies/PolicyForm.vue

@@ -169,24 +169,34 @@ export default {
       const obj = this.handleIntervalByDateType(rule, value, this.triggerObj.intervalVal)
       if (!obj.flag && obj.msg) {
         callback(new Error(obj.msg))
+      } else {
+        callback()
       }
     }
-    const intervalValValidator = (rule, value) => {
+    const intervalValValidator = (rule, value, callback) => {
       const obj = this.handleIntervalByDateType(rule, this.triggerObj.intervalVal, value)
       if (!obj.flag && obj.msg) {
         this.$refs.form3.validateField('interval')
+        callback()
+      } else {
+        callback()
       }
     }
     const resetIntervalValidator = (rule, value, callback) => {
       const obj = this.handleIntervalByDateType(rule, value, this.triggerObj.resetIntervalVal)
       if (!obj.flag && obj.msg) {
         callback(new Error(obj.msg))
+      } else {
+        callback()
       }
     }
-    const resetIntervalValValidator = (rule, value) => {
+    const resetIntervalValValidator = (rule, value, callback) => {
       const obj = this.handleIntervalByDateType(rule, this.triggerObj.resetIntervalVal, value)
       if (!obj.flag && obj.msg) {
         this.$refs.form3.validateField('resetInterval')
+        callback()
+      } else {
+        callback()
       }
     }
     return {
@@ -408,6 +418,7 @@ export default {
                 this.myLoading = false
               })
             } else {
+              console.log('进来')
               this.myLoading = true
               axios.put(api.detection.create.create, formObj).then(response => {
                 if (response.status === 200) {

src/views/detections/detectionPolicies/PolicyTable.vue

@@ -56,9 +56,6 @@
         <template v-else-if="item.prop === 'category'">
           {{ changeCategory(scope.row[item.prop]) }}
         </template>
-        <template v-else-if="item.prop === 'eventType'">
-          {{ changeEventType(scope.row[item.prop]) }}
-        </template>
         <template v-else-if="item.prop === 'description'">
           <div style="padding-right: 20px">{{ scope.row[item.prop] }}</div>
         </template>
@@ -181,16 +178,6 @@ export default {
         }
         return label
       }
-    },
-    changeEventType (value) {
-      if (value) {
-        const obj = detectionUnitList.eventTypeList.find(d => d.value === value)
-        let label = value
-        if (obj) {
-          label = this.$t(obj.label)
-        }
-        return label
-      }
     }
   }
 }