From 61c085aadb9fd75a85e764f36015e425c915ba0a Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Fri, 30 Oct 2020 14:09:11 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9AalertMessage=20=E6=B7=BB=E5=8A=A0r?=
 =?UTF-8?q?emark=E5=88=97=20=E4=BB=A5=E5=8F=8A=E6=90=9C=E7=B4=A2=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=A0=B9=E6=8D=AEid=E6=90=9C=E7=B4=A2=E7=9A=84?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/common/alert/alertMessageTable.vue  | 14 +++++++++++---
 .../common/bottomBox/tabs/alertMessageTab.vue      |  9 ++++++++-
 nezha-fronted/src/components/common/language/cn.js |  2 ++
 nezha-fronted/src/components/common/language/en.js |  2 ++
 .../src/components/common/searchInput.vue          |  2 +-
 nezha-fronted/src/components/page/alert/list.vue   |  6 ++++++
 6 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/nezha-fronted/src/components/common/alert/alertMessageTable.vue b/nezha-fronted/src/components/common/alert/alertMessageTable.vue
index 163987ad4..2b595bc18 100644
--- a/nezha-fronted/src/components/common/alert/alertMessageTable.vue
+++ b/nezha-fronted/src/components/common/alert/alertMessageTable.vue
@@ -71,6 +71,10 @@
             <template v-if="scope.row[item.prop]">{{scope.row[item.prop]}}</template>
             <span v-else>-</span>
           </template>
+          <template v-else-if="item.prop == 'remark'">
+            <template v-if="scope.row[item.prop]">{{scope.row[item.prop]}}</template>
+            <span v-else>-</span>
+          </template>
           <span v-else-if="item.prop == 'severity'" class="severity">
             <span v-if="scope.row[item.prop] == 'P1'" class="P1">P1</span>
             <!--<i class="nz-icon nz-icon-arrow-up"></i> {{returnSeverityLabel(scope.row[item.prop])}}-->
@@ -164,7 +168,6 @@
       </el-table-column>
     </el-table>
     <!--<弹窗>-->
-    <!--删除弹窗-->
     <!--导出-->
     <div class="export-xlsx">
       <el-dialog :visible.sync="importBox.show" :title="importBox.title" :modal-append-to-body='false' :show-close="true" width="300px" @close="closeDialog" class="nz-dialog">
@@ -178,9 +181,9 @@
         </div>
       </el-dialog>
     </div>
-    <!--export-->
+    <!--删除弹窗-->
     <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">
+      <el-dialog :visible.sync="deleteBox.show" :title="$t('alert.list.remark')" :modal-append-to-body='false' :show-close="true" width="450px" @close="closeDialog" class="nz-message">
         <div class="upload-body">
           <el-form ref="remarkForm" :model="deleteBox">
             <el-form-item :rules="[{required: true, message: this.$t('validate.required'), trigger: 'blur'}]" prop="remark">
@@ -315,6 +318,11 @@
             prop: 'description',
             show: true,
             minWidth:200
+          },{
+            label: this.$t('alert.list.remark'),
+            prop: 'remark',
+            show: true,
+            minWidth:200
           }, {
             label: this.$t('alert.list.state'),
             prop: 'state',
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue
index 01cf2615d..36b38427d 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue
@@ -225,7 +225,14 @@
             type: 'select',
             label: 'alertMessageState',
             disabled: false
-          }],
+          },
+            {
+              id:26,
+              name: this.$t('alert.list.id'),
+              type: 'id',
+              label: 'id',
+              disabled: false
+            }],
         },
         searchLabel: { //搜索参数
 
diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js
index 309e80dbb..d6ed3ffb2 100644
--- a/nezha-fronted/src/components/common/language/cn.js
+++ b/nezha-fronted/src/components/common/language/cn.js
@@ -768,6 +768,8 @@ const cn = {
       expired: "已过期",
       labels: "标签",
       current: "当前",
+      remark:'备注',
+      id:'ID',
     },
     config: {
       name: "名称",
diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js
index a22023b9b..a86c0b514 100644
--- a/nezha-fronted/src/components/common/language/en.js
+++ b/nezha-fronted/src/components/common/language/en.js
@@ -775,6 +775,8 @@ const en = {
       expired: 'Expired',//"已过期"
       labels: 'Labels',
       current: 'Current',
+      remark:'Remark',
+      id:'ID',
     },
     config: {
       name: 'Name',//"名称"
diff --git a/nezha-fronted/src/components/common/searchInput.vue b/nezha-fronted/src/components/common/searchInput.vue
index 92cc392d3..8c080b96d 100644
--- a/nezha-fronted/src/components/common/searchInput.vue
+++ b/nezha-fronted/src/components/common/searchInput.vue
@@ -146,7 +146,7 @@
             <div v-show="clearSearchShow" class="clear-search" @click="clear_input">
                 <i class="nz-icon nz-icon-circle-close"></i>
             </div>
-            <div :class="input_list?'input_list none':'input_list'" :style="'top:' + selectDom.top" @click="stop_click" id="input_list">
+            <div :class="input_list?'input_list none':'input_list'" :style="'top:' + selectDom.top" @click="stop_click" id="input_list" v-scroll-bar>
                 <ul>
                     <li v-for="(val,ind) in searchLabelList" @click="select_name(val.name,ind,val.id,val.type,val.label,val.disabled,$event)" :key="ind" :class="{'search-style-ind':searchStyleNum==ind,'is-disabled':val.disabled}">
                         <span>{{val.name}}</span>
diff --git a/nezha-fronted/src/components/page/alert/list.vue b/nezha-fronted/src/components/page/alert/list.vue
index 87c2088b5..ea5db8189 100644
--- a/nezha-fronted/src/components/page/alert/list.vue
+++ b/nezha-fronted/src/components/page/alert/list.vue
@@ -267,6 +267,12 @@
             type: 'select',
             label: 'alertMessageState',
             disabled: false
+          },{
+            id:26,
+            name: this.$t('alert.list.id'),
+            type: 'id',
+            label: 'id',
+            disabled: false
           }],
         },
         searchLabel: { //搜索参数