gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'codeCheck' of https://git.mesalab.cn/nezha/nezha-fronted into codeCheck

Browse Source
This commit is contained in:
zhangyu
2020-09-22 14:42:16 +08:00
parent 266c57ecc7 28577a5a88
commit ffcdbe09df
4 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
nezha-fronted/src/components/common/project/popData/expressionInfo.vue
View File

@@ -87,7 +87,16 @@
return value?value:label; return value?value:label;
}); });
if(Object.keys(metric).length>0){ 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 return labelValue
}else{ }else{

2
nezha-fronted/src/components/page/asset/asset.vue
View File

@@ -140,7 +140,7 @@
   
<el-dropdown trigger="hover" @command="cli"> <el-dropdown trigger="hover" @command="cli">
<span title="CLI" class="content-right-option" :id="'asset-ssh-'+scope.row.id"><i <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> </span>
<el-dropdown-menu slot="dropdown"> <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> <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>

6
nezha-fronted/src/components/page/dashboard/overview/overview2.scss
View File

@@ -253,12 +253,12 @@
left: 50%; left: 50%;
transform: translate(-50%, -50%); transform: translate(-50%, -50%);
} }
.nz-icon-asset { .nz-icon-overview-project {
color: #F6B275; color: #80A7F4;
} }
.nz-icon-project { .nz-icon-project {
font-size: 1.5rem !important; font-size: 1.5rem !important;
color: #80A7F4; color: #F6B275;
} }
.nz-icon-overview-module { .nz-icon-overview-module {
color: #7AD0BC; color: #7AD0BC;

2
nezha-fronted/src/components/page/dashboard/overview/overview2.vue
View File

@@ -20,7 +20,7 @@
<div class="content-row-box"> <div class="content-row-box">
<div class="content-col-box"> <div class="content-col-box">
<div class="content-col-content" v-loading="assetLoading"> <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-num-box">
<div class="content-col-content-num"> <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> <vue-countup :start-value="0" :end-value="(assetData ? assetData.totalStat.total : '') | numberFormat" :decimals="(assetData ? assetData.totalStat.total : 0) < 1000 ? 0 : 1"></vue-countup>