fix：alertRuleBox 调整

nezha-fronted/src/components/common/language/cn.js

@@ -1287,8 +1287,10 @@ const cn = {
         alertNumTrend: '告警数量趋势',
         affectEntity: '影响'
       },
-      timeout: 'Timeout',
+      timeout: 'Timeout(s)',
       inr: 'Evaluation interval',
+      inrPlaceholder: 'Default global scrape interval',
+      inrError: 'Evaluation Interval cannot be less than 15',
       autoExpired: 'Automatic expired',
       state: '状态',
       schedEnable: 'Schedule',

nezha-fronted/src/components/common/language/en.js

@@ -1290,8 +1290,10 @@ const en = {
         alertNumTrend: 'Alert num trend',
         affectEntity: 'Affect entity'
       },
-      timeout: 'Timeout',
+      timeout: 'Timeout(s)',
       inr: 'Evaluation interval ',
+      inrPlaceholder: 'Default global scrape interval',
+      inrError: 'Evaluation Interval cannot be less than 15',
       autoExpired: 'Automatic expired',
       state: 'State',
       schedEnable: 'Schedule',

nezha-fronted/src/components/common/rightBox/alertRuleBox.vue

@@ -40,7 +40,7 @@
               <el-option v-for="item in severityData" :id="'alert-severity-'+item.value" :key="item.id" :label="item.name" :value="item.id" style="width: 312px">
                 <div style="display: flex;justify-content: space-between;padding: 5px;">
                   <div><i :style="{color:item.color,'font-size':'12px'}" class="nz-icon nz-icon-circle"></i> {{item.name}}</div>
-                  <div class="severity-item">{{item.remark}}</div>
+                  <div class="severity-item text-ellipsis" :title="item.remark">{{item.remark}}</div>
                 </div>
               </el-option>
             </el-select>
@@ -110,11 +110,14 @@
           </el-form-item>
           <!--inr-->
           <el-form-item :label="$t('alert.config.inr')" prop="inr"  class="half-form-item">
-            <el-input id="alert-box-input-inr" v-model.number="editAlertRule.inr" placeholder="" size="small" type="text" :disabled="!showSnmpTrap"></el-input>
+            <el-input id="alert-box-input-inr" v-model.number="editAlertRule.inr" :placeholder="$t('alert.config.inrPlaceholder')" size="small" type="text" :disabled="!showSnmpTrap"></el-input>
           </el-form-item>
           <!--last-->
-          <el-form-item :label="$t('alert.config.for')" prop="last"  class="half-form-item">
-            <el-input id="alert-box-input-last" v-model.number="editAlertRule.last" placeholder="" size="small" type="text">
+          <el-form-item :label="$t('alert.config.for')" prop="last"  class="half-form-item" :rules=" [
+          { required: !showSnmpTrap, message: this.$t('validate.required'), trigger: 'blur' },
+          { type: 'number', message: this.$t('validate.number') }
+        ]">
+            <el-input id="alert-box-input-last" v-model.number="editAlertRule.last" placeholder="" size="small" :disabled="!showSnmpTrap" type="text">
               <template slot="append">{{$t('alert.config.second')}}</template>
             </el-input>
           </el-form-item>
@@ -143,6 +146,7 @@
           <!--timeout-->
           <el-form-item :label="$t('alert.config.timeout')" prop="timeout"  class="half-form-item">
             <el-input id="alert-box-input-timeout" v-model.number="editAlertRule.timeout" placeholder="" size="small" type="text"></el-input>
+            <template slot="append">{{$t('alert.config.second')}}</template>
           </el-form-item>
           <!--summary-->
           <el-form-item :label="$t('alert.summary')" prop="summary">
@@ -371,6 +375,13 @@ export default {
         callback()
       }
     }
+    const nzInr = (rule, value, callback) => {
+      if (value < 15) {
+        callback(new Error(this.$t('alert.config.inrError')))
+      } else {
+        callback()
+      }
+    }
     return {
       promqlCount: 1,
       promqlKeys: [0],
@@ -402,10 +413,6 @@ export default {
           { required: true, message: this.$t('validate.required'), trigger: 'change' },
           { validator: nzOid, trigger: 'blur' }
         ],
-        last: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' },
-          { type: 'number', message: this.$t('validate.number') }
-        ],
         severityId: [
           { required: true, message: this.$t('validate.required'), trigger: 'change' }
         ],
@@ -414,6 +421,9 @@ export default {
         ],
         operator: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        inr: [
+          { validator: nzInr, trigger: 'blur' }
         ]
       },
       operators: [
@@ -704,5 +714,12 @@ export default {
   .severity-item{
     color: #999999;
     font-size: 12px;
+    max-width: 120px;
+    overflow: hidden;
+  }
+  .text-ellipsis{
+    overflow:hidden;
+    text-overflow:ellipsis;
+    white-space:nowrap
   }
 </style>

nezha-fronted/src/components/page/alert/alertMessage.vue

@@ -92,7 +92,7 @@
       <div slot="title">
         {{$t("project.endpoint.dialogTitle")}}
         <div class="float-right panel-calendar dialog-tool" style="display: flex">
-          <pick-time v-model="searchTimeDialog" :refresh-data-func="queryDate" :use-chart-unit="false" :use-refresh="false" style="height: 28px;" @unitChange="chartUnitChange"></pick-time>
+          <pick-time v-model="searchTimeDialog" :refresh-data-func="queryDate" :use-chart-unit="false" :use-refresh="false" style="height: 28px;"></pick-time>
         </div>
       </div>
       <div style="width: 100%;height: 100%" v-loading="chartLoading">
@@ -492,7 +492,6 @@ export default {
       const end = this.searchTimeDialog[1] ? this.searchTimeDialog[1] : bus.computeTimezoneTime(new Date().getTime())
       this.expressions = [this.currentMsg.alertRule.expr]
       this.$get('/logs/loki/api/v1/query_range?format=1&query=' + this.currentMsg.alertRule.expr + '&start=' + this.$stringTimeParseToUnix(start) + '&end=' + this.$stringTimeParseToUnix(end) + '&limit=' + limit).then(res => {
-        console.log(res)
         this.chartLoading = false
         const logData = [res.data]
         this.resultType = res.data.resultType

nezha-fronted/src/components/page/alert/alertRule.vue

@@ -114,8 +114,9 @@ export default {
         schedDays: '',
         schedStime: '00:00',
         schedEtime: '23:59',
-        notifyActive: 1,
-        notifyExpired: 1,
+        notifyActive: 0,
+        notifyExpired: 0,
+        timeout: 300,
         trbShot: ''
       },
       blankSilenceObject: {