From e26b8c68eb7e9faec4aaef5587919ecda05e842a Mon Sep 17 00:00:00 2001
From: "@changcode" <changyongqiang@geedgenetworks.com>
Date: Mon, 7 Jun 2021 18:28:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=BB=9F=E4=B8=80=E6=89=80=E6=9C=89=20d?=
 =?UTF-8?q?escription=20=E4=B8=AD=E6=96=87=E5=9B=BD=E9=99=85=E5=8C=96?=
 =?UTF-8?q?=E4=B8=BA=20=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/charts/chart-alert-list.vue      | 4 ++--
 .../src/components/common/bottomBox/tabs/alertMessageTab.vue  | 4 ++--
 .../components/common/bottomBox/tabs/alertMessageTabNew.vue   | 2 +-
 .../src/components/common/bottomBox/tabs/cabinetTab.vue       | 2 +-
 nezha-fronted/src/components/common/language/cn.js            | 1 +
 nezha-fronted/src/components/common/language/en.js            | 1 +
 .../src/components/common/rightBox/administration/roleBox.vue | 2 +-
 nezha-fronted/src/components/common/rightBox/alertRuleBox.vue | 2 +-
 .../src/components/common/rightBox/alertSilenceBox.vue        | 4 ++--
 nezha-fronted/src/components/common/rightBox/exprTmplBox.vue  | 2 +-
 nezha-fronted/src/components/common/rightBox/mibBox.vue       | 2 +-
 nezha-fronted/src/components/common/rightBox/moduleBox.vue    | 2 +-
 nezha-fronted/src/components/common/rightBox/projectBox.vue   | 2 +-
 .../src/components/common/table/alert/alertMessageTable.vue   | 2 +-
 .../src/components/common/table/alert/alertRuleTable.vue      | 2 +-
 .../src/components/common/table/settings/mibTable.vue         | 2 +-
 .../src/components/common/table/settings/roleTable.vue        | 2 +-
 nezha-fronted/src/components/page/alert/alertMessage.vue      | 2 +-
 18 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/nezha-fronted/src/components/charts/chart-alert-list.vue b/nezha-fronted/src/components/charts/chart-alert-list.vue
index e0baab2cb..86999eb8b 100644
--- a/nezha-fronted/src/components/charts/chart-alert-list.vue
+++ b/nezha-fronted/src/components/charts/chart-alert-list.vue
@@ -104,7 +104,7 @@
         <div class="export-xlsx">
           <el-dialog :visible.sync="deleteBox.show" :title="$t('overall.delete')" :modal-append-to-body='false' :show-close="true" width="300px" @close="closeDialog" class="nz-message">
             <div class="upload-body">
-              <el-input type="textarea" :placeholder="$t('alert.description')" v-model="deleteBox.remark"></el-input>
+              <el-input type="textarea" :placeholder="$t('overall.remark')" v-model="deleteBox.remark"></el-input>
               <div style="text-align: right; margin-top: 10px;">
                 <button @click="closeDialog" class="el-button el-button--default el-button--small" >
                   <span>{{$t('tip.no')}}</span>
