From 23668fab0fdcd4e16899633f725ebe0fdfcd5b8e Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Tue, 22 Sep 2020 11:46:30 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9lenged?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=8D=E6=AD=A3=E7=A1=AE=E7=9A=84=20?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/project/popData/expressionInfo.vue         | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/nezha-fronted/src/components/common/project/popData/expressionInfo.vue b/nezha-fronted/src/components/common/project/popData/expressionInfo.vue
index 0d0fed15b..808d5666f 100644
--- a/nezha-fronted/src/components/common/project/popData/expressionInfo.vue
+++ b/nezha-fronted/src/components/common/project/popData/expressionInfo.vue
@@ -87,7 +87,16 @@
             return value?value:label;
           });
           if(Object.keys(metric).length>0){
-            labelValue=metric[labelValue]
+            let arr=labelValue.split(' ');
+            console.log(arr);
+            labelValue='';
+            arr.forEach((item)=>{
+              if(metric[item]){
+                labelValue+=metric[item] + ' '
+              }else{
+                labelValue+=item + ' '
+              }
+            });
           }
           return labelValue
         }else{

From 9fad7cdc35b98dd71cb03700becf9bae7e6f5909 Mon Sep 17 00:00:00 2001
From: wangwenrui <wangwenrui@zdjizhi.com>
Date: Tue, 22 Sep 2020 14:34:12 +0800
Subject: [PATCH 2/3] =?UTF-8?q?feat:=E8=8B=A5asset=E5=8F=AA=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E4=BA=86snmp=E7=B1=BB=E5=9E=8B=E7=9A=84account?=
 =?UTF-8?q?=EF=BC=8Ccli=E5=9B=BE=E6=A0=87=E4=B9=9F=E4=B8=BA=E7=81=B0?=
 =?UTF-8?q?=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/page/asset/asset.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue
index 775296e3c..f5922e6ff 100644
--- a/nezha-fronted/src/components/page/asset/asset.vue
+++ b/nezha-fronted/src/components/page/asset/asset.vue
@@ -140,7 +140,7 @@
               &nbsp;
               <el-dropdown trigger="hover" @command="cli">
               <span title="CLI" class="content-right-option" :id="'asset-ssh-'+scope.row.id"><i
-                class="nz-icon nz-icon-cli" :class="{'gray-filter': !scope.row.accounts || scope.row.accounts.length == 0}"></i>
+                class="nz-icon nz-icon-cli" :class="{'gray-filter': !scope.row.accounts || scope.row.accounts.length == 0 || (scope.row.accounts.length==1&&scope.row.accounts.find(t=>t.protocol == 'SNMP'))}"></i>
               </span>
                 <el-dropdown-menu slot="dropdown">
                   <el-dropdown-item v-for="(account, index) in scope.row.accounts" v-if="account && account.protocol != 'SNMP'" :key="index" :command="[scope.row.id ,scope.row.host, account]">{{account.protocol}}</el-dropdown-item>

From 28577a5a88c5062f324a32840ec0ea30449b00ae Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Tue, 22 Sep 2020 14:41:32 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9overview?=
 =?UTF-8?q?=E7=9A=84=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/page/dashboard/overview/overview2.scss   | 6 +++---
 .../src/components/page/dashboard/overview/overview2.vue    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/nezha-fronted/src/components/page/dashboard/overview/overview2.scss b/nezha-fronted/src/components/page/dashboard/overview/overview2.scss
index 666ad61bc..5c411546a 100644
--- a/nezha-fronted/src/components/page/dashboard/overview/overview2.scss
+++ b/nezha-fronted/src/components/page/dashboard/overview/overview2.scss
@@ -253,12 +253,12 @@
     left: 50%;
     transform: translate(-50%, -50%);
   }
-  .nz-icon-asset {
-    color: #F6B275;
+  .nz-icon-overview-project {
+    color: #80A7F4;
   }
   .nz-icon-project {
     font-size: 1.5rem !important;
-    color: #80A7F4;
+    color: #F6B275;
   }
   .nz-icon-overview-module {
     color: #7AD0BC;
diff --git a/nezha-fronted/src/components/page/dashboard/overview/overview2.vue b/nezha-fronted/src/components/page/dashboard/overview/overview2.vue
index 595bffc02..4adc15053 100644
--- a/nezha-fronted/src/components/page/dashboard/overview/overview2.vue
+++ b/nezha-fronted/src/components/page/dashboard/overview/overview2.vue
@@ -20,7 +20,7 @@
       <div class="content-row-box">
         <div class="content-col-box">
           <div class="content-col-content" v-loading="assetLoading">
-            <div class="content-col-content-icon"><i class="nz-icon nz-icon-asset"></i></div>
+            <div class="content-col-content-icon"><i class="nz-icon nz-icon-overview-project"></i></div>
             <div class="content-num-box">
               <div class="content-col-content-num">
                 <vue-countup :start-value="0" :end-value="(assetData ? assetData.totalStat.total  : '') | numberFormat" :decimals="(assetData ? assetData.totalStat.total  : 0) < 1000 ? 0 : 1"></vue-countup>