From 9f932b5c4c1cb5105997b439308886f6cd7cf2b1 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Mon, 27 Jun 2022 17:35:24 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-1984=20fix=EF=BC=9A=20=E9=99=90=E5=88=B6=20?=
 =?UTF-8?q?alertRule=20Evaluation=20interval=20=E4=B8=BA=20=2015=20s=20-?=
 =?UTF-8?q?=2024h?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/bottomBox/tabs/IpDetails.vue        | 2 +-
 nezha-fronted/src/components/common/rightBox/alertRuleBox.vue | 4 +++-
 .../components/common/rightBox/setting/globalizationBox.vue   | 2 +-
 nezha-fronted/src/components/page/config/globalization.vue    | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/IpDetails.vue b/nezha-fronted/src/components/common/bottomBox/tabs/IpDetails.vue
index cb9a78dff..894fc4368 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/IpDetails.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/IpDetails.vue
@@ -15,7 +15,7 @@
     >
       <template v-slot:title><span :title="obj.name">{{obj.name}}</span></template>
       <template v-slot:top-tool-right>
-        <button id="account-add" v-has="'ipam_add'" :title="$t('overall.createipam')" class="top-tool-btn margin-r-10"
+        <button id="account-add" v-has="'ipam_add'" :title="$t('overall.createipamDetail')" class="top-tool-btn margin-r-10"
                 type="button" @click="add">
           <i class="nz-icon-create-square nz-icon"></i>
         </button>
diff --git a/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue b/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue
index 4d901525f..49e512c69 100644
--- a/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue
@@ -112,7 +112,7 @@
           </el-form-item>
           <!--inr-->
           <el-form-item v-if="showSnmpTrap" :label="$t('alert.config.inr')" prop="inr"  class="half-form-item">
-            <el-input-number id="alert-box-input-inr" :controls="false" v-model="editAlertRule.inr" :placeholder="$t('alert.config.inrPlaceholder')" size="small" type="text" :disabled="!showSnmpTrap"></el-input-number>
+            <el-input-number :min="15" :max="86400" id="alert-box-input-inr" :controls="false" v-model="editAlertRule.inr" :placeholder="$t('alert.config.inrPlaceholder')" size="small" type="text" :disabled="!showSnmpTrap"></el-input-number>
           </el-form-item>
           <!--last-->
           <el-form-item v-if="showSnmpTrap" :label="$t('alert.config.for')" prop="last"  class="half-form-item alert-box-duration" :rules=" [
@@ -378,6 +378,8 @@ export default {
       }
       if (value < 15) {
         callback(new Error(this.$t('alert.config.inrError')))
+      } else if (value > 86400) {
+        callback(new Error(this.$t('alert.config.inrErrorMax')))
       } else {
         callback()
       }
diff --git a/nezha-fronted/src/components/common/rightBox/setting/globalizationBox.vue b/nezha-fronted/src/components/common/rightBox/setting/globalizationBox.vue
index 07c3063b2..bc6d853e1 100644
--- a/nezha-fronted/src/components/common/rightBox/setting/globalizationBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/setting/globalizationBox.vue
@@ -29,7 +29,7 @@
               </template>
             </el-select>
           </el-form-item>
-          <el-form-item :label='$t("overall.labels")' prop="value">
+          <el-form-item :label='$t("overall.value")' prop="value">
             <el-input placeholder="" maxlength="128" show-word-limit v-model="editGlobalization.value" size="small" id="dc-box-input-value"></el-input>
           </el-form-item>
 <!--          <el-form-item :label='$t("i18n.remark")' prop="remark">-->
diff --git a/nezha-fronted/src/components/page/config/globalization.vue b/nezha-fronted/src/components/page/config/globalization.vue
index 916104ed1..2ab9cee9c 100644
--- a/nezha-fronted/src/components/page/config/globalization.vue
+++ b/nezha-fronted/src/components/page/config/globalization.vue
@@ -11,7 +11,7 @@
       @getTableData="getTableData"
     >
       <template v-slot:top-tool-right>
-        <button id="dc-add" v-has="'dc_add'" :title="$t('overall.createDatacenter')" class="top-tool-btn margin-r-10"
+        <button id="dc-add" v-has="'dc_add'" class="top-tool-btn margin-r-10"
                 type="button" @click="add">
           <i class="nz-icon-create-square nz-icon"></i>
         </button>