@@ -259,7 +259,7 @@ export default {
           prop: 'summary',
           show: true
         }, {
-          label: this.$t('alert.description'),
+          label: this.$t('overall.remark'),
           prop: 'description',
           show: true
         }, {
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue
index 8fe9dbaf2..08312790d 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue
@@ -61,7 +61,7 @@
     <div class="export-xlsx">
       <el-dialog :visible.sync="deleteBox.show" :title="$t('overall.delete')" :modal-append-to-body='false' :show-close="true" width="300px" @close="deleteBox.show = false" class="nz-message">
         <div class="upload-body">
-          <el-input type="textarea" :placeholder="$t('alert.description')" v-model="deleteBox.remark"></el-input>
+          <el-input type="textarea" :placeholder="$t('overall.remark')" v-model="deleteBox.remark"></el-input>
           <div style="text-align: right; margin-top: 10px;">
             <button @click="deleteBox.show = false" class="el-button el-button--default el-button--small">
               <span>{{$t('tip.no')}}</span>
@@ -161,7 +161,7 @@ export default {
           prop: 'summary',
           show: true
         }, {
-          label: this.$t('alert.description'),
+          label: this.$t('overall.remark'),
           prop: 'description',
           show: true
         }, {
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
index f3571383e..c2a263a49 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
@@ -126,7 +126,7 @@ export default {
             label: 'summary',
             disabled: false
           }, {
-            name: 'Labels',
+            name: this.$t('alert.list.labels'),
             type: 'input',
             label: 'labels',
             disabled: false
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue
index 4815afe8f..2beea6211 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue
@@ -88,7 +88,7 @@ export default {
           },
           {
             id: 13,
-            name: this.$t('config.dc.description'),
+            name: this.$t('overall.remark'),
             label: 'description',
             disabled: false
           }
diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js
index acca604a0..00a19ea9c 100644
--- a/nezha-fronted/src/components/common/language/cn.js
+++ b/nezha-fronted/src/components/common/language/cn.js
@@ -815,6 +815,7 @@ const cn = {
       dc: '数据中心',
       area: '地区',
       dcName: '数据中心名称',
+      description: '描述',
       selectArea: '选择地区',
       cabinetNum: '机柜数量',
       assets: '资产',
diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js
index e44b4d342..66127d974 100644
--- a/nezha-fronted/src/components/common/language/en.js
+++ b/nezha-fronted/src/components/common/language/en.js
@@ -747,6 +747,7 @@ const en = {
       area: 'Area',
       dcName: 'Data center name',
       selectArea: 'Select area',
+      description: 'Description',
       cabinetNum: 'Cabinet',
       assets: 'Asset',
       remark: 'Description',
diff --git a/nezha-fronted/src/components/common/rightBox/administration/roleBox.vue b/nezha-fronted/src/components/common/rightBox/administration/roleBox.vue
index e13f47bfa..a73036f45 100644
--- a/nezha-fronted/src/components/common/rightBox/administration/roleBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/administration/roleBox.vue
@@ -14,7 +14,7 @@
             <el-input  maxlength="64" placeholder="" id="role-box-input-name"
                        show-word-limit size="small" type="text" v-model="editRole.name"></el-input>
           </el-form-item>
-          <el-form-item :label="$t('config.roles.description')">
+          <el-form-item :label="$t('overall.remark')">
             <el-input maxlength="256" show-word-limit :rows="2" size='mini' type="textarea" v-model="editRole.remark" id="role-box-input-remark"/>
           </el-form-item>
 
diff --git a/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue b/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue
index 53aa2590b..ff57fddeb 100644
--- a/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue
@@ -100,7 +100,7 @@
             <el-input id="alert-box-input-summary" v-model="editAlertRule.summary" maxlength="512" placeholder="" rows="3" show-word-limit size="small" type="textarea"></el-input>
           </el-form-item>
           <!--description-->
-          <el-form-item :label="$t('alert.description')" prop="description">
+          <el-form-item :label="$t('overall.remark')" prop="description">
             <el-input id="alert-box-input-description" v-model="editAlertRule.description" maxlength="256" placeholder="" rows="4" show-word-limit size="small" type="textarea"></el-input>
           </el-form-item>
         </el-form>
diff --git a/nezha-fronted/src/components/common/rightBox/alertSilenceBox.vue b/nezha-fronted/src/components/common/rightBox/alertSilenceBox.vue
index 49106bd3e..0c5c5108f 100644
--- a/nezha-fronted/src/components/common/rightBox/alertSilenceBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/alertSilenceBox.vue
@@ -88,10 +88,10 @@
           </div>
         </el-form-item>
 
-        <el-form-item :label='$t("alert.silence.remark")' prop="remark" class="range-time">
+        <el-form-item :label='$t("overall.remark")' prop="remark" class="range-time">
           <el-input
             type="textarea"
-            :placeholder="$t('alert.description')"
+            :placeholder="$t('overall.remark')"
             v-model="editAlertSilence.remark"
             maxlength="256"
             show-word-limit>
diff --git a/nezha-fronted/src/components/common/rightBox/exprTmplBox.vue b/nezha-fronted/src/components/common/rightBox/exprTmplBox.vue
index 9d1cb6134..1b5094a4a 100644
--- a/nezha-fronted/src/components/common/rightBox/exprTmplBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/exprTmplBox.vue
@@ -45,7 +45,7 @@
           <el-form-item :label="$t('config.exprTemp.remark')" prop="remark">
             <el-input
               v-model="editExprTemp.remark"
-              :placeholder="$t('alert.description')"
+              :placeholder="$t('overall.remark')"
               maxlength="256"
               show-word-limit
               size="small"
diff --git a/nezha-fronted/src/components/common/rightBox/mibBox.vue b/nezha-fronted/src/components/common/rightBox/mibBox.vue
index 63a4e0887..ad7396f32 100644
--- a/nezha-fronted/src/components/common/rightBox/mibBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/mibBox.vue
@@ -24,7 +24,7 @@
               popper-class="prevent-clickoutside limit-height"
               clearable></el-cascader>
           </el-form-item>
-          <el-form-item :label="$t('config.mib.description')" prop="remark">
+          <el-form-item :label="$t('overall.remark')" prop="remark">
             <el-input maxlength="256" rows="4" show-word-limit type="textarea" placeholder="" v-model="editMib.remark" size="small" id="mib-box-input-remark"></el-input>
           </el-form-item>
           <el-form-item :label="$t('config.mib.mibFiles')" prop="file" :rules="[{validator:checkMibFile,trigger:'change'}]" :class="{'add-required':!editMib.id}">
diff --git a/nezha-fronted/src/components/common/rightBox/moduleBox.vue b/nezha-fronted/src/components/common/rightBox/moduleBox.vue
index 0d6db7cec..2f7486746 100644
--- a/nezha-fronted/src/components/common/rightBox/moduleBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/moduleBox.vue
@@ -24,7 +24,7 @@
             </el-select>
           </el-form-item>
           <!--remark-->
-          <el-form-item :label='$t("project.module.description")' prop="remark">
+          <el-form-item :label='$t("overall.remark")' prop="remark">
             <el-input
               id="module-box-input-remark"
               v-model="editModule.remark"
diff --git a/nezha-fronted/src/components/common/rightBox/projectBox.vue b/nezha-fronted/src/components/common/rightBox/projectBox.vue
index c52956a04..724d80df5 100644
--- a/nezha-fronted/src/components/common/rightBox/projectBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/projectBox.vue
@@ -15,7 +15,7 @@
           <el-form-item :label='$t("project.project.project")' prop="name">
             <el-input id="project-box-input-name" v-model="editProject.name" maxlength="64" show-word-limit size="small"></el-input>
           </el-form-item>
-          <el-form-item :label='$t("project.project.description")'>
+          <el-form-item :label='$t("overall.remark")'>
             <el-input id="project-box-input-remark" v-model="editProject.remark" maxlength="256" show-word-limit size="small" type="textarea"></el-input>
           </el-form-item>
         </el-form>
diff --git a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
index b7fc34ff2..f44e0162b 100644
--- a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
+++ b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
@@ -198,7 +198,7 @@ export default {
           show: true,
           minWidth: 200
         }, {
-          label: this.$t('alert.description'),
+          label: this.$t('overall.remark'),
           prop: 'description',
           show: true,
           minWidth: 200
diff --git a/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue b/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue
index 750c67540..2da49e4d1 100644
--- a/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue
+++ b/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue
@@ -127,7 +127,7 @@ export default {
           prop: 'summary',
           show: true
         }, {
-          label: this.$t('alert.description'),
+          label: this.$t('overall.remark'),
           prop: 'description',
           show: true
         }, {
diff --git a/nezha-fronted/src/components/common/table/settings/mibTable.vue b/nezha-fronted/src/components/common/table/settings/mibTable.vue
index 9bc69c340..48a06c76b 100644
--- a/nezha-fronted/src/components/common/table/settings/mibTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/mibTable.vue
@@ -121,7 +121,7 @@ export default {
           prop: 'modelsDetail',
           show: true
         }, {
-          label: this.$t('config.mib.description'),
+          label: this.$t('overall.remark'),
           prop: 'remark',
           show: true
         }, {
diff --git a/nezha-fronted/src/components/common/table/settings/roleTable.vue b/nezha-fronted/src/components/common/table/settings/roleTable.vue
index 0de500dc8..ea3c87715 100644
--- a/nezha-fronted/src/components/common/table/settings/roleTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/roleTable.vue
@@ -88,7 +88,7 @@ export default {
           show: true,
           sortable:'custom'
         }, {
-          label: this.$t('config.roles.description'),
+          label: this.$t('overall.remark'),
           prop: 'remark',
           show: true
         }
diff --git a/nezha-fronted/src/components/page/alert/alertMessage.vue b/nezha-fronted/src/components/page/alert/alertMessage.vue
index c6f3e7aaf..2ed4f1a56 100644
--- a/nezha-fronted/src/components/page/alert/alertMessage.vue
+++ b/nezha-fronted/src/components/page/alert/alertMessage.vue
@@ -66,7 +66,7 @@
         <div class="upload-body">
           <el-form ref="remarkForm" :model="deleteBox">
             <el-form-item :rules="[{required:true,message: $t('validate.required'), trigger: 'change'}]" prop="remark">
-              <el-input v-model="deleteBox.remark" :placeholder="$t('alert.description')" type="textarea"></el-input>
+              <el-input v-model="deleteBox.remark" :placeholder="$t('overall.remark')" type="textarea"></el-input>
             </el-form-item>
           </el-form>
           <div style="text-align: right; margin-top: 10px;">