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{ 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 @@   + 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'))}"> {{account.protocol}} 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 @@
-
+