From 0921f1c5edbf352876b49f720aa5b42f38e4fe64 Mon Sep 17 00:00:00 2001
From: chenjinsong <523037378@qq.com>
Date: Mon, 24 May 2021 16:11:45 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-660=20fix:=20=E4=BF=AE=E5=A4=8D=E4=B8=80?=
 =?UTF-8?q?=E7=B3=BB=E5=88=97=E6=90=9C=E7=B4=A2=E6=A1=86=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/searchInput.vue     | 22 +++++++++----------
 .../components/common/searchSelectInfo.vue    |  4 ++--
 .../components/page/alert/alertSilence.vue    |  2 +-
 .../components/page/config/credentials.vue    |  5 +++--
 4 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/nezha-fronted/src/components/common/searchInput.vue b/nezha-fronted/src/components/common/searchInput.vue
index 1e42d4d2c..8dc96ec3f 100644
--- a/nezha-fronted/src/components/common/searchInput.vue
+++ b/nezha-fronted/src/components/common/searchInput.vue
@@ -836,14 +836,14 @@ export default {
       let labelBool = true
       this.select_list.forEach(val => {
         if (typeof (val.val) !== 'undefined' && val.val != null) {
-          if (val.type == 'select') {
-            if (val.label == 'alertType' || val.label == 'promType') {
+          if (val.type === 'select') {
+            if (val.label === 'alertType' || val.label === 'promType') {
               objectInfo.type = val.valnum
-            } else if (val.label == 'assetState') {
+            } else if (val.label === 'assetState') {
               objectInfo.state = val.valnum
             } else if (typeof (val.valnum) === 'undefined' || val.valnum == '') {
               this.selectInfoList[val.label].forEach(item => {
-                if (item.label == val.val) {
+                if (item.label === val.val) {
                   labelBool = false
                   objectInfo[val.label] = item.value
                 }
@@ -851,18 +851,20 @@ export default {
               if (labelBool) {
                 objectInfo[val.label] = val.val
               }
+            } else if (val.label === 'promState') {
+              objectInfo.statuses = val.valnum
             } else {
               objectInfo[val.label] = val.valnum
             }
-          } else if (val.type == 'selectSelf') {
+          } else if (val.type === 'selectSelf') {
             objectInfo[val.label] = val.valnum
-          } else if (val.type == 'selectAction') { // 新增日志判断
+          } else if (val.type === 'selectAction') { // 新增日志判断
             objectInfo[val.label] = val.valnum
-          } else if (val.type == 'dc') {
+          } else if (val.type === 'dc') {
             objectInfo.dcIds = val.valnum
-          } else if (val.type == 'asset') {
+          } else if (val.type === 'asset') {
             objectInfo.asset = val.val
-          } else if (val.type == 'module') {
+          } else if (val.type === 'module') {
             objectInfo.moduleId = val.valnum
           } else if (val.type === 'project') {
             objectInfo.projectIds = val.valnum
@@ -877,8 +879,6 @@ export default {
               objectInfo.state = val.val
             } else if (val.label === 'promType') {
               objectInfo.type = val.val
-            } else if (val.label === 'promState') {
-              objectInfo.status = val.val
             } else if (val.label === 'chartType') {
               objectInfo.type = val.val
             }
diff --git a/nezha-fronted/src/components/common/searchSelectInfo.vue b/nezha-fronted/src/components/common/searchSelectInfo.vue
index 4e816e01a..91b2abd6a 100644
--- a/nezha-fronted/src/components/common/searchSelectInfo.vue
+++ b/nezha-fronted/src/components/common/searchSelectInfo.vue
@@ -161,11 +161,11 @@ const searchSelectInfo = { // value: 传给后台的值；label：显示给用
   ],
   dcState: [
     {
-      value: 'enable',
+      value: 'ON',
       label: 'Enable'
     },
     {
-      value: 'disable',
+      value: 'OFF',
       label: 'Disable'
     }
   ],
diff --git a/nezha-fronted/src/components/page/alert/alertSilence.vue b/nezha-fronted/src/components/page/alert/alertSilence.vue
index 0c0226a61..5ab9054d4 100644
--- a/nezha-fronted/src/components/page/alert/alertSilence.vue
+++ b/nezha-fronted/src/components/page/alert/alertSilence.vue
@@ -89,7 +89,7 @@ export default {
           }, {
             name: this.$t('alert.silence.matchers'),
             type: 'input',
-            label: 'matchers ',
+            label: 'matchers',
             disabled: false
           }
         ]
diff --git a/nezha-fronted/src/components/page/config/credentials.vue b/nezha-fronted/src/components/page/config/credentials.vue
index b79f3a8df..4cbe2b2d3 100644
--- a/nezha-fronted/src/components/page/config/credentials.vue
+++ b/nezha-fronted/src/components/page/config/credentials.vue
@@ -7,7 +7,9 @@
       :custom-table-title.sync="tools.customTableTitle"
       :from="fromRoute.mib"
       :layout="['searchInput', 'elementSet']"
-      :search-msg="searchMsg">
+      :search-msg="searchMsg"
+      @search="search"
+    >
       <template v-slot:top-tool-left>
         <div id="module-type-6" class="nz-tab-item-box" @click="toFileTab">
           <div class="nz-tab-item ">{{$t("config.mib.mibFiles")}}</div>
@@ -85,7 +87,6 @@ export default {
         }
       },
       searchMsg: { // 给搜索框子组件传递的信息
-        zheze_none: true,
         searchLabelList: [{
           name: 'ID',
           type: 'input